From a7af9208f203fd95b8206c4fef6704f311ac9dd9 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Thu, 25 Aug 2022 16:55:45 +0100 Subject: [PATCH 001/263] Upgrading io.kubernetes:client-java dependency Signed-off-by: Jade Carino --- .../dev.galasa.kubernetes.manager/build.gradle | 4 ++-- release.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle index d6d25476c..636d40bc5 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Kubernetes Manager' -version = '0.22.0' +version = '0.25.0' dependencies { api project(':galasa-managers-cloud-parent:dev.galasa.cloud.manager') @@ -55,6 +55,6 @@ dependencies { strictly '1.21' } } - implementation 'io.kubernetes:client-java:14.0.0' + implementation 'io.kubernetes:client-java:16.0.0' implementation 'commons-io:commons-io:2.9.0' } diff --git a/release.yaml b/release.yaml index a04695282..9691b42fb 100644 --- a/release.yaml +++ b/release.yaml @@ -245,7 +245,7 @@ managers: isolated: true - artifact: dev.galasa.kubernetes.manager - version: 0.22.0 + version: 0.25.0 obr: true javadoc: true bom: true From 083f315935a8e474df9e492fdb27610124a3343e Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Fri, 9 Sep 2022 15:01:17 +0100 Subject: [PATCH 002/263] Upgrade gson dependency in all manager projects Signed-off-by: Jade Carino --- .../dev.galasa.docker.manager/build.gradle | 2 +- .../dev.galasa.kubernetes.manager/bnd.bnd | 2 +- .../dev.galasa.kubernetes.manager/build.gradle | 4 ++-- .../dev.galasa.openstack.manager/build.gradle | 2 +- .../dev.galasa.http.manager.ivt/build.gradle | 2 +- .../dev.galasa.http.manager/build.gradle | 2 +- .../dev.galasa.core.manager/build.gradle | 2 +- .../dev.galasa.elasticlog.manager/build.gradle | 2 +- .../dev.galasa.phoenix2.manager/build.gradle | 2 +- .../dev.galasa.galasaecosystem.manager/build.gradle | 2 +- .../dev.galasa.selenium.manager/build.gradle | 2 +- .../dev.galasa.githubissue.manager/build.gradle | 2 +- .../dev.galasa.zos3270.manager/build.gradle | 2 +- .../dev.galasa.zosbatch.rseapi.manager/build.gradle | 2 +- .../dev.galasa.zosbatch.zosmf.manager/build.gradle | 2 +- .../dev.galasa.zosconsole.zosmf.manager/build.gradle | 2 +- .../dev.galasa.zosfile.rseapi.manager/build.gradle | 2 +- .../dev.galasa.zosfile.zosmf.manager/build.gradle | 2 +- .../dev.galasa.zosmf.manager/build.gradle | 2 +- .../dev.galasa.zosrseapi.manager/build.gradle | 2 +- .../dev.galasa.zossecurity.manager/build.gradle | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle index 70df14f51..23d4b9534 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle @@ -9,7 +9,7 @@ version = '0.23.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' implementation 'commons-io:commons-io:2.9.0' implementation 'org.apache.commons:commons-compress:1.21' } diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd index b16ce386f..f0be6d10c 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd @@ -34,7 +34,7 @@ Embed-Dependency: *;scope=compile commons-collections4-4.4.jar; lib:=true,\ commons-lang3-3.1.jar; lib:=true,\ error_prone_annotations-2.5.1.jar; lib:=true,\ - gson-2.7.jar; lib:=true,\ + gson-2.8.9.jar; lib:=true,\ gson-fire-1.8.5.jar; lib:=true,\ guava-30.1.1-jre.jar; lib:=true,\ j2objc-annotations-1.3.jar; lib:=true,\ diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle index 636d40bc5..7a48e6de7 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle @@ -32,7 +32,7 @@ dependencies { } implementation ('com.google.code.gson:gson'){ version { - strictly '2.7' + strictly '2.8.9' } } implementation ('org.apache.commons:commons-lang3'){ @@ -55,6 +55,6 @@ dependencies { strictly '1.21' } } - implementation 'io.kubernetes:client-java:16.0.0' + implementation 'io.kubernetes:client-java:14.0.0' implementation 'commons-io:commons-io:2.9.0' } diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle index 19f142723..ea305c85a 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle @@ -11,6 +11,6 @@ dependencies { implementation project(':galasa-managers-unix-parent:dev.galasa.linux.manager') implementation project(':galasa-managers-windows-parent:dev.galasa.windows.manager') implementation 'org.apache.httpcomponents:httpclient-osgi:4.5.13' - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' implementation 'io.prometheus:simpleclient:0.6.0' } diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle index f8454734f..d163b4f84 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle @@ -9,5 +9,5 @@ version = '0.21.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') implementation project(':galasa-managers-core-parent:dev.galasa.core.manager') - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' } diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle index 3a4397b5c..45d12eccb 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle @@ -11,7 +11,7 @@ dependencies { implementation 'org.apache.httpcomponents:httpcore-osgi:4.4.14' implementation 'org.apache.httpcomponents:httpmime:4.5.8' implementation 'commons-io:commons-io:2.9.0' - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' implementation 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.0' implementation (group: 'commons-codec', name: 'commons-codec'){ version{ diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle index 1e592576f..d6e06ce07 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle @@ -6,5 +6,5 @@ description = 'Galasa Core Manager' version = '0.21.0' dependencies { - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' } diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle index ded9d1604..20543af2f 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle @@ -8,5 +8,5 @@ version = '0.21.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' } diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle index d24100c5d..37e802ad7 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle @@ -8,5 +8,5 @@ version = '0.21.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' } diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle index 13f9f7f55..b7fda99c9 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle @@ -18,5 +18,5 @@ dependencies { api project(':galasa-managers-windows-parent:dev.galasa.windows.manager') api project(':galasa-managers-zos-parent:dev.galasa.zos.manager') implementation 'org.yaml:snakeyaml:1.30' - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' } diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle index 6c802ca10..9ff7adc70 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle @@ -27,5 +27,5 @@ dependencies { implementation 'net.bytebuddy:byte-buddy:1.8.15' implementation 'org.apache.commons:commons-exec:1.3' implementation 'commons-io:commons-io:2.6' - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' } diff --git a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/build.gradle b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/build.gradle index d654c23be..edfc77328 100644 --- a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/build.gradle @@ -8,5 +8,5 @@ version = '0.25.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle index ea6405420..63e174481 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle @@ -10,7 +10,7 @@ dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zos3270.common') api project(':galasa-managers-zos-parent:dev.galasa.zos.manager') api project(':galasa-managers-core-parent:dev.galasa.textscan.manager') - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' implementation 'commons-codec:commons-codec:1.15' implementation 'commons-io:commons-io:2.9.0' diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle index 2c6ab7b38..e50f4a92d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle @@ -9,5 +9,5 @@ version = '0.25.0' dependencies { implementation project(':galasa-managers-zos-parent:dev.galasa.zosrseapi.manager') implementation 'org.apache.commons:commons-lang3:3.8.1' - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle index 1d7c5c745..44f6ceb06 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle @@ -8,6 +8,6 @@ version = '0.25.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zosmf.manager') - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' implementation 'org.apache.commons:commons-lang3:3.8.1' } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/build.gradle index a1c55e022..d9b21a83c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/build.gradle @@ -8,5 +8,5 @@ version = '0.21.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zosmf.manager') - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle index dd7ad46f3..f372d4e9e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle @@ -9,7 +9,7 @@ version = '0.25.0' dependencies { implementation project(':galasa-managers-zos-parent:dev.galasa.zosrseapi.manager') implementation 'org.apache.commons:commons-lang3:3.8.1' - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' implementation 'org.apache.commons:commons-collections4:4.4' implementation 'org.apache.commons:commons-lang3:3.8.1' implementation 'org.apache.commons:commons-collections4:4.4' diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/build.gradle index d6089fcaa..01bbaac72 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/build.gradle @@ -8,7 +8,7 @@ version = '0.25.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zosmf.manager') - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' implementation 'org.apache.commons:commons-lang3:3.8.1' implementation 'commons-io:commons-io:2.9.0' } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle index 821aa7512..4f2a17f0d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle @@ -11,5 +11,5 @@ dependencies { api project(':galasa-managers-comms-parent:dev.galasa.http.manager') implementation 'commons-io:commons-io:2.8.0' implementation 'org.apache.commons:commons-lang3:3.8.1' - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle index d6eedb203..86419b482 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle @@ -10,5 +10,5 @@ dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zos.manager') api project(':galasa-managers-comms-parent:dev.galasa.http.manager') implementation 'commons-io:commons-io:2.9.0' - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle index 9b8e835f4..3f0288ede 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle @@ -9,7 +9,7 @@ version = '0.21.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') implementation project(':galasa-managers-zos-parent:dev.galasa.zos.manager') - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' implementation 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.0' implementation 'org.apache.commons:commons-lang3:3.8.1' From 88851fcea48db281d811961ac6bae42b7d45a8b3 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Thu, 15 Sep 2022 14:54:54 +0100 Subject: [PATCH 003/263] Update release.yaml Signed-off-by: Jade Carino --- .../dev.galasa.docker.manager/build.gradle | 2 +- .../dev.galasa.openstack.manager/build.gradle | 2 +- .../dev.galasa.http.manager.ivt/build.gradle | 2 +- .../dev.galasa.core.manager/build.gradle | 2 +- .../build.gradle | 2 +- .../dev.galasa.phoenix2.manager/build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../dev.galasa.zosmf.manager/build.gradle | 2 +- .../dev.galasa.zosrseapi.manager/build.gradle | 2 +- .../build.gradle | 2 +- release.yaml | 22 +++++++++---------- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle index 23d4b9534..0a369f017 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Docker Manager' -version = '0.23.0' +version = '0.25.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle index ea305c85a..c66392481 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Openstack Manager' -version = '0.21.0' +version = '0.25.0' dependencies { api project(':galasa-managers-comms-parent:dev.galasa.ipnetwork.manager') diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle index d163b4f84..47088906f 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa HTTP Manager IVTs' -version = '0.21.0' +version = '0.25.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle index d6e06ce07..a407889b1 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle @@ -3,7 +3,7 @@ plugins { } description = 'Galasa Core Manager' -version = '0.21.0' +version = '0.25.0' dependencies { implementation 'com.google.code.gson:gson:2.8.9' diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle index 20543af2f..18cfab857 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa ElasticLog Manager' -version = '0.21.0' +version = '0.25.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle index 37e802ad7..0025fd2cf 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Phoenix 2 PME Manager' -version = '0.21.0' +version = '0.25.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle index b7fda99c9..67b270b8f 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Ecosystem Manager' -version = '0.21.0' +version = '0.25.0' dependencies { implementation 'commons-io:commons-io:2.9.0' diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/build.gradle index d9b21a83c..7cff59066 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Console zOS/MF Manager' -version = '0.21.0' +version = '0.25.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zosmf.manager') diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle index 4f2a17f0d..28dfd6c38 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS/MF Manager' -version = '0.21.0' +version = '0.25.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zos.manager') diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle index 86419b482..67230c13c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa RSE API Manager' -version = '0.21.0' +version = '0.25.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zos.manager') diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle index 3f0288ede..56813ff40 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS Security Manager' -version = '0.21.0' +version = '0.25.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') diff --git a/release.yaml b/release.yaml index c0f94cf0d..517b6de88 100644 --- a/release.yaml +++ b/release.yaml @@ -109,7 +109,7 @@ managers: codecoverage: true - artifact: dev.galasa.core.manager - version: 0.21.0 + version: 0.25.0 obr: true javadoc: true bom: true @@ -138,7 +138,7 @@ managers: isolated: true - artifact: dev.galasa.docker.manager - version: 0.23.0 + version: 0.25.0 obr: true javadoc: true bom: true @@ -153,7 +153,7 @@ managers: isolated: true - artifact: dev.galasa.elasticlog.manager - version: 0.21.0 + version: 0.25.0 obr: true bom: true isolated: true @@ -165,7 +165,7 @@ managers: isolated: true - artifact: dev.galasa.galasaecosystem.manager - version: 0.21.0 + version: 0.25.0 obr: true bom: true isolated: true @@ -193,7 +193,7 @@ managers: codecoverage: true - artifact: dev.galasa.http.manager.ivt - version: 0.21.0 + version: 0.25.0 obr: true mvp: true isolated: true @@ -295,7 +295,7 @@ managers: isolated: true - artifact: dev.galasa.openstack.manager - version: 0.21.0 + version: 0.25.0 obr: true javadoc: true bom: true @@ -303,7 +303,7 @@ managers: codecoverage: true - artifact: dev.galasa.phoenix2.manager - version: 0.21.0 + version: 0.25.0 obr: true bom: true isolated: true @@ -371,7 +371,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosconsole.zosmf.manager - version: 0.21.0 + version: 0.25.0 obr: true bom: true mvp: true @@ -436,7 +436,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosmf.manager - version: 0.21.0 + version: 0.25.0 obr: true javadoc: true bom: true @@ -445,7 +445,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosrseapi.manager - version: 0.21.0 + version: 0.25.0 obr: true javadoc: true bom: true @@ -454,7 +454,7 @@ managers: codecoverage: true - artifact: dev.galasa.zossecurity.manager - version: 0.21.0 + version: 0.25.0 obr: true javadoc: true bom: true From 8c0f33891724149a95d8eb3a8a9eeb779bf28df4 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Fri, 16 Sep 2022 14:25:53 +0100 Subject: [PATCH 004/263] Upgrade apache velocity dep to fixc security vulnerabilities Signed-off-by: Jade Carino --- .../dev.galasa.artifact.manager/build.gradle | 4 ++-- .../dev.galasa.sem.manager/build.gradle | 2 +- .../dev.galasa.jmeter.manager/build.gradle | 4 ++-- release.yaml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/build.gradle index 1ca45aae2..bbf954bcd 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/build.gradle @@ -6,9 +6,9 @@ plugins { description = 'Handles the retrieval of artifacts from the OSGi bundles' -version = '0.21.0' +version = '0.25.0' dependencies { - implementation 'org.apache.velocity:velocity:1.7' + implementation 'org.apache.velocity:velocity-engine-core:2.3' implementation 'commons-io:commons-io:2.9.0' } \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle index 8f50024ca..a7996087f 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle @@ -17,6 +17,6 @@ dependencies { implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') - implementation 'org.apache.velocity:velocity:1.7' + implementation 'org.apache.velocity:velocity-engine-core:2.3' implementation 'org.apache.logging.log4j:log4j-1.2-api:2.17.1' } diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/build.gradle index 4f272681b..812d456c3 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/build.gradle @@ -4,9 +4,9 @@ plugins { description = 'Galasa JMeter Manager' -version = '0.21.0' +version = '0.25.0' dependencies { implementation project(':galasa-managers-cloud-parent:dev.galasa.docker.manager') - implementation 'org.apache.velocity:velocity:1.7' + implementation 'org.apache.velocity:velocity-engine-core:2.3' } diff --git a/release.yaml b/release.yaml index 517b6de88..5a2e73c1c 100644 --- a/release.yaml +++ b/release.yaml @@ -14,7 +14,7 @@ managers: # - artifact: dev.galasa.artifact.manager - version: 0.21.0 + version: 0.25.0 obr: true javadoc: true bom: true @@ -232,7 +232,7 @@ managers: codecoverage: true - artifact: dev.galasa.jmeter.manager - version: 0.21.0 + version: 0.25.0 obr: true javadoc: true bom: true From e9276e304e9b342ad77c4a0e255efa6ffe5bd4dd Mon Sep 17 00:00:00 2001 From: Michael Baylis Date: Wed, 28 Sep 2022 11:26:02 +0100 Subject: [PATCH 005/263] Colour support Signed-off-by: Michael Baylis --- .../dev.galasa.zos3270.common/build.gradle | 2 +- .../zos3270/common/screens/TerminalField.java | 26 +- .../dev/galasa/zos3270/common/TestJson.java | 6 +- .../java/dev/galasa/zos3270/ITerminal.java | 54 +++ .../datastream/AttributeBackgroundColour.java | 17 +- .../AttributeExtendedHighlighting.java | 19 +- .../datastream/AttributeForegroundColour.java | 17 +- .../datastream/OrderStartFieldExtended.java | 51 ++- .../internal/datastream/QueryReplyColor.java | 22 +- .../zos3270/spi/BufferStartOfField.java | 67 +++- .../java/dev/galasa/zos3270/spi/Colour.java | 43 +++ .../java/dev/galasa/zos3270/spi/Field.java | 27 +- .../dev/galasa/zos3270/spi/Highlight.java | 39 +++ .../java/dev/galasa/zos3270/spi/Screen.java | 323 +++++++++++++++--- .../java/dev/galasa/zos3270/spi/Terminal.java | 41 +++ .../zos3270/spi/Zos3270TerminalImpl.java | 24 +- .../src/test/java/t/TestColour.java | 43 +++ .../src/test/java/t/TestInbound.java | 8 +- .../extended/ExtendedDatastreamTest.java | 78 +++++ release.yaml | 2 +- 20 files changed, 800 insertions(+), 109 deletions(-) create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Colour.java create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Highlight.java create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestColour.java create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/extended/ExtendedDatastreamTest.java diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle index 965fd220b..b8a4eb53e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS 3270 Terminal Manager - Common Packages' -version = '0.21.0' +version = '0.25.0' dependencies { testImplementation 'com.google.code.gson:gson:2.8.5' diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalField.java index a8941cca3..c9aff5e8a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalField.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.common.screens; @@ -26,6 +24,10 @@ public class TerminalField { private final boolean fieldIntenseDisplay; private final boolean fieldSelectorPen; private final boolean fieldModifed; + + private final Character foregroundColour; + private final Character backgroundColour; + private final Character highlight; private final List contents = new ArrayList<>(); @@ -43,7 +45,8 @@ public class TerminalField { * @param fieldModifed Field has been modified */ public TerminalField(int row, int column, boolean unformatted, boolean fieldProtected, boolean fieldNumeric, - boolean fieldDisplay, boolean fieldIntenseDisplay, boolean fieldSelectorPen, boolean fieldModifed) { + boolean fieldDisplay, boolean fieldIntenseDisplay, boolean fieldSelectorPen, boolean fieldModifed, + Character foregroundColour, Character backgroundColour, Character highlight) { this.row = row; this.column = column; this.unformatted = unformatted; @@ -53,6 +56,9 @@ public TerminalField(int row, int column, boolean unformatted, boolean fieldProt this.fieldIntenseDisplay = fieldIntenseDisplay; this.fieldSelectorPen = fieldSelectorPen; this.fieldModifed = fieldModifed; + this.foregroundColour = foregroundColour; + this.backgroundColour = backgroundColour; + this.highlight = highlight; } /** @@ -135,6 +141,18 @@ public boolean isFieldSelectorPen() { public boolean isFieldModifed() { return fieldModifed; } + + public Character getForegroundColour() { + return this.foregroundColour; + } + + public Character getBackgroundColour() { + return this.backgroundColour; + } + + public Character getHighlight() { + return this.highlight; + } /** * Fetch the field contents diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/TestJson.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/TestJson.java index b19878ab5..c9f4145b9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/TestJson.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/TestJson.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.common; @@ -59,7 +57,7 @@ public void testWriteAndReadJson() { terminal.addImage( new TerminalImage(imageSequence + 1, imageID, true, imageType, aid, altSize, cursorCol, cursorRow)); - TerminalField field = new TerminalField(posRow, posColumn, false, true, false, true, true, true, true); + TerminalField field = new TerminalField(posRow, posColumn, false, true, false, true, true, true, true, null, null, null); image.getFields().add(field); Character[] data = new Character[] { 'a', 'c', 'b' }; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/ITerminal.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/ITerminal.java index d1da42e53..284eb2546 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/ITerminal.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/ITerminal.java @@ -5,6 +5,8 @@ import javax.validation.constraints.NotNull; +import dev.galasa.zos3270.spi.Colour; +import dev.galasa.zos3270.spi.Highlight; import dev.galasa.zos3270.spi.NetworkException; public interface ITerminal { @@ -200,6 +202,22 @@ ITerminal positionCursorToFieldContaining(@NotNull String searchText) ITerminal reportScreenWithCursor(); + /** + * Report to the log the current state of the terminal with optional extended datastream settings + * + * @param printCursor - report cursor position + * @param printColour - report the colour + * @param printHighlight - report highlighting + * @param printIntensity - report intensity + * @param printProtected - report field protection + * @param printNumeric - report numeric restrictions + * @param printModified - report field modification + * @return the ITerminal for fluent API + * @throws Zos3270Exception + */ + ITerminal reportExtendedScreen(boolean printCursor, boolean printColour, boolean printHighlight, + boolean printIntensity, boolean printProtected, boolean printNumeric, boolean printModified) throws Zos3270Exception; + String retrieveScreen(); /** @@ -258,4 +276,40 @@ ITerminal positionCursorToFieldContaining(@NotNull String searchText) */ String retrieveTextAtCursor(int length) throws Zos3270Exception; + /** + * Return the colour of the character at the cursor position + * + * @return - if position is not in an extended field, null us returned + */ + Colour retrieveColourAtCursor(); + + /** + * Return the colour of the character at the cursor position + * + * @param row of the screen, index 1 based + * @param col of the screen, index 1 based + * @return - if position is not in an extended field, null us returned + * @throws Zos3270Exception + */ + Colour retrieveColourAtPosition(int row, int col) throws Zos3270Exception; + + /** + * Return the highlighting of the character at the cursor position + * + * @return - if position is not in an extended field, null us returned + */ + Highlight retrieveHighlightAtCursor(); + + /** + * Return the highlighting of the character at the cursor position + * + * @param row of the screen, index 1 based + * @param col of the screen, index 1 based + * @return - if position is not in an extended field, null us returned + * @throws Zos3270Exception + */ + Highlight retrieveHighlightAtPosition(int row, int col) throws Zos3270Exception; + + + } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeBackgroundColour.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeBackgroundColour.java index a96c6c01b..dc140536f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeBackgroundColour.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeBackgroundColour.java @@ -1,23 +1,26 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.internal.datastream; import java.nio.ByteBuffer; +import dev.galasa.zos3270.spi.Colour; +import dev.galasa.zos3270.spi.DatastreamException; + public class AttributeBackgroundColour implements IAttribute { public static final byte ATTRIBUTE_ID = 0x45; - private final byte colour; + private final Colour colour; - public AttributeBackgroundColour(ByteBuffer buffer) { - this.colour = buffer.get(); + public AttributeBackgroundColour(ByteBuffer buffer) throws DatastreamException { + byte code = buffer.get(); + + this.colour = Colour.getColour(code); } - public byte getColour() { + public Colour getColour() { return colour; } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeExtendedHighlighting.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeExtendedHighlighting.java index 5e56e8d42..aa852f9e1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeExtendedHighlighting.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeExtendedHighlighting.java @@ -1,24 +1,27 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.internal.datastream; import java.nio.ByteBuffer; +import dev.galasa.zos3270.spi.DatastreamException; +import dev.galasa.zos3270.spi.Highlight; + public class AttributeExtendedHighlighting implements IAttribute { public static final byte ATTRIBUTE_ID = 0x41; - private final byte colour; + private final Highlight highlight; - public AttributeExtendedHighlighting(ByteBuffer buffer) { - this.colour = buffer.get(); + public AttributeExtendedHighlighting(ByteBuffer buffer) throws DatastreamException { + byte code = buffer.get(); + + this.highlight = Highlight.getHighlight(code); } - public byte getColour() { - return colour; + public Highlight getHighlight() { + return this.highlight; } } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeForegroundColour.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeForegroundColour.java index 712c00cd1..26ed6d954 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeForegroundColour.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeForegroundColour.java @@ -1,23 +1,26 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.internal.datastream; import java.nio.ByteBuffer; +import dev.galasa.zos3270.spi.Colour; +import dev.galasa.zos3270.spi.DatastreamException; + public class AttributeForegroundColour implements IAttribute { public static final byte ATTRIBUTE_ID = 0x42; - private final byte colour; + private final Colour colour; - public AttributeForegroundColour(ByteBuffer buffer) { - this.colour = buffer.get(); + public AttributeForegroundColour(ByteBuffer buffer) throws DatastreamException { + byte code = buffer.get(); + + this.colour = Colour.getColour(code); } - public byte getColour() { + public Colour getColour() { return colour; } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderStartFieldExtended.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderStartFieldExtended.java index cc8d1b288..505843599 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderStartFieldExtended.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderStartFieldExtended.java @@ -1,13 +1,9 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.internal.datastream; import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.List; import dev.galasa.zos3270.spi.DatastreamException; @@ -15,7 +11,18 @@ public class OrderStartFieldExtended extends AbstractOrder { public static final byte ID = 0x29; - private final ArrayList attributes = new ArrayList<>(); + private OrderStartField orderStartField = null; + @SuppressWarnings("unused") + private AttributeFieldValidation attributeFieldValidation = null; + @SuppressWarnings("unused") + private AttributeFieldOutlining attributeFieldOutlining = null; + private AttributeExtendedHighlighting attributeExtendedHighlighting = null; + @SuppressWarnings("unused") + private AttributeCharacterSet attributeCharacterSet = null; + private AttributeForegroundColour attributeForegroundColour = null; + private AttributeBackgroundColour attributeBackgroundColour = null; + @SuppressWarnings("unused") + private AttributeTransparency attributeTransparency = null; public OrderStartFieldExtended(ByteBuffer buffer) throws DatastreamException { byte[] rep = new byte[4]; @@ -31,28 +38,28 @@ public OrderStartFieldExtended(ByteBuffer buffer) throws DatastreamException { byte attributeId = buffer.get(); switch (attributeId) { case OrderStartField.ATTRIBUTE_ID: - attributes.add(new OrderStartField(buffer)); + orderStartField = new OrderStartField(buffer); break; case AttributeFieldValidation.ATTRIBUTE_ID: - attributes.add(new AttributeFieldValidation(buffer)); + attributeFieldValidation = new AttributeFieldValidation(buffer); break; case AttributeFieldOutlining.ATTRIBUTE_ID: - attributes.add(new AttributeFieldOutlining(buffer)); + attributeFieldOutlining = new AttributeFieldOutlining(buffer); break; case AttributeExtendedHighlighting.ATTRIBUTE_ID: - attributes.add(new AttributeExtendedHighlighting(buffer)); + attributeExtendedHighlighting = new AttributeExtendedHighlighting(buffer); break; case AttributeForegroundColour.ATTRIBUTE_ID: - attributes.add(new AttributeForegroundColour(buffer)); + attributeForegroundColour = new AttributeForegroundColour(buffer); break; case AttributeCharacterSet.ATTRIBUTE_ID: - attributes.add(new AttributeCharacterSet(buffer)); + attributeCharacterSet = new AttributeCharacterSet(buffer); break; case AttributeBackgroundColour.ATTRIBUTE_ID: - attributes.add(new AttributeBackgroundColour(buffer)); + attributeBackgroundColour = new AttributeBackgroundColour(buffer); break; case AttributeTransparency.ATTRIBUTE_ID: - attributes.add(new AttributeTransparency(buffer)); + attributeTransparency = new AttributeTransparency(buffer); break; default: throw new DatastreamException("Unrecognised attribute in SFE, '" + attributeId + "'"); @@ -65,8 +72,20 @@ public byte[] getBytes() { throw new UnsupportedOperationException("Not available yet"); } - public List getAttributes() { - return attributes; + public OrderStartField getOrderStartField() { + return orderStartField; + } + + public AttributeExtendedHighlighting getHighlight() { + return attributeExtendedHighlighting; + } + + public AttributeForegroundColour getForegroundColour() { + return this.attributeForegroundColour; + } + + public AttributeBackgroundColour getBackgroundColor() { + return this.attributeBackgroundColour; } } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyColor.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyColor.java index 3d041582a..d60662013 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyColor.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyColor.java @@ -1,12 +1,12 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.internal.datastream; import java.nio.ByteBuffer; +import dev.galasa.zos3270.spi.Colour; + public class QueryReplyColor extends AbstractQueryReply { private static final byte COLOR = (byte) 0x86; @@ -21,14 +21,14 @@ public byte[] toByte() { buffer.put((byte)8); // Number of color combinations - putColor(buffer, (byte)0, (byte)0xf4); - putColor(buffer, (byte)0xf1, (byte)0xf1); - putColor(buffer, (byte)0xf2, (byte)0xf2); - putColor(buffer, (byte)0xf3, (byte)0xf3); - putColor(buffer, (byte)0xf4, (byte)0xf4); - putColor(buffer, (byte)0xf5, (byte)0xf5); - putColor(buffer, (byte)0xf6, (byte)0xf6); - putColor(buffer, (byte)0xf7, (byte)0xf7); + putColor(buffer, Colour.DEFAULT.getCode(), Colour.GREEN.getCode()); + putColor(buffer, Colour.BLUE.getCode(), Colour.BLUE.getCode()); + putColor(buffer, Colour.RED.getCode(), Colour.RED.getCode()); + putColor(buffer, Colour.PINK.getCode(), Colour.PINK.getCode()); + putColor(buffer, Colour.GREEN.getCode(), Colour.GREEN.getCode()); + putColor(buffer, Colour.TURQUOISE.getCode(), Colour.TURQUOISE.getCode()); + putColor(buffer, Colour.YELLOW.getCode(), Colour.YELLOW.getCode()); + putColor(buffer, Colour.NEUTRAL.getCode(), Colour.NEUTRAL.getCode()); return buffer.array(); } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferStartOfField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferStartOfField.java index 283787cd8..a9f4535fd 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferStartOfField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferStartOfField.java @@ -1,10 +1,16 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.spi; +import dev.galasa.zos3270.internal.datastream.AttributeBackgroundColour; +import dev.galasa.zos3270.internal.datastream.AttributeCharacterSet; +import dev.galasa.zos3270.internal.datastream.AttributeExtendedHighlighting; +import dev.galasa.zos3270.internal.datastream.AttributeFieldOutlining; +import dev.galasa.zos3270.internal.datastream.AttributeFieldValidation; +import dev.galasa.zos3270.internal.datastream.AttributeForegroundColour; +import dev.galasa.zos3270.internal.datastream.AttributeTransparency; + /** * Create a Start of Field position, represents to SF order * @@ -20,6 +26,18 @@ public class BufferStartOfField implements IBufferHolder { private final boolean fieldSelectorPen; private boolean fieldModifed; + @SuppressWarnings("unused") + private AttributeFieldValidation attributeFieldValidation = null; + @SuppressWarnings("unused") + private AttributeFieldOutlining attributeFieldOutlining = null; + private AttributeExtendedHighlighting attributeExtendedHighlighting = null; + @SuppressWarnings("unused") + private AttributeCharacterSet attributeCharacterSet = null; + private AttributeForegroundColour attributeForegroundColour = null; + private AttributeBackgroundColour attributeBackgroundColour = null; + @SuppressWarnings("unused") + private AttributeTransparency attributeTransparency = null; + /** * Create the start of a field * @@ -34,6 +52,16 @@ public BufferStartOfField(int position, boolean fieldProtected, boolean fieldNum this.fieldSelectorPen = fieldSelectorPen; this.fieldModifed = fieldModifed; } + + public BufferStartOfField(int position, boolean fieldProtected, boolean fieldNumeric, boolean fieldDisplay, + boolean fieldIntenseDisplay, boolean fieldSelectorPen, boolean fieldModifed, + AttributeExtendedHighlighting extendedHighlighting, AttributeForegroundColour foregroundColour, AttributeBackgroundColour backgroundColour) { + this(position, fieldProtected, fieldNumeric, fieldDisplay, fieldIntenseDisplay, fieldSelectorPen, fieldModifed); + + this.attributeExtendedHighlighting = extendedHighlighting; + this.attributeForegroundColour = foregroundColour; + this.attributeBackgroundColour = backgroundColour; + } /* * (non-Javadoc) @@ -76,6 +104,39 @@ public void setFieldModified() { public void clearFieldModified() { this.fieldModifed = false; } + + public Highlight getHighlight() { + if (this.attributeExtendedHighlighting == null) { + return null; + } + return this.attributeExtendedHighlighting.getHighlight(); + } + + public Colour getForegroundColour() { + if (this.attributeForegroundColour == null) { + return null; + } + return this.attributeForegroundColour.getColour(); + } + + public Colour getBackgroundColour() { + if (this.attributeBackgroundColour == null) { + return null; + } + return this.attributeBackgroundColour.getColour(); + } + + public AttributeExtendedHighlighting getAttributeExtendedHighlighting() { + return this.attributeExtendedHighlighting; + } + + public AttributeForegroundColour getAttributeForegroundColour() { + return this.attributeForegroundColour; + } + + public AttributeBackgroundColour getAttributeBackgroundColour() { + return this.attributeBackgroundColour; + } @Override public String getStringWithoutNulls() { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Colour.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Colour.java new file mode 100644 index 000000000..72822485e --- /dev/null +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Colour.java @@ -0,0 +1,43 @@ +/* + * Copyright contributors to the Galasa project + */ +package dev.galasa.zos3270.spi; + +public enum Colour { + + DEFAULT ((byte)0x0, 'd'), + BLUE ((byte)0xf1, 'b'), + RED ((byte)0xf2, 'r'), + PINK ((byte)0xf3, 'p'), + GREEN ((byte)0xf4, 'g'), + TURQUOISE((byte)0xf5, 't'), + YELLOW ((byte)0xf6, 'y'), + NEUTRAL ((byte)0xf7, 'n'); + + private final byte code; + private final char letter; + + Colour(byte code, char letter) { + this.code = code; + this.letter = letter; + } + + public byte getCode() { + return this.code; + } + + public char getLetter() { + return this.letter; + } + + public static Colour getColour(byte code) throws DatastreamException { + for(Colour colour : Colour.values()) { + if (colour.code == code) { + return colour; + } + } + + throw new DatastreamException("Unrecognised colour code - " + code); + } + +} diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Field.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Field.java index 72d283516..4a02249ba 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Field.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Field.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.spi; @@ -22,6 +20,10 @@ public class Field { private final boolean fieldIntenseDisplay; private final boolean fieldSelectorPen; private final boolean fieldModifed; + + private final Colour foregroundColour; + private final Colour backgroundColour; + private final Highlight highlight; protected Field(int start, BufferStartOfField sf) { this.start = start; @@ -32,6 +34,10 @@ protected Field(int start, BufferStartOfField sf) { this.fieldSelectorPen = sf.isSelectorPen(); this.fieldModifed = sf.isFieldModifed(); this.text = new char[0]; + + this.foregroundColour = sf.getForegroundColour(); + this.backgroundColour = sf.getBackgroundColour(); + this.highlight = sf.getHighlight(); } public Field() { @@ -43,6 +49,9 @@ public Field() { this.fieldSelectorPen = false; this.fieldModifed = false; this.text = new char[0]; + this.foregroundColour = null; + this.backgroundColour = null; + this.highlight = null; } protected void appendChar(char newChar) { @@ -122,6 +131,18 @@ public boolean isUnformatted() { return (this.start == -1); } + public Colour getForegroundColour() { + return foregroundColour; + } + + public Colour getBackgroundColour() { + return backgroundColour; + } + + public Highlight getHighlight() { + return highlight; + } + public String getFieldWithoutNulls() { StringBuilder sb = new StringBuilder(); for (char c : text) { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Highlight.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Highlight.java new file mode 100644 index 000000000..fd14a0062 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Highlight.java @@ -0,0 +1,39 @@ +/* + * Copyright contributors to the Galasa project + */ +package dev.galasa.zos3270.spi; + +public enum Highlight { + DEFAULT((byte)0x00, 'd'), + NORMAL((byte)0xf0, 'n'), + BLINK((byte)0xf1, 'b'), + REVERSE((byte)0xf2, 'r'), + UNDERSCORE((byte)0xf4, 'u'); + + private final byte code; + private final char letter; + + Highlight(byte code, char letter) { + this.code = code; + this.letter = letter; + } + + public byte getCode() { + return this.code; + } + + public char getLetter() { + return this.letter; + } + + public static Highlight getHighlight(byte code) throws DatastreamException { + for(Highlight highlight : Highlight.values()) { + if (highlight.code == code) { + return highlight; + } + } + + throw new DatastreamException("Unrecognised highlight code - " + code); + } + +} diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Screen.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Screen.java index 8527828ff..6b1d43bda 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Screen.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Screen.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.spi; @@ -37,6 +35,9 @@ import dev.galasa.zos3270.internal.datastream.AbstractCommandCode; import dev.galasa.zos3270.internal.datastream.AbstractOrder; import dev.galasa.zos3270.internal.datastream.AbstractQueryReply; +import dev.galasa.zos3270.internal.datastream.AttributeBackgroundColour; +import dev.galasa.zos3270.internal.datastream.AttributeExtendedHighlighting; +import dev.galasa.zos3270.internal.datastream.AttributeForegroundColour; import dev.galasa.zos3270.internal.datastream.BufferAddress; import dev.galasa.zos3270.internal.datastream.CommandEraseWrite; import dev.galasa.zos3270.internal.datastream.CommandEraseWriteAlternate; @@ -44,7 +45,6 @@ import dev.galasa.zos3270.internal.datastream.CommandReadModified; import dev.galasa.zos3270.internal.datastream.CommandReadModifiedAll; import dev.galasa.zos3270.internal.datastream.CommandWriteStructured; -import dev.galasa.zos3270.internal.datastream.IAttribute; import dev.galasa.zos3270.internal.datastream.OrderCarrageReturn; import dev.galasa.zos3270.internal.datastream.OrderEndOfMedium; import dev.galasa.zos3270.internal.datastream.OrderEraseUnprotectedToAddress; @@ -108,6 +108,8 @@ public class Screen { private final LinkedList updateListeners = new LinkedList<>(); private AttentionIdentification lastAid = AttentionIdentification.NONE; + + private boolean detectedSetAttribute = false; public Screen() throws TerminalInterruptedException { this(80, 24, null); @@ -358,15 +360,15 @@ private synchronized void processStructuredFields(List structur private synchronized void processReadPartition(StructuredFieldReadPartition readPartition) throws DatastreamException { switch (readPartition.getType()) { - case QUERY: - processReadPartitionQuery(); - return; - case QUERY_LIST: - processReadPartitionQueryList(readPartition); - return; - default: - throw new DatastreamException( - "Unsupported Read Partition Type - " + readPartition.getType().toString()); + case QUERY: + processReadPartitionQuery(); + return; + case QUERY_LIST: + processReadPartitionQueryList(readPartition); + return; + default: + throw new DatastreamException( + "Unsupported Read Partition Type - " + readPartition.getType().toString()); } } @@ -380,19 +382,19 @@ private synchronized void processReadPartitionQuery() throws DatastreamException private synchronized void processReadPartitionQueryList(StructuredFieldReadPartition readPartition) throws DatastreamException { switch (readPartition.getRequestType()) { - case StructuredFieldReadPartition.REQTYP_LIST: - List supportedReplies = getAllSupportedReplies(); - ArrayList replies = prepareQueryListResponse(supportedReplies, readPartition.getQcodes()); + case StructuredFieldReadPartition.REQTYP_LIST: + List supportedReplies = getAllSupportedReplies(); + ArrayList replies = prepareQueryListResponse(supportedReplies, readPartition.getQcodes()); - sendQueryReplies(new QueryReplySummary(supportedReplies), replies); - return; - case StructuredFieldReadPartition.REQTYP_ALL: - case StructuredFieldReadPartition.REQTYP_EQUIVALENT: - processReadPartitionQuery(); - return; - default: - throw new DatastreamException( - "Unsupported Read Partition Request Type code = " + readPartition.getRequestType()); + sendQueryReplies(new QueryReplySummary(supportedReplies), replies); + return; + case StructuredFieldReadPartition.REQTYP_ALL: + case StructuredFieldReadPartition.REQTYP_EQUIVALENT: + processReadPartitionQuery(); + return; + default: + throw new DatastreamException( + "Unsupported Read Partition Request Type code = " + readPartition.getRequestType()); } } @@ -596,16 +598,13 @@ private void processSF(OrderStartField order) { } private void processSFE(OrderStartFieldExtended order) { - List attributes = order.getAttributes(); - + OrderStartField sf = order.getOrderStartField(); BufferStartOfField bsf = null; - for (IAttribute attr : attributes) { - if (attr instanceof OrderStartField) { - OrderStartField sf = (OrderStartField) attr; - bsf = new BufferStartOfField(this.workingCursor, sf.isFieldProtected(), sf.isFieldNumeric(), - sf.isFieldDisplay(), sf.isFieldIntenseDisplay(), sf.isFieldSelectorPen(), sf.isFieldModifed()); - } - // TODO add processing for character attributes + + if (sf != null) { + bsf = new BufferStartOfField(this.workingCursor, sf.isFieldProtected(), sf.isFieldNumeric(), + sf.isFieldDisplay(), sf.isFieldIntenseDisplay(), sf.isFieldSelectorPen(), sf.isFieldModifed(), + order.getHighlight(), order.getForegroundColour(), order.getBackgroundColor()); } if (bsf == null) { @@ -685,7 +684,11 @@ private void processEUA(OrderEraseUnprotectedToAddress order) { private void processSA(OrderSetAttribute order) { - // TODO add processing for character attributes + if (!detectedSetAttribute) { + detectedSetAttribute = true; + + logger.warn("SetAttribute order has been received, please send a trace to the Galasa team"); + } } private void processNewLine() { @@ -783,10 +786,224 @@ public String printScreenTextWithCursor() { return screenSB.toString(); } - private String reportOperator() { + public String printExtendedScreen(boolean printCursor, boolean printColour, boolean printHighlight, boolean printIntensity, boolean printProtected, boolean printNumeric, boolean printModified) throws Zos3270Exception { int cursorRow = screenCursor / columns; int cursorCol = screenCursor % columns; + StringBuilder screenBuffer = new StringBuilder(); + StringBuilder intensityLine = new StringBuilder(); + StringBuilder protectedLine = new StringBuilder(); + StringBuilder numericLine = new StringBuilder(); + StringBuilder modifiedLine = new StringBuilder(); + StringBuilder foregroundLine = new StringBuilder(); + StringBuilder backgroundLine = new StringBuilder(); + StringBuilder highlightLine = new StringBuilder(); + + int row = 0; + int col = 0; + + // *** Check to see if the screen is wrapped or unformatted + BufferStartOfField currentBufferStartOfField = new BufferStartOfField(0, false, false, true, false, false, false); + if (!(this.buffer[0] instanceof BufferStartOfField)) { + for (int i = this.buffer.length - 1; i >= 0; i--) { + IBufferHolder bh = this.buffer[i]; + if (bh instanceof BufferStartOfField) { + currentBufferStartOfField = (BufferStartOfField) bh; + break; + } + } + } // no need for else as it will be picked up in the loop + + for (int i = 0; i < this.buffer.length; i++) { + // print row header + if (col == 0) { + screenBuffer.append("="); + screenBuffer.append(String.format("%03d", row+1)); + screenBuffer.append("|"); + } + + // Print actual text + IBufferHolder bufferHolder = this.buffer[i]; + if (bufferHolder == null) { + screenBuffer.append(" "); + } else { + screenBuffer.append(bufferHolder.getStringWithoutNulls()); + + if (bufferHolder instanceof BufferStartOfField) { + currentBufferStartOfField = (BufferStartOfField)bufferHolder; + } + } + + + if (bufferHolder == null || bufferHolder == currentBufferStartOfField) { + foregroundLine.append(" "); + backgroundLine.append(" "); + highlightLine.append(" "); + intensityLine.append(" "); + protectedLine.append(" "); + numericLine.append(" "); + modifiedLine.append(" "); + } else { + AttributeForegroundColour foregroundColour = currentBufferStartOfField.getAttributeForegroundColour(); + if (foregroundColour == null) { + foregroundLine.append(" "); + } else { + foregroundLine.append(foregroundColour.getColour().getLetter()); + } + + AttributeBackgroundColour backgroundColour = currentBufferStartOfField.getAttributeBackgroundColour(); + if (backgroundColour == null) { + backgroundLine.append(" "); + } else { + backgroundLine.append(backgroundColour.getColour().getLetter()); + } + + + + + + // Calculate Highlight + AttributeExtendedHighlighting extendedHighlighting = currentBufferStartOfField.getAttributeExtendedHighlighting(); + if (extendedHighlighting == null) { + highlightLine.append(" "); + } else { + switch(extendedHighlighting.getHighlight()) { + case BLINK: + highlightLine.append("b"); + break; + case NORMAL: + highlightLine.append("n"); + break; + case REVERSE: + highlightLine.append("r"); + break; + case UNDERSCORE: + highlightLine.append("u"); + break; + case DEFAULT: + highlightLine.append("d"); + break; + default: + highlightLine.append("?"); + break; + } + } + + // Calculate intensity + if (currentBufferStartOfField.isIntenseDisplay()) { + intensityLine.append("i"); + } else { + intensityLine.append(" "); + } + + // Calculate Protected + if (currentBufferStartOfField.isProtected()) { + protectedLine.append("p"); + } else { + protectedLine.append("u"); + } + + // Calculate Numeric + if (currentBufferStartOfField.isNumeric()) { + numericLine.append("n"); + } else { + numericLine.append(" "); + } + + // Calculate Modified + if (currentBufferStartOfField.isFieldModifed()) { + modifiedLine.append("m"); + } else { + modifiedLine.append(" "); + } + } + + // NOT doing selectable as very unlikely to be used + + + col++; + if (col >= columns) { + screenBuffer.append("|\n"); + + // Check this is the cursor row + if (printCursor) { + if (row == cursorRow) { + screenBuffer.append("^ |"); + for (int j = 0; j < cursorCol; j++) { + screenBuffer.append(" "); + } + screenBuffer.append("^"); + screenBuffer.append('\n'); + } + } + // if requested, print colour + if (printColour) { + screenBuffer.append("f |"); + screenBuffer.append(foregroundLine.toString()); + screenBuffer.append('\n'); + screenBuffer.append("b |"); + screenBuffer.append(backgroundLine.toString()); + screenBuffer.append('\n'); + } + // if requested, print intensity + if (printIntensity) { + screenBuffer.append("i |"); + screenBuffer.append(intensityLine.toString()); + screenBuffer.append('\n'); + } + // if requested, print highlight + if (printHighlight) { + screenBuffer.append("h |"); + screenBuffer.append(highlightLine.toString()); + screenBuffer.append('\n'); + } + // if requested, print protected + if (printProtected) { + screenBuffer.append("p |"); + screenBuffer.append(protectedLine.toString()); + screenBuffer.append('\n'); + } + // if requested, print numeric + if (printNumeric) { + screenBuffer.append("n |"); + screenBuffer.append(numericLine.toString()); + screenBuffer.append('\n'); + } + // if requested, print modifles + if (printModified) { + screenBuffer.append("m |"); + screenBuffer.append(modifiedLine.toString()); + screenBuffer.append('\n'); + } + + + // Reset for next row + col = 0; + row++; + + // Reset the report lines + intensityLine = new StringBuilder(); + protectedLine = new StringBuilder(); + numericLine = new StringBuilder(); + modifiedLine = new StringBuilder(); + foregroundLine = new StringBuilder(); + backgroundLine = new StringBuilder(); + highlightLine = new StringBuilder(); + } + } + + screenBuffer.append("! | "); + screenBuffer.append(reportOperator()); + screenBuffer.append("\n"); + + return screenBuffer.toString(); + } + + + private String reportOperator() { + int cursorRow = (screenCursor / columns) + 1; + int cursorCol = screenCursor % columns; + StringBuilder operator = new StringBuilder(); if (network.isConnected()) { @@ -944,8 +1161,8 @@ public int waitForTextInField(String text, long maxWait) throws TerminalInterrup public int waitForTextInField(String[] ok, String[] error, long timeoutInMilliseconds) throws TerminalInterruptedException, TextNotFoundException, ErrorTextFoundException, Zos3270Exception { int foundIndex = -1; - try { - foundIndex = ScreenUpdateTextListener.waitForText(this, ok, error, timeoutInMilliseconds); + try { + foundIndex = ScreenUpdateTextListener.waitForText(this, ok, error, timeoutInMilliseconds); if (foundIndex < 0) { if (ok != null && ok.length == 1 && error == null) { throw new TextNotFoundException(CANT_FIND_TEXT + ok[0] + "'"); @@ -1658,8 +1875,36 @@ public synchronized boolean isClearScreen() { return false; } } - + return true; } + public Colour getColourAtPosition(int pos) { + + Field[] fields = calculateFields(); + Field currentField = fields[0]; + for (int i = 1; i < fields.length; i++) { + if (fields[i].getStart() > pos) { + break; + } + currentField = fields[i]; + } + + return currentField.getForegroundColour(); + } + + public Highlight getHighlightAtPosition(int pos) { + Field[] fields = calculateFields(); + Field currentField = fields[0]; + for (int i = 1; i < fields.length; i++) { + if (fields[i].getStart() > pos) { + break; + } + currentField = fields[i]; + } + + return currentField.getHighlight(); + } + + } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Terminal.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Terminal.java index ec9c8c18a..d34bb31ea 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Terminal.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Terminal.java @@ -531,6 +531,12 @@ public ITerminal reportScreenWithCursor() { return this; } + @Override + public ITerminal reportExtendedScreen(boolean printCursor, boolean printColour, boolean printHighlight, boolean printIntensity, boolean printProtected, boolean printNumeric, boolean printModified) throws Zos3270Exception { + logger.info("\n" + screen.printExtendedScreen(printCursor, printColour, printHighlight, printIntensity, printProtected, printNumeric, printModified)); + return this; + } + @Override public String getId() { return this.id; @@ -662,5 +668,40 @@ private void checkCursorPosition(int row, int col, int length) throws Zos3270Exc } + @Override + public Colour retrieveColourAtCursor() { + int pos = screen.getCursor(); + return screen.getColourAtPosition(pos); + } + + @Override + public Colour retrieveColourAtPosition(int row, int col) throws Zos3270Exception { + checkCursorPosition(row, col, 0 /* not worried about length */); + + row--; + col--; + int pos = (row * screen.getNoOfColumns()) + col; + + return screen.getColourAtPosition(pos); + } + + @Override + public Highlight retrieveHighlightAtCursor() { + int pos = screen.getCursor(); + return screen.getHighlightAtPosition(pos); + } + + @Override + public Highlight retrieveHighlightAtPosition(int row, int col) throws Zos3270Exception { + checkCursorPosition(row, col, 0 /* not worried about length */); + + row--; + col--; + + int pos = (row * screen.getNoOfColumns()) + col; + + return screen.getHighlightAtPosition(pos); + } + } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index 2718a0797..c5e808a03 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -254,14 +254,32 @@ private static List buildTerminalFields(Screen screen) { for (Field screenField : screenFields) { int row = screenField.getStart() / screen.getNoOfColumns(); int column = screenField.getStart() % screen.getNoOfColumns(); + + Character cForegroundColour = null; + Character cBackgroundColour = null; + Character cHighlight = null; + + Colour foregroundColour = screenField.getForegroundColour(); + Colour backgroundColour = screenField.getBackgroundColour(); + Highlight highlight = screenField.getHighlight(); + + if (foregroundColour != null) { + cForegroundColour = foregroundColour.getLetter(); + } + if (backgroundColour != null) { + cBackgroundColour = backgroundColour.getLetter(); + } + if (highlight != null) { + cHighlight = highlight.getLetter(); + } TerminalField terminalField = new TerminalField(row, column, screenField.isUnformatted(), screenField.isProtected(), screenField.isNumeric(), screenField.isDisplay(), - screenField.isIntenseDisplay(), screenField.isSelectorPen(), screenField.isFieldModifed()); + screenField.isIntenseDisplay(), screenField.isSelectorPen(), screenField.isFieldModifed(), + cForegroundColour, cBackgroundColour, cHighlight); Character[] chars = screenField.getFieldCharsWithNulls(); - terminalField.getContents().add(new FieldContents(chars)); // TODO needs to be expanded when we record - // extended attributes + terminalField.getContents().add(new FieldContents(chars)); // TODO, needs modifying when we know how to support SetAttribute order terminalFields.add(terminalField); } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestColour.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestColour.java new file mode 100644 index 000000000..cd726e8c1 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestColour.java @@ -0,0 +1,43 @@ +/* + * Copyright contributors to the Galasa project + */ +package t; + +import java.nio.ByteBuffer; + +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Hex; + +import dev.galasa.zos3270.Zos3270Exception; +import dev.galasa.zos3270.internal.comms.Inbound3270Message; +import dev.galasa.zos3270.internal.comms.Network; +import dev.galasa.zos3270.internal.comms.NetworkThread; +import dev.galasa.zos3270.spi.Screen; + +public class TestColour { + + + public static void main(String[] args) throws DecoderException, Zos3270Exception { + + String inbound = "f5c2115b611311c2601df8d59699948193408689859384a211c5401df0d596999481931df8c995a38595a28511c6501d40e385a2a340c99597a4a3404040401df011c8f0290341f442f7c0f8c889878893898788a3899587114b50290341f242f2c0f0d9858440d985a58599a285290341f242f2c0f0d98584408187818995114c6f290341f242f1c0f0c293a48540d985a58599a285290341f242f3c0f0d789959240d985a58599a285290341f242f4c0f0c79985859540d985a58599a285290341f242f5c0f0e3a49998a49689a28540d985a58599a285114df0290341f242f7c0f0e68889a38540d985a58599a28511505e290341f442f6c0f0e885939396a640e4958485999389958511d27a290341f142f6c0f0e885939396a640c29389959211d55c290242f6c0f0e885939396a640d6a4a393899585114c60290341f242f6c0f0e885939396a640d985a58599a285114040290242f7c0f0e385a2a340c5a7a3859584858440c481a381a2a39985819440d4819711d550290242f2c0f0d9858440d6a4a39389958511d940290242f2c0f0d98584290242f1c0f0c293a485290242f3c0f0d7899592290242f4c0f0c799858595290242f5c0f0e3a49998a49689a285290242f6c0f0e885939396a6290242f7c0f0e68889a3851df0c4858681a493a3115a50290242f2c0f8d98584290242f1c0f8c293a485290242f3c0f8d7899592290242f4c0f8c799858595290242f5c0f8e3a49998a49689a285290242f6c0f8e885939396a6290242f7c0f8e68889a3851df8c4858681a493a311d2f0290341f142f2c0f0d9858440c293899592115050290341f442f2c0f0d9858440e49584859993899585115b60290341f442f4c0c1115c6f1df0"; + byte[] inboundBytes = Hex.decodeHex(inbound); + + Network network = new Network("here", 1, "a"); + Screen screen = new Screen(80, 24, network); + NetworkThread networkThread = new NetworkThread(null, screen, network, null); + + ByteBuffer buffer = ByteBuffer.wrap(inboundBytes); + Inbound3270Message im = networkThread.process3270Data(buffer); + screen.processInboundMessage(im); + // System.out.println(screen.printScreenTextWithCursor()); + + System.out.println(screen.printExtendedScreen(false, true, true, false, false, false, false)); +// System.out.println(screen.printExtendedScreen(true, true, true, true, true, true, true)); + + // for(Field field : screen.calculateFields()) { + // System.out.println(field); + // } + + } + +} diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestInbound.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestInbound.java index d31fcc60e..ba7f3f0f5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestInbound.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestInbound.java @@ -1,3 +1,6 @@ +/* + * Copyright contributors to the Galasa project + */ package t; import java.nio.ByteBuffer; @@ -7,6 +10,7 @@ import dev.galasa.zos3270.TerminalInterruptedException; import dev.galasa.zos3270.internal.comms.Inbound3270Message; +import dev.galasa.zos3270.internal.comms.Network; import dev.galasa.zos3270.internal.comms.NetworkThread; import dev.galasa.zos3270.spi.Field; import dev.galasa.zos3270.spi.NetworkException; @@ -26,8 +30,8 @@ public static void main(String[] args) throws TerminalInterruptedException, Netw byte[] inbound2Bytes = Hex.decodeHex(inbound2); byte[] inbound3Bytes = Hex.decodeHex(inbound3); - - Screen screen = new Screen(80, 24, null); + Network network = new Network("here", 1, "a"); + Screen screen = new Screen(80, 24, network); NetworkThread networkThread = new NetworkThread(null, screen, null, null); ByteBuffer buffer = ByteBuffer.wrap(inbound1Bytes); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/extended/ExtendedDatastreamTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/extended/ExtendedDatastreamTest.java new file mode 100644 index 000000000..42b971c66 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/extended/ExtendedDatastreamTest.java @@ -0,0 +1,78 @@ +/* + * Copyright contributors to the Galasa project + */ +package test.zos3270.datastream.extended; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.nio.ByteBuffer; +import java.util.ArrayList; + +import org.apache.commons.codec.binary.Hex; +import org.junit.Test; + +import dev.galasa.zos3270.internal.comms.Inbound3270Message; +import dev.galasa.zos3270.internal.comms.Network; +import dev.galasa.zos3270.internal.datastream.AbstractOrder; +import dev.galasa.zos3270.internal.datastream.BufferAddress; +import dev.galasa.zos3270.internal.datastream.CommandEraseWrite; +import dev.galasa.zos3270.internal.datastream.OrderSetBufferAddress; +import dev.galasa.zos3270.internal.datastream.OrderStartField; +import dev.galasa.zos3270.internal.datastream.OrderStartFieldExtended; +import dev.galasa.zos3270.internal.datastream.OrderText; +import dev.galasa.zos3270.internal.datastream.WriteControlCharacter; +import dev.galasa.zos3270.spi.Colour; +import dev.galasa.zos3270.spi.Highlight; +import dev.galasa.zos3270.spi.Screen; + +public class ExtendedDatastreamTest { + + @Test + public void testColour1() throws Exception { + + String redReverse = "0341f242f2c0f8"; + String greenBlink = "0341f142f4c0f8"; + String blueNormal = "0341f042f1c0f8"; + byte[] redReverseStream = Hex.decodeHex(redReverse); + byte[] greenBlinkStream = Hex.decodeHex(greenBlink); + byte[] blueNormalStream = Hex.decodeHex(blueNormal); + ByteBuffer redReverseBuffer = ByteBuffer.wrap(redReverseStream); + ByteBuffer greenBlinkBuffer = ByteBuffer.wrap(greenBlinkStream); + ByteBuffer blueNormalBuffer = ByteBuffer.wrap(blueNormalStream); + + Network network = new Network("here", 1, "a"); + Screen screen = new Screen(10, 2, network); + screen.erase(); + + ArrayList orders = new ArrayList<>(); + orders.add(new OrderSetBufferAddress(new BufferAddress(0))); + orders.add(new OrderStartFieldExtended(redReverseBuffer)); + orders.add(new OrderText("1234")); + orders.add(new OrderSetBufferAddress(new BufferAddress(5))); + orders.add(new OrderStartFieldExtended(greenBlinkBuffer)); + orders.add(new OrderText("5678")); + orders.add(new OrderSetBufferAddress(new BufferAddress(10))); + orders.add(new OrderStartFieldExtended(blueNormalBuffer)); + orders.add(new OrderText("ABCD")); + orders.add(new OrderSetBufferAddress(new BufferAddress(15))); + orders.add(new OrderStartField(false, false, true, false, false, false)); + orders.add(new OrderText("EFGH")); + + screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), + new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); + + assertThat(screen.getColourAtPosition(2)).as("Field 1 should be red").isEqualTo(Colour.RED); + assertThat(screen.getHighlightAtPosition(2)).as("Field 1 should be reverse").isEqualTo(Highlight.REVERSE); + + assertThat(screen.getColourAtPosition(7)).as("Field 2 should be red").isEqualTo(Colour.GREEN); + assertThat(screen.getHighlightAtPosition(7)).as("Field 2 should be reverse").isEqualTo(Highlight.BLINK); + + assertThat(screen.getColourAtPosition(12)).as("Field 3 should be red").isEqualTo(Colour.BLUE); + assertThat(screen.getHighlightAtPosition(12)).as("Field 3 should be reverse").isEqualTo(Highlight.NORMAL); + + assertThat(screen.getColourAtPosition(17)).as("Field 4 should be standard field").isNull();; + assertThat(screen.getHighlightAtPosition(17)).as("Field 4 should be standard field").isNull(); + + } + +} diff --git a/release.yaml b/release.yaml index 5a2e73c1c..7da68a975 100644 --- a/release.yaml +++ b/release.yaml @@ -479,7 +479,7 @@ managers: codecoverage: true - artifact: dev.galasa.zos3270.common - version: 0.21.0 + version: 0.25.0 obr: true bom: true mvp: true From f77625b74c34e2deb1102ab5cb96a999ae258ae6 Mon Sep 17 00:00:00 2001 From: Will Yates Date: Fri, 30 Sep 2022 17:43:20 +0100 Subject: [PATCH 006/263] infixes badly reported when testProperty Not found Signed-off-by: Will Yates --- .../java/dev/galasa/core/manager/internal/CoreManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java index c48d70d82..7621ae6b7 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java @@ -174,7 +174,7 @@ public String createTestproperty(Field field, List annotations) thro + ",suffix=" + testPropertyAnnotation.suffix() + ",infixes=" - + testPropertyAnnotation.infixes()); + + String.join(",",testPropertyAnnotation.infixes()); } return value; From a4b53c4bdcfb2e73a8d1950d2e39d8b761490856 Mon Sep 17 00:00:00 2001 From: Will Yates Date: Tue, 4 Oct 2022 13:09:09 +0100 Subject: [PATCH 007/263] missing parenthesis Signed-off-by: Will Yates --- .../java/dev/galasa/core/manager/internal/CoreManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java index 7621ae6b7..8f7456aa0 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java @@ -174,7 +174,7 @@ public String createTestproperty(Field field, List annotations) thro + ",suffix=" + testPropertyAnnotation.suffix() + ",infixes=" - + String.join(",",testPropertyAnnotation.infixes()); + + String.join(",",testPropertyAnnotation.infixes())); } return value; From f9013bdaf7790dfbee465693a58b00b3a41c885c Mon Sep 17 00:00:00 2001 From: Will Yates Date: Tue, 4 Oct 2022 17:22:15 +0100 Subject: [PATCH 008/263] Iss1063 (#811) * fix annnoying double resource folder problems Signed-off-by: Will Yates * Update the artifact manager IVT to remove the resources folder Signed-off-by: Will Yates * update artifact manager IVT source Signed-off-by: Will Yates * bump the level of artifact manager IVT Signed-off-by: Will Yates * get the IVT running and copyright Signed-off-by: Will Yates * roll out change to other managers Signed-off-by: Will Yates * version bumps and release.yaml Signed-off-by: Will Yates * some copyright updates Signed-off-by: Will Yates * last lot of copyright Signed-off-by: Will Yates Signed-off-by: Will Yates --- .../build.gradle | 2 +- .../docker/manager/ivt/DockerManagerIVT.java | 2 +- .../{resources => }/SampleConfig.cfg | 0 .../main/resources/{resources => }/test1.html | 0 .../docker/internal/DockerVolumeImpl.java | 2 +- .../{resources => }/CommandBusyboxDockerfile | 0 .../{resources => }/VolumeBusyboxDockerfile | 0 .../{resources => }/testConfigMap.yaml | 1 + .../{resources => }/testDeployment.yaml | 1 + .../resources/{resources => }/testPvc.yaml | 1 + .../resources/{resources => }/testSecret.yaml | 1 + .../{resources => }/testService.yaml | 1 + .../{resources => }/testStatefulSet.yaml | 1 + .../build.gradle | 2 +- .../manager/ivt/ArtifactManagerIVT.java | 96 ++++++++---------- .../directory/nestedDirectory/nestedFile.txt | 0 .../{resources => }/jars/HelloGalasa.jar | Bin .../jars/HelloGalasa_0.0.1.jar | Bin .../jars/dev.galasa.0.15.0.202105120649.jar | Bin .../jarsHyphenVersion/HelloGalasa-0.0.1.jar | Bin .../{resources => }/skeletons/test1.skel | 0 .../{resources => }/skeletons/test2.skel | 0 .../{resources => }/textFiles/list.txt | 0 .../{resources => }/textFiles/test1.txt | 0 .../velocity/velocityTest.skel | 0 .../{resources => }/zipFiles/zipTest.txt | 0 .../dev/galasa/artifact/ArtifactManager.java | 4 +- .../galasa/artifact/ArtifactManagerField.java | 4 +- .../dev/galasa/artifact/BundleResources.java | 4 +- .../dev/galasa/artifact/IArtifactManager.java | 4 +- .../dev/galasa/artifact/IBundleResources.java | 4 +- .../galasa/artifact/ISkeletonProcessor.java | 4 +- .../artifact/OutputRepositoryException.java | 4 +- .../artifact/SkeletonProcessorException.java | 4 +- .../artifact/TestBundleResourceException.java | 4 +- .../internal/ArtifactManagerImpl.java | 4 +- .../internal/BundleResourcesImpl.java | 7 +- .../internal/PlusPlusSkeletonProcessor.java | 4 +- .../internal/VelocitySkeletonProcessor.java | 4 +- .../dev/galasa/artifact/package-info.java | 4 +- .../dev.galasa.db2.manager.ivt/build.gradle | 2 +- .../main/resources/{resources => }/Batch.txt | 0 .../{resources => }/k8s/bootstrap-file.yaml | 1 + .../{resources => }/k8s/config-grafana.yaml | 1 + .../k8s/config-prometheus.yaml | 1 + .../resources/{resources => }/k8s/config.yaml | 1 + .../{resources => }/k8s/expose-simbank.yaml | 1 + .../{resources => }/k8s/expose-testing.yaml | 1 + .../resources/{resources => }/k8s/expose.yaml | 1 + .../{resources => }/k8s/pvc-api.yaml | 1 + .../{resources => }/k8s/pvc-grafana.yaml | 1 + .../{resources => }/k8s/pvc-prometheus.yaml | 1 + .../{resources => }/k8s/server-api.yaml | 0 .../{resources => }/k8s/server-cps-etcd3.yaml | 0 .../k8s/server-engine-controller.yaml | 0 .../{resources => }/k8s/server-grafana.yaml | 0 .../{resources => }/k8s/server-metrics.yaml | 0 .../k8s/server-prometheus.yaml | 0 .../k8s/server-ras-couchdb.yaml | 0 .../k8s/server-resource-monitor.yaml | 2 - .../{resources => }/k8s/server-simbank.yaml | 2 - .../{resources => }/k8s/testcatalog-file.yaml | 1 + .../resources/{resources => }/local/run.sh | 0 .../{resources => }/local/simplatform.sh | 0 .../resources/{resources => }/maven/pom.xml | 0 .../{resources => }/maven/settings.xml | 0 .../build.gradle | 2 +- .../resources => res}/DynamicTest.jmx | 0 .../resources => res}/ExistingTest.jmx | 0 .../resources => res}/jmeter.properties | 0 .../selenium-node-deployment.yaml | 1 + .../{resources => }/selenium-node-expose.yaml | 1 + .../{resources => }/selenium-node-pod.yaml | 1 + .../resources/{resources => }/jcl/dumpJCL | 0 .../dev.galasa.zos.manager.ivt/build.gradle | 2 +- .../zos/manager/ivt/ZosManagerBatchIVT.java | 20 ++-- .../manager/ivt/ZosManagerFileDatasetIVT.java | 6 +- .../manager/ivt/ZosManagerFileVSAMIVT.java | 6 +- .../{resources => }/jcl/PDSCheck.jcl | 0 .../{resources => }/jcl/PDSDelete.jcl | 0 .../{resources => }/jcl/doNothing.jcl | 0 .../{resources => }/jcl/helloWorld.jcl | 0 .../resources/{resources => }/jcl/list.jcl | 0 .../resources/{resources => }/jcl/noSteps.jcl | 0 .../build.gradle | 2 +- .../internal/ZosProgramManagerImpl.java | 6 +- release.yaml | 12 +-- 87 files changed, 104 insertions(+), 141 deletions(-) rename galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/resources/{resources => }/SampleConfig.cfg (100%) rename galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/resources/{resources => }/test1.html (100%) rename galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/resources/{resources => }/CommandBusyboxDockerfile (100%) rename galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/resources/{resources => }/VolumeBusyboxDockerfile (100%) rename galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/{resources => }/testConfigMap.yaml (72%) rename galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/{resources => }/testDeployment.yaml (88%) rename galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/{resources => }/testPvc.yaml (76%) rename galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/{resources => }/testSecret.yaml (67%) rename galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/{resources => }/testService.yaml (77%) rename galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/{resources => }/testStatefulSet.yaml (89%) rename galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/{resources => }/directory/nestedDirectory/nestedFile.txt (100%) rename galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/{resources => }/jars/HelloGalasa.jar (100%) rename galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/{resources => }/jars/HelloGalasa_0.0.1.jar (100%) rename galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/{resources => }/jars/dev.galasa.0.15.0.202105120649.jar (100%) rename galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/{resources => }/jarsHyphenVersion/HelloGalasa-0.0.1.jar (100%) rename galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/{resources => }/skeletons/test1.skel (100%) rename galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/{resources => }/skeletons/test2.skel (100%) rename galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/{resources => }/textFiles/list.txt (100%) rename galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/{resources => }/textFiles/test1.txt (100%) rename galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/{resources => }/velocity/velocityTest.skel (100%) rename galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/{resources => }/zipFiles/zipTest.txt (100%) rename galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/src/main/resources/{resources => }/Batch.txt (100%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/k8s/bootstrap-file.yaml (81%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/k8s/config-grafana.yaml (99%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/k8s/config-prometheus.yaml (93%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/k8s/config.yaml (94%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/k8s/expose-simbank.yaml (94%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/k8s/expose-testing.yaml (94%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/k8s/expose.yaml (96%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/k8s/pvc-api.yaml (76%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/k8s/pvc-grafana.yaml (77%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/k8s/pvc-prometheus.yaml (77%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/k8s/server-api.yaml (100%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/k8s/server-cps-etcd3.yaml (100%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/k8s/server-engine-controller.yaml (100%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/k8s/server-grafana.yaml (100%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/k8s/server-metrics.yaml (100%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/k8s/server-prometheus.yaml (100%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/k8s/server-ras-couchdb.yaml (100%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/k8s/server-resource-monitor.yaml (99%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/k8s/server-simbank.yaml (99%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/k8s/testcatalog-file.yaml (77%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/local/run.sh (100%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/local/simplatform.sh (100%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/maven/pom.xml (100%) rename galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/{resources => }/maven/settings.xml (100%) rename galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/{resources/resources => res}/DynamicTest.jmx (100%) rename galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/{resources/resources => res}/ExistingTest.jmx (100%) rename galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/{resources/resources => res}/jmeter.properties (100%) rename galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/{resources => }/selenium-node-deployment.yaml (91%) rename galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/{resources => }/selenium-node-expose.yaml (85%) rename galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/{resources => }/selenium-node-pod.yaml (85%) rename galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/resources/{resources => }/jcl/dumpJCL (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/{resources => }/jcl/PDSCheck.jcl (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/{resources => }/jcl/PDSDelete.jcl (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/{resources => }/jcl/doNothing.jcl (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/{resources => }/jcl/helloWorld.jcl (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/{resources => }/jcl/list.jcl (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/{resources => }/jcl/noSteps.jcl (100%) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/build.gradle index dbcdfbf7b..4faa93e91 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Docker Manager IVTs' -version = '0.21.0' +version = '0.25.0' dependencies { implementation project(':galasa-managers-cloud-parent:dev.galasa.docker.manager') diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/java/dev/galasa/docker/manager/ivt/DockerManagerIVT.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/java/dev/galasa/docker/manager/ivt/DockerManagerIVT.java index e6bca5c20..dc3af3ea5 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/java/dev/galasa/docker/manager/ivt/DockerManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/java/dev/galasa/docker/manager/ivt/DockerManagerIVT.java @@ -259,7 +259,7 @@ public void twoContainersShareVolume() throws DockerManagerException { @Test public void preLoadVolumeWithConfig() throws DockerManagerException, TestBundleResourceException, InterruptedException { IDockerVolume volume = config2.getVolumeByTag("testVolume"); - InputStream in = resources.retrieveFile("resources/SampleConfig.cfg"); + InputStream in = resources.retrieveFile("SampleConfig.cfg"); volume.LoadFile("TestConfigFile.cfg", in); container.startWithConfig(config2); IDockerExec cmd = container.exec("/bin/cat", "/tmp/testvol/TestConfigFile.cfg"); diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/resources/resources/SampleConfig.cfg b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/resources/SampleConfig.cfg similarity index 100% rename from galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/resources/resources/SampleConfig.cfg rename to galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/resources/SampleConfig.cfg diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/resources/resources/test1.html b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/resources/test1.html similarity index 100% rename from galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/resources/resources/test1.html rename to galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/resources/test1.html diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerVolumeImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerVolumeImpl.java index dacdc2272..3860f3e51 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerVolumeImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerVolumeImpl.java @@ -204,7 +204,7 @@ private InputStream createDockerfile(String dockerfile, Map subs) try { String dockerfileTemplate = this.dockerManager.getArtifactManager() .getBundleResources(this.getClass()) - .retrieveSkeletonFileAsString("resources/" + dockerfile, subs); + .retrieveSkeletonFileAsString(dockerfile, subs); return new ByteArrayInputStream(dockerfileTemplate.getBytes()); } catch (IOException | TestBundleResourceException e) { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/resources/resources/CommandBusyboxDockerfile b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/resources/CommandBusyboxDockerfile similarity index 100% rename from galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/resources/resources/CommandBusyboxDockerfile rename to galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/resources/CommandBusyboxDockerfile diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/resources/resources/VolumeBusyboxDockerfile b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/resources/VolumeBusyboxDockerfile similarity index 100% rename from galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/resources/resources/VolumeBusyboxDockerfile rename to galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/resources/VolumeBusyboxDockerfile diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/resources/testConfigMap.yaml b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testConfigMap.yaml similarity index 72% rename from galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/resources/testConfigMap.yaml rename to galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testConfigMap.yaml index 15bed58a6..97b27c2b0 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/resources/testConfigMap.yaml +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testConfigMap.yaml @@ -1,3 +1,4 @@ +# Copyright contributors to the Galasa project apiVersion: v1 kind: ConfigMap metadata: diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/resources/testDeployment.yaml b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testDeployment.yaml similarity index 88% rename from galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/resources/testDeployment.yaml rename to galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testDeployment.yaml index eb2f31fa9..1b69990ea 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/resources/testDeployment.yaml +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testDeployment.yaml @@ -1,3 +1,4 @@ +# Copyright contributors to the Galasa project apiVersion: apps/v1 kind: Deployment metadata: diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/resources/testPvc.yaml b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testPvc.yaml similarity index 76% rename from galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/resources/testPvc.yaml rename to galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testPvc.yaml index c40874588..6dc9f9fe9 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/resources/testPvc.yaml +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testPvc.yaml @@ -1,3 +1,4 @@ +# Copyright contributors to the Galasa project apiVersion: v1 kind: PersistentVolumeClaim metadata: diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/resources/testSecret.yaml b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testSecret.yaml similarity index 67% rename from galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/resources/testSecret.yaml rename to galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testSecret.yaml index 1f7ff0098..075440bba 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/resources/testSecret.yaml +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testSecret.yaml @@ -1,3 +1,4 @@ +# Copyright contributors to the Galasa project apiVersion: v1 kind: Secret metadata: diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/resources/testService.yaml b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testService.yaml similarity index 77% rename from galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/resources/testService.yaml rename to galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testService.yaml index f31ea0c86..1a259d912 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/resources/testService.yaml +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testService.yaml @@ -1,3 +1,4 @@ +# Copyright contributors to the Galasa project apiVersion: v1 kind: Service metadata: diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/resources/testStatefulSet.yaml b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testStatefulSet.yaml similarity index 89% rename from galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/resources/testStatefulSet.yaml rename to galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testStatefulSet.yaml index 6aa18fa4b..4b8ad07a7 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/resources/testStatefulSet.yaml +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testStatefulSet.yaml @@ -1,3 +1,4 @@ +# Copyright contributors to the Galasa project apiVersion: apps/v1 kind: StatefulSet metadata: diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/build.gradle index 6bcd57faf..948f22555 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Artifact Manager IVTs' -version = '0.21.0' +version = '0.25.0' dependencies { implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/java/dev/galasa/artifact/manager/ivt/ArtifactManagerIVT.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/java/dev/galasa/artifact/manager/ivt/ArtifactManagerIVT.java index a8634946c..545f07bec 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/java/dev/galasa/artifact/manager/ivt/ArtifactManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/java/dev/galasa/artifact/manager/ivt/ArtifactManagerIVT.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.artifact.manager.ivt; @@ -45,14 +43,14 @@ public void checkManagerNotNull() throws Exception { @Test public void testRetrieveFileAsStringMethod() throws Exception { - String textContent = resources.retrieveFileAsString("/resources/textFiles/test1.txt"); + String textContent = resources.retrieveFileAsString("/textFiles/test1.txt"); logger.debug("Read the following from the file test1.txt: " + textContent); assertThat(textContent.trim()).isEqualTo("Hello from Galasa"); } @Test public void testRetrieveSkeletonFileAsStringMethod() throws Exception { - String textContent = resources.retrieveSkeletonFileAsString("/resources/skeletons/test1.skel", buildHashMap()); + String textContent = resources.retrieveSkeletonFileAsString("/skeletons/test1.skel", buildHashMap()); logger.info("Received the following from the skeleton file: " + textContent); assertThat(textContent.trim()).isEqualTo("The third parameter is ITEM NUMBER THREE"); } @@ -60,7 +58,7 @@ public void testRetrieveSkeletonFileAsStringMethod() throws Exception { @Test public void readTextFileArtifactManager() throws Exception, TestBundleResourceException, IOException { - InputStream file = resources.retrieveFile("/resources/textFiles/test1.txt"); + InputStream file = resources.retrieveFile("/textFiles/test1.txt"); String textContent = artifacts.getBundleResources(this.getClass()).streamAsString(file); logger.debug("Read the following from the file test1.txt: " + textContent); assertThat(textContent.trim()).isEqualTo("Hello from Galasa"); @@ -68,7 +66,7 @@ public void readTextFileArtifactManager() throws Exception, TestBundleResourceEx @Test public void readTextFileBundleResources() throws Exception, TestBundleResourceException, IOException { - String textContent = resources.streamAsString(resources.retrieveFile("/resources/textFiles/test1.txt")); + String textContent = resources.streamAsString(resources.retrieveFile("/textFiles/test1.txt")); logger.debug("Read the following from the file test1.txt: " + textContent); assertThat(textContent.trim()).isEqualTo("Hello from Galasa"); } @@ -83,21 +81,21 @@ private HashMap buildHashMap(){ @Test public void readSkeletonBundleResources() throws TestBundleResourceException, Exception, IOException { - String textContent = resources.streamAsString(resources.retrieveSkeletonFile("/resources/skeletons/test1.skel", buildHashMap())); + String textContent = resources.streamAsString(resources.retrieveSkeletonFile("/skeletons/test1.skel", buildHashMap())); logger.info("Received the following from the skeleton file: " + textContent); assertThat(textContent.trim()).isEqualTo("The third parameter is ITEM NUMBER THREE"); } @Test public void readSkeletonBundleResourcesVelocity() throws TestBundleResourceException, Exception, IOException { - String textContent = resources.streamAsString(resources.retrieveSkeletonFile("/resources/velocity/velocityTest.skel", buildHashMap(), SkeletonType.VELOCITY)); + String textContent = resources.streamAsString(resources.retrieveSkeletonFile("/velocity/velocityTest.skel", buildHashMap(), SkeletonType.VELOCITY)); logger.info("Received the following from the skeleton file: " + textContent); assertThat(textContent.trim()).isEqualTo("The third parameter is ITEM NUMBER THREE"); } @Test public void readSkeletonFileArtifactManager() throws TestBundleResourceException, Exception, IOException { - InputStream is = resources.retrieveSkeletonFile("/resources/skeletons/test1.skel", buildHashMap()); + InputStream is = resources.retrieveSkeletonFile("/skeletons/test1.skel", buildHashMap()); String textContent = artifacts.getBundleResources(this.getClass()).streamAsString(is); logger.info("Received the following from the skeleton file: " + textContent); @@ -111,7 +109,7 @@ public void readSkeletonFile2ArtifactManager() throws TestBundleResourceExceptio props.put("ITEM2", "SECOND ITEM"); props.put("ITEM3", "ITEM NUMBER THREE"); - InputStream is = resources.retrieveSkeletonFile("/resources/skeletons/test2.skel", props); + InputStream is = resources.retrieveSkeletonFile("/skeletons/test2.skel", props); String textContent = artifacts.getBundleResources(this.getClass()).streamAsString(is); logger.info("Received the following from the skeleton file: " + textContent); @@ -121,7 +119,7 @@ public void readSkeletonFile2ArtifactManager() throws TestBundleResourceExceptio @Test public void readFileAsList() throws TestBundleResourceException, IOException { - InputStream is = resources.retrieveFile("/resources/textFiles/list.txt"); + InputStream is = resources.retrieveFile("/textFiles/list.txt"); List listContent = artifacts.getBundleResources(this.getClass()).streamAsList(is); logger.info("Received the following from the text file: " + listContent); @@ -133,17 +131,17 @@ public void readFileAsList() throws TestBundleResourceException, IOException { @Test public void retrieveDirectoryContentsTest() throws Exception { - Map contents = resources.retrieveDirectoryContents("/resources/textFiles"); + Map contents = resources.retrieveDirectoryContents("/textFiles"); logger.info("Received the following from the directory: " + contents); - assertThat(contents).containsKey("resources/textFiles/list.txt"); - assertThat(contents).containsKey("resources/textFiles/test1.txt"); + assertThat(contents).containsKey("textFiles/list.txt"); + assertThat(contents).containsKey("textFiles/test1.txt"); } @Test public void retrieveEmptyDirectoryContentsTest() throws Exception { - Map contents = resources.retrieveDirectoryContents("/resources/emptyDirectory"); + Map contents = resources.retrieveDirectoryContents("/emptyDirectory"); logger.info("Received the following from the directory: " + contents); @@ -152,57 +150,43 @@ public void retrieveEmptyDirectoryContentsTest() throws Exception { @Test public void retrieveNestedirectoryContentsTest() throws Exception { - Map contents = resources.retrieveDirectoryContents("/resources/directory"); + Map contents = resources.retrieveDirectoryContents("/directory"); logger.info("Received the following from the directory: " + contents); - assertThat(contents).containsKey("resources/directory/nestedDirectory/nestedFile.txt"); + assertThat(contents).containsKey("directory/nestedDirectory/nestedFile.txt"); } @Test public void retrieveSkeletonDirectoryContentsTest() throws Exception { - Map contents = resources.retrieveSkeletonDirectoryContents("/resources/skeletons", buildHashMap(), 0); + Map contents = resources.retrieveSkeletonDirectoryContents("/skeletons", buildHashMap(), 0); logger.info("Received the following from the directory: " + contents); //Asserts that directory contains correct files - assertThat(contents).containsKey("resources/skeletons/test1.skel"); - assertThat(contents).containsKey("resources/skeletons/test2.skel"); + assertThat(contents).containsKey("skeletons/test1.skel"); + assertThat(contents).containsKey("skeletons/test2.skel"); + + //assert that there are only two entries + assertThat(contents.keySet().size()).isEqualTo(2); + + String textContent = new String(); + + textContent = resources.streamAsString(contents.get("skeletons/test1.skel")); + logger.info("Received the following from the file: " + textContent); + assertThat(textContent).contains("ITEM NUMBER THREE"); - int i = 1; - //Iterates through the directory contents - for (Map.Entry entry : contents.entrySet()) { - //Switch checks i and uses case associated, initially set to 1 - switch(i) - { - //For the first inputStream stored in Map, stream as a string and assert that variables are correctly substituted - case 1: - String textContent = resources.streamAsString(entry.getValue()); - logger.info("Received the following from the file: " + textContent); + textContent = resources.streamAsString(contents.get("skeletons/test2.skel")); + logger.info("Received the following from the file: " + textContent); + assertThat(textContent).contains("The third parameter is ITEM NUMBER THREE\n" + + "The first item was \"THIS IS ITEM1\" and this is the second line "); - assertThat(textContent).contains("ITEM NUMBER THREE"); - break; - //For the second inputStream stored in Map, stream as a string and assert that variables are correctly substituted - case 2: - String textContent2 = resources.streamAsString(entry.getValue()); - logger.info("Received the following from the file: " + textContent2); - - assertThat(textContent2).contains("The third parameter is ITEM NUMBER THREE\n" + - "The first item was \"THIS IS ITEM1\" and this is the second line "); - break; - //If there are more entries than the two expected, throw error - default: - throw new Exception("Invalid content in directory files"); - } - // increments i so that case 2 is used on the next loop - i++; - } } @Test public void retrieveJarTest() throws Exception { - InputStream is = resources.retrieveJar("HelloGalasa", "0.0.1", "/resources/jars/"); + InputStream is = resources.retrieveJar("HelloGalasa", "0.0.1", "/jars/"); String jarContent = resources.streamAsString(is); //If the class file is found then the jar has been retrieved successfully @@ -212,7 +196,7 @@ public void retrieveJarTest() throws Exception { @Test public void retrieveJarTestWithVersionCompare() throws Exception { - InputStream is = resources.retrieveJar("dev.galasa", "0.15.0.202105120649", "/resources/jars/"); + InputStream is = resources.retrieveJar("dev.galasa", "0.15.0.202105120649", "/jars/"); String jarContent = resources.streamAsString(is); @@ -223,7 +207,7 @@ public void retrieveJarTestWithVersionCompare() throws Exception { @Test public void retrieveJarTestWithinRange() throws Exception { - InputStream is = resources.retrieveJar("dev.galasa", "(0.14.0.202105120649,0.16.0.202105120649)", "/resources/jars/"); + InputStream is = resources.retrieveJar("dev.galasa", "(0.14.0.202105120649,0.16.0.202105120649)", "/jars/"); String jarContent = resources.streamAsString(is); @@ -235,7 +219,7 @@ public void retrieveJarTestWithinRange() throws Exception { @Test public void retrieveJarTestNoVersion() throws Exception { - InputStream is = resources.retrieveJar("HelloGalasa", "", "/resources/jars/"); + InputStream is = resources.retrieveJar("HelloGalasa", "", "/jars/"); String jarContent = resources.streamAsString(is); @@ -245,7 +229,7 @@ public void retrieveJarTestNoVersion() throws Exception { @Test public void retrieveJarTestDifferSeperator() throws Exception { - InputStream is = resources.retrieveJar("HelloGalasa", "0.0.1", "/resources/jarsHyphenVersion/"); + InputStream is = resources.retrieveJar("HelloGalasa", "0.0.1", "/jarsHyphenVersion/"); String jarContent = resources.streamAsString(is); @@ -256,7 +240,7 @@ public void retrieveJarTestDifferSeperator() throws Exception { @Test public void zipDirectoryTestGZIP() throws TestBundleResourceException, IOException { - InputStream is = resources.zipDirectoryContents("/resources/zipFiles/", buildHashMap(), "US-ASCII", true); + InputStream is = resources.zipDirectoryContents("/zipFiles/", buildHashMap(), "US-ASCII", true); GZIPInputStream gzip = new GZIPInputStream(is); //Decode zip using "US-ASCII" @@ -273,7 +257,7 @@ public void zipDirectoryTestGZIP() throws TestBundleResourceException, IOExcepti @Test public void zipDirectoryTest() throws TestBundleResourceException, IOException { - InputStream is = resources.zipDirectoryContents("/resources/zipFiles/", buildHashMap(), "US-ASCII", false); + InputStream is = resources.zipDirectoryContents("/zipFiles/", buildHashMap(), "US-ASCII", false); //Decode zip using "US-ASCII" String text = "Decoded Zip: "; @@ -289,7 +273,7 @@ public void zipDirectoryTest() throws TestBundleResourceException, IOException { @Test public void zipDirectoryTestNoEncoding() throws TestBundleResourceException, IOException { - InputStream is = resources.zipDirectoryContents("/resources/zipFiles/", buildHashMap(), null, false); + InputStream is = resources.zipDirectoryContents("/zipFiles/", buildHashMap(), null, false); //Read zip using no encoding" String text = "Zip: "; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/directory/nestedDirectory/nestedFile.txt b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/directory/nestedDirectory/nestedFile.txt similarity index 100% rename from galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/directory/nestedDirectory/nestedFile.txt rename to galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/directory/nestedDirectory/nestedFile.txt diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/jars/HelloGalasa.jar b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/jars/HelloGalasa.jar similarity index 100% rename from galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/jars/HelloGalasa.jar rename to galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/jars/HelloGalasa.jar diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/jars/HelloGalasa_0.0.1.jar b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/jars/HelloGalasa_0.0.1.jar similarity index 100% rename from galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/jars/HelloGalasa_0.0.1.jar rename to galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/jars/HelloGalasa_0.0.1.jar diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/jars/dev.galasa.0.15.0.202105120649.jar b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/jars/dev.galasa.0.15.0.202105120649.jar similarity index 100% rename from galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/jars/dev.galasa.0.15.0.202105120649.jar rename to galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/jars/dev.galasa.0.15.0.202105120649.jar diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/jarsHyphenVersion/HelloGalasa-0.0.1.jar b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/jarsHyphenVersion/HelloGalasa-0.0.1.jar similarity index 100% rename from galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/jarsHyphenVersion/HelloGalasa-0.0.1.jar rename to galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/jarsHyphenVersion/HelloGalasa-0.0.1.jar diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/skeletons/test1.skel b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/skeletons/test1.skel similarity index 100% rename from galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/skeletons/test1.skel rename to galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/skeletons/test1.skel diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/skeletons/test2.skel b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/skeletons/test2.skel similarity index 100% rename from galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/skeletons/test2.skel rename to galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/skeletons/test2.skel diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/textFiles/list.txt b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/textFiles/list.txt similarity index 100% rename from galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/textFiles/list.txt rename to galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/textFiles/list.txt diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/textFiles/test1.txt b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/textFiles/test1.txt similarity index 100% rename from galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/textFiles/test1.txt rename to galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/textFiles/test1.txt diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/velocity/velocityTest.skel b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/velocity/velocityTest.skel similarity index 100% rename from galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/velocity/velocityTest.skel rename to galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/velocity/velocityTest.skel diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/zipFiles/zipTest.txt b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/zipFiles/zipTest.txt similarity index 100% rename from galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/resources/zipFiles/zipTest.txt rename to galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/resources/zipFiles/zipTest.txt diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManager.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManager.java index 6eadb2d02..70bea2b22 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManager.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManager.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.artifact; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManagerField.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManagerField.java index 9d5e06645..b8d6ac678 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManagerField.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManagerField.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.artifact; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/BundleResources.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/BundleResources.java index 37e08172e..1cc81f98f 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/BundleResources.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/BundleResources.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.artifact; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IArtifactManager.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IArtifactManager.java index 07b69abe5..77bdcf553 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IArtifactManager.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IArtifactManager.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.artifact; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IBundleResources.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IBundleResources.java index 461d0e94a..71c439913 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IBundleResources.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IBundleResources.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.artifact; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ISkeletonProcessor.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ISkeletonProcessor.java index 800cb896c..9a28e8f05 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ISkeletonProcessor.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ISkeletonProcessor.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.artifact; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/OutputRepositoryException.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/OutputRepositoryException.java index f0f060b58..98f4f54c7 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/OutputRepositoryException.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/OutputRepositoryException.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.artifact; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/SkeletonProcessorException.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/SkeletonProcessorException.java index edc2fa60e..6dc1dc9ff 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/SkeletonProcessorException.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/SkeletonProcessorException.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.artifact; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/TestBundleResourceException.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/TestBundleResourceException.java index 162773e07..fbefa3fd3 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/TestBundleResourceException.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/TestBundleResourceException.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.artifact; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/ArtifactManagerImpl.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/ArtifactManagerImpl.java index 7593d734b..ec8df8ce3 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/ArtifactManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/ArtifactManagerImpl.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2021. + * Copyright contributors to the Galasa project */ package dev.galasa.artifact.internal; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/BundleResourcesImpl.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/BundleResourcesImpl.java index e511cd18c..a4dad4554 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/BundleResourcesImpl.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/BundleResourcesImpl.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.artifact.internal; @@ -484,9 +482,6 @@ private String normalisePath(String rawPath) { if (!rawPath.startsWith(FILE_SEPARATOR)) rawPath = FILE_SEPARATOR + rawPath; - if (!rawPath.startsWith(FILE_SEPARATOR + "resources")) - rawPath = FILE_SEPARATOR + "resources" + rawPath; - rawPath = rawPath.replaceAll("\\/+", "/"); rawPath = rawPath.replaceFirst(FILE_SEPARATOR, ""); diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/PlusPlusSkeletonProcessor.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/PlusPlusSkeletonProcessor.java index 4afcc4cb3..a3da44a4b 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/PlusPlusSkeletonProcessor.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/PlusPlusSkeletonProcessor.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.artifact.internal; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/VelocitySkeletonProcessor.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/VelocitySkeletonProcessor.java index f3b8e99b4..d00d1f797 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/VelocitySkeletonProcessor.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/VelocitySkeletonProcessor.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.artifact.internal; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/package-info.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/package-info.java index 10d2880d1..8971de8ce 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/package-info.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/package-info.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ /** * Artifact Manager diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/build.gradle index 0dd7a13b4..6fce03db4 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Db2 Manager IVTs' -version = '0.21.0' +version = '0.25.0' dependencies { implementation project(':galasa-managers-database-parent:dev.galasa.db2.manager') diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/src/main/resources/resources/Batch.txt b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/src/main/resources/Batch.txt similarity index 100% rename from galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/src/main/resources/resources/Batch.txt rename to galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/src/main/resources/Batch.txt diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/bootstrap-file.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/bootstrap-file.yaml similarity index 81% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/bootstrap-file.yaml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/bootstrap-file.yaml index bd03289aa..d416327e5 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/bootstrap-file.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/bootstrap-file.yaml @@ -1,3 +1,4 @@ +# Copyright contributors to the Galasa project apiVersion: v1 kind: ConfigMap metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/config-grafana.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config-grafana.yaml similarity index 99% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/config-grafana.yaml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config-grafana.yaml index 4f1b560bd..52c81ec7d 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/config-grafana.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config-grafana.yaml @@ -1,3 +1,4 @@ +# Copyright contributors to the Galasa project apiVersion: v1 kind: ConfigMap metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/config-prometheus.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config-prometheus.yaml similarity index 93% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/config-prometheus.yaml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config-prometheus.yaml index 84ee7b8e8..4992cea04 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/config-prometheus.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config-prometheus.yaml @@ -1,3 +1,4 @@ +# Copyright contributors to the Galasa project apiVersion: v1 kind: ConfigMap metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/config.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config.yaml similarity index 94% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/config.yaml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config.yaml index 9e49d6a3a..eff9dc1d7 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/config.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config.yaml @@ -1,3 +1,4 @@ +# Copyright contributors to the Galasa project # # The configuration properties for the Galasa Ecosystem # diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/expose-simbank.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose-simbank.yaml similarity index 94% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/expose-simbank.yaml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose-simbank.yaml index 695114031..e35f90d85 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/expose-simbank.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose-simbank.yaml @@ -1,3 +1,4 @@ +# Copyright contributors to the Galasa project apiVersion: v1 kind: Service metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/expose-testing.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose-testing.yaml similarity index 94% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/expose-testing.yaml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose-testing.yaml index 8522fc5dd..9334374ef 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/expose-testing.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose-testing.yaml @@ -1,3 +1,4 @@ +# Copyright contributors to the Galasa project apiVersion: v1 kind: Service metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/expose.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose.yaml similarity index 96% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/expose.yaml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose.yaml index 34fbec6d2..b4e39424c 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/expose.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose.yaml @@ -1,3 +1,4 @@ +# Copyright contributors to the Galasa project apiVersion: v1 kind: Service metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/pvc-api.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-api.yaml similarity index 76% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/pvc-api.yaml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-api.yaml index 58439c445..2d136e187 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/pvc-api.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-api.yaml @@ -1,3 +1,4 @@ +# Copyright contributors to the Galasa project apiVersion: v1 kind: PersistentVolumeClaim metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/pvc-grafana.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-grafana.yaml similarity index 77% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/pvc-grafana.yaml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-grafana.yaml index 837bc8897..e5dc944c1 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/pvc-grafana.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-grafana.yaml @@ -1,3 +1,4 @@ +# Copyright contributors to the Galasa project apiVersion: v1 kind: PersistentVolumeClaim metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/pvc-prometheus.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-prometheus.yaml similarity index 77% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/pvc-prometheus.yaml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-prometheus.yaml index 02a0577c2..7811a2e5b 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/pvc-prometheus.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-prometheus.yaml @@ -1,3 +1,4 @@ +# Copyright contributors to the Galasa project apiVersion: v1 kind: PersistentVolumeClaim metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/server-api.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-api.yaml similarity index 100% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/server-api.yaml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-api.yaml diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/server-cps-etcd3.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-cps-etcd3.yaml similarity index 100% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/server-cps-etcd3.yaml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-cps-etcd3.yaml diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/server-engine-controller.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-engine-controller.yaml similarity index 100% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/server-engine-controller.yaml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-engine-controller.yaml diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/server-grafana.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-grafana.yaml similarity index 100% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/server-grafana.yaml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-grafana.yaml diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/server-metrics.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-metrics.yaml similarity index 100% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/server-metrics.yaml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-metrics.yaml diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/server-prometheus.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-prometheus.yaml similarity index 100% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/server-prometheus.yaml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-prometheus.yaml diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/server-ras-couchdb.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-ras-couchdb.yaml similarity index 100% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/server-ras-couchdb.yaml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-ras-couchdb.yaml diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/server-resource-monitor.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-resource-monitor.yaml similarity index 99% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/server-resource-monitor.yaml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-resource-monitor.yaml index 82e0d3f72..f62f601de 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/server-resource-monitor.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-resource-monitor.yaml @@ -1,6 +1,4 @@ -# # Copyright contributors to the Galasa project -# apiVersion: apps/v1 kind: Deployment metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/server-simbank.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-simbank.yaml similarity index 99% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/server-simbank.yaml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-simbank.yaml index 387fa70c5..2a95643e5 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/server-simbank.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-simbank.yaml @@ -1,6 +1,4 @@ -# # Copyright contributors to the Galasa project -# apiVersion: apps/v1 kind: Deployment metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/testcatalog-file.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/testcatalog-file.yaml similarity index 77% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/testcatalog-file.yaml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/testcatalog-file.yaml index b487cfcef..35c8976de 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/k8s/testcatalog-file.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/testcatalog-file.yaml @@ -1,3 +1,4 @@ +# Copyright contributors to the Galasa project apiVersion: v1 kind: ConfigMap metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/local/run.sh b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/local/run.sh similarity index 100% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/local/run.sh rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/local/run.sh diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/local/simplatform.sh b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/local/simplatform.sh similarity index 100% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/local/simplatform.sh rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/local/simplatform.sh diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/maven/pom.xml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/maven/pom.xml similarity index 100% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/maven/pom.xml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/maven/pom.xml diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/maven/settings.xml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/maven/settings.xml similarity index 100% rename from galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/resources/maven/settings.xml rename to galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/maven/settings.xml diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/build.gradle index 01da4d5be..143ed7676 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa JMeter Manager IVT' -version = '0.21.0' +version = '0.25.0' dependencies { implementation project(':galasa-managers-testingtools-parent:dev.galasa.jmeter.manager') diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/resources/resources/DynamicTest.jmx b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/res/DynamicTest.jmx similarity index 100% rename from galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/resources/resources/DynamicTest.jmx rename to galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/res/DynamicTest.jmx diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/resources/resources/ExistingTest.jmx b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/res/ExistingTest.jmx similarity index 100% rename from galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/resources/resources/ExistingTest.jmx rename to galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/res/ExistingTest.jmx diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/resources/resources/jmeter.properties b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/res/jmeter.properties similarity index 100% rename from galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/resources/resources/jmeter.properties rename to galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/res/jmeter.properties diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/resources/selenium-node-deployment.yaml b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-deployment.yaml similarity index 91% rename from galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/resources/selenium-node-deployment.yaml rename to galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-deployment.yaml index e7c4b8d15..5e033ce47 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/resources/selenium-node-deployment.yaml +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-deployment.yaml @@ -1,3 +1,4 @@ +# Copyright contributors to the Galasa project apiVersion: apps/v1 kind: Deployment metadata: diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/resources/selenium-node-expose.yaml b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-expose.yaml similarity index 85% rename from galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/resources/selenium-node-expose.yaml rename to galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-expose.yaml index 016238cc8..08adc097f 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/resources/selenium-node-expose.yaml +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-expose.yaml @@ -1,3 +1,4 @@ +# Copyright contributors to the Galasa project apiVersion: v1 kind: Service metadata: diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/resources/selenium-node-pod.yaml b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-pod.yaml similarity index 85% rename from galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/resources/selenium-node-pod.yaml rename to galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-pod.yaml index fcdc6f544..0d2bc6743 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/resources/selenium-node-pod.yaml +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-pod.yaml @@ -1,3 +1,4 @@ +# Copyright contributors to the Galasa project apiVersion: v1 kind: Pod metadata: diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/resources/resources/jcl/dumpJCL b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/resources/jcl/dumpJCL similarity index 100% rename from galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/resources/resources/jcl/dumpJCL rename to galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/resources/jcl/dumpJCL diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/build.gradle index 2ea8b5aad..897613403 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS Manager IVTs' -version = '0.21.0' +version = '0.25.0' dependencies { implementation project (':galasa-managers-zos-parent:dev.galasa.zos.manager') diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerBatchIVT.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerBatchIVT.java index a99fd006c..ff7be0ac0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerBatchIVT.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerBatchIVT.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019-2021. + * Copyright contributors to the Galasa project */ package dev.galasa.zos.manager.ivt; @@ -95,7 +93,7 @@ public void preFlightTestsBatch() { */ @Test public void submitJCLNoSteps() throws TestBundleResourceException, IOException, ZosBatchException { - String jclInput = resources.retrieveFileAsString("/resources/jcl/noSteps.jcl"); + String jclInput = resources.retrieveFileAsString("/jcl/noSteps.jcl"); IZosBatchJob job = batch.submitJob(jclInput, null); int returnCode = job.waitForJob(); IZosBatchJobOutputSpoolFile spool = job.getSpoolFile("COBOL"); @@ -108,7 +106,7 @@ public void submitJCLNoSteps() throws TestBundleResourceException, IOException, */ @Test public void submitJCLDoNothing() throws TestBundleResourceException, IOException, ZosBatchException { - String jclInput = resources.retrieveFileAsString("/resources/jcl/doNothing.jcl"); + String jclInput = resources.retrieveFileAsString("/jcl/doNothing.jcl"); IZosBatchJob job = batch.submitJob(jclInput, null); int returnCode = job.waitForJob(); assertThat(returnCode).isEqualTo(0); @@ -121,7 +119,7 @@ public void submitJCLDoNothing() throws TestBundleResourceException, IOException */ @Test public void submitJCLDoNothingJobName() throws TestBundleResourceException, IOException, ZosBatchException { - String jclInput = resources.retrieveFileAsString("/resources/jcl/doNothing.jcl"); + String jclInput = resources.retrieveFileAsString("/jcl/doNothing.jcl"); IZosBatchJob job = batch.submitJob(jclInput, jobName); int returnCode = job.waitForJob(); assertThat(job.getJobname().getName()).isEqualTo(jobName.getName()); @@ -134,7 +132,7 @@ public void submitJCLDoNothingJobName() throws TestBundleResourceException, IOEx */ @Test public void submitJCLDoNothingJobNameAndBlankCard() throws TestBundleResourceException, IOException, ZosBatchException { - String jclInput = resources.retrieveFileAsString("/resources/jcl/doNothing.jcl"); + String jclInput = resources.retrieveFileAsString("/jcl/doNothing.jcl"); ZosBatchJobcard jobCard = new ZosBatchJobcard(); IZosBatchJob job = batch.submitJob(jclInput, jobName2, jobCard); int returnCode = job.waitForJob(); @@ -147,7 +145,7 @@ public void submitJCLDoNothingJobNameAndBlankCard() throws TestBundleResourceExc */ @Test public void checkOutputIsStoredInRAS() throws TestBundleResourceException, IOException, ZosBatchException { - String jclInput = resources.retrieveFileAsString("/resources/jcl/doNothing.jcl"); + String jclInput = resources.retrieveFileAsString("/jcl/doNothing.jcl"); IZosBatchJob job = batch.submitJob(jclInput, null); job.setShouldArchive(true); job.waitForJob(); @@ -162,7 +160,7 @@ public void checkOutputIsStoredInRAS() throws TestBundleResourceException, IOExc */ @Test public void retrieveJobs() throws TestBundleResourceException, IOException, ZosBatchException { - String jclInput = resources.retrieveFileAsString("/resources/jcl/doNothing.jcl"); + String jclInput = resources.retrieveFileAsString("/jcl/doNothing.jcl"); IZosBatchJob job = batch.submitJob(jclInput, null); job.waitForJob(); List jobs = batch.getJobs(job.getJobname().getName(), job.getOwner()); @@ -174,7 +172,7 @@ public void getAsString() throws TestBundleResourceException, IOException, ZosBa String message = "HELLO WORLD FROM GALASA"; Map parameters = new HashMap<>(); parameters.put("MESSAGE", message); - String jclInput = resources.retrieveSkeletonFileAsString("resources/jcl/helloWorld.jcl", parameters); + String jclInput = resources.retrieveSkeletonFileAsString("/jcl/helloWorld.jcl", parameters); assertThat(jclInput).contains(message); //submit the job, check that it completes and we got some output @@ -196,7 +194,7 @@ public void retrieveAndCheckOutput() throws TestBundleResourceException, IOExcep String message = "HELLO WORLD FROM GALASA"; Map parameters = new HashMap<>(); parameters.put("MESSAGE", message); - String jclInput = resources.retrieveSkeletonFileAsString("resources/jcl/helloWorld.jcl", parameters); + String jclInput = resources.retrieveSkeletonFileAsString("/jcl/helloWorld.jcl", parameters); assertThat(jclInput).contains(message); //submit the job, check that it completes and we got some output diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileDatasetIVT.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileDatasetIVT.java index ed9ade5c7..0fbcf5f21 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileDatasetIVT.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileDatasetIVT.java @@ -247,7 +247,7 @@ public void deleteNonExistingMember() throws ZosDatasetException { private boolean checkThatPDSExists(String dataset) throws TestBundleResourceException, IOException, ZosBatchException { HashMap parms = new HashMap<>(); parms.put("DATASET", dataset); - String jcl = resources.retrieveSkeletonFileAsString("/resources/jcl/PDSCheck.jcl", parms); + String jcl = resources.retrieveSkeletonFileAsString("/jcl/PDSCheck.jcl", parms); return(batch.submitJob(jcl, null).waitForJob() == 0); } @@ -278,7 +278,7 @@ private IZosDataset createBasicDataset(String name, boolean pds) throws ZosDatas private void deleteDataSet(String dataset) throws ZosBatchException, TestBundleResourceException, IOException { HashMap parms = new HashMap<>(); parms.put("DATASET", dataset); - String jcl = resources.retrieveSkeletonFileAsString("/resources/jcl/PDSDelete.jcl", parms); + String jcl = resources.retrieveSkeletonFileAsString("/jcl/PDSDelete.jcl", parms); IZosBatchJob job = batch.submitJob(jcl, null); job.waitForJob(); // Do not archive this batch job to RAS as it isn't what is being tested @@ -302,7 +302,7 @@ private boolean checkContentWasWritten(String pds, String member, String... cont String fullName = pds+"("+member+")"; HashMap parms = new HashMap<>(); parms.put("MEMBER_NAME",fullName); - IZosBatchJob job = batch.submitJob(resources.retrieveSkeletonFileAsString("/resources/jcl/list.jcl", parms),null); + IZosBatchJob job = batch.submitJob(resources.retrieveSkeletonFileAsString("/jcl/list.jcl", parms),null); job.setShouldArchive(false); if(job.waitForJob() > 0) return false; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileVSAMIVT.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileVSAMIVT.java index 1496587b6..aecf71862 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileVSAMIVT.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileVSAMIVT.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project */ package dev.galasa.zos.manager.ivt; @@ -115,7 +113,7 @@ public void basicKSDSDefine() throws ZosVSAMDatasetException, ZosBatchException, private boolean checkThatPDSExists(String dataset) throws TestBundleResourceException, IOException, ZosBatchException { HashMap parms = new HashMap<>(); parms.put("DATASET", dataset); - String jcl = resources.retrieveSkeletonFileAsString("/resources/jcl/PDSCheck.jcl", parms); + String jcl = resources.retrieveSkeletonFileAsString("/jcl/PDSCheck.jcl", parms); return(batch.submitJob(jcl, null).waitForJob() == 0); } } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/resources/jcl/PDSCheck.jcl b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/jcl/PDSCheck.jcl similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/resources/jcl/PDSCheck.jcl rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/jcl/PDSCheck.jcl diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/resources/jcl/PDSDelete.jcl b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/jcl/PDSDelete.jcl similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/resources/jcl/PDSDelete.jcl rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/jcl/PDSDelete.jcl diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/resources/jcl/doNothing.jcl b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/jcl/doNothing.jcl similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/resources/jcl/doNothing.jcl rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/jcl/doNothing.jcl diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/resources/jcl/helloWorld.jcl b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/jcl/helloWorld.jcl similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/resources/jcl/helloWorld.jcl rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/jcl/helloWorld.jcl diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/resources/jcl/list.jcl b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/jcl/list.jcl similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/resources/jcl/list.jcl rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/jcl/list.jcl diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/resources/jcl/noSteps.jcl b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/jcl/noSteps.jcl similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/resources/jcl/noSteps.jcl rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/resources/jcl/noSteps.jcl diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/build.gradle index dcea4b55e..24b01e96e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS Program Manager' -version = '0.21.0' +version = '0.25.0' dependencies { implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosProgramManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosProgramManagerImpl.java index 95803d2f2..cd8b5ee49 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosProgramManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosProgramManagerImpl.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. + * Copyright contributors to the Galasa project */ package dev.galasa.zosprogram.internal; @@ -116,7 +114,7 @@ public void initialise(@NotNull IFramework framework, @NotNull List al throw new ZosProgramManagerException("Unable to request framework services", e); } - if(Boolean.TRUE.equals(galasaTest.isJava())) { + if(galasaTest.isJava()) { //*** Check to see if any of our annotations are present in the test class //*** If there is, we need to activate List ourFields = findAnnotatedFields(ZosProgramManagerField.class); diff --git a/release.yaml b/release.yaml index 7da68a975..143e134e6 100644 --- a/release.yaml +++ b/release.yaml @@ -23,7 +23,7 @@ managers: codecoverage: true - artifact: dev.galasa.artifact.manager.ivt - version: 0.21.0 + version: 0.25.0 obr: true mvp: true isolated: true @@ -124,7 +124,7 @@ managers: isolated: true - artifact: dev.galasa.db2.manager - version: 0.24.0 + version: 0.25.0 obr: true bom: true javadoc: true @@ -147,7 +147,7 @@ managers: codecoverage: true - artifact: dev.galasa.docker.manager.ivt - version: 0.21.0 + version: 0.25.0 obr: true mvp: true isolated: true @@ -240,7 +240,7 @@ managers: codecoverage: true - artifact: dev.galasa.jmeter.manager.ivt - version: 0.21.0 + version: 0.25.0 obr: true isolated: true @@ -421,13 +421,13 @@ managers: codecoverage: true - artifact: dev.galasa.zos.manager.ivt - version: 0.21.0 + version: 0.25.0 obr: true mvp: true isolated: true - artifact: dev.galasa.zosprogram.manager - version: 0.21.0 + version: 0.25.0 obr: true javadoc: true bom: true From 83e75b6a1d2e1da1739989179edea147f63cfcb4 Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Wed, 12 Oct 2022 17:04:33 +0100 Subject: [PATCH 009/263] Added getUsernamePassword method to ICoreManager.java --- .../src/main/java/dev/galasa/core/manager/ICoreManager.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ICoreManager.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ICoreManager.java index 621c21812..e0de88540 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ICoreManager.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ICoreManager.java @@ -8,6 +8,7 @@ import javax.validation.constraints.NotNull; import dev.galasa.ICredentials; +import dev.galasa.ICredentialsUsernamePassword; /** *

@@ -47,5 +48,7 @@ public interface ICoreManager { */ ICredentials getCredentials(@NotNull String credentialsId) throws CoreManagerException; + ICredentialsUsernamePassword getUsernamePassword(@NotNull String credentialsId) throws CoreManagerException; + void registerConfidentialText(String confidentialString, String comment); } From 5897b2632dd2ff774f1f103f25017bdb5c3a3c56 Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Thu, 13 Oct 2022 10:39:52 +0100 Subject: [PATCH 010/263] Created getUsernamePassword implementation --- .../dev/galasa/core/manager/ICoreManager.java | 8 ++++++++ .../core/manager/internal/CoreManagerImpl.java | 15 +++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ICoreManager.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ICoreManager.java index e0de88540..2a424d045 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ICoreManager.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ICoreManager.java @@ -48,6 +48,14 @@ public interface ICoreManager { */ ICredentials getCredentials(@NotNull String credentialsId) throws CoreManagerException; + /** + * Retrieve Username and Password Credentials only + * + * @param credentialsId + * @return A credentials object or null if id not found + * @throws CoreManagerException If there is a problem accessing the credentials store + * or if the credential is not of type ICredentialsUsernamePassword + */ ICredentialsUsernamePassword getUsernamePassword(@NotNull String credentialsId) throws CoreManagerException; void registerConfidentialText(String confidentialString, String comment); diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java index 8f7456aa0..0f282ad76 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java @@ -16,6 +16,7 @@ import org.osgi.service.component.annotations.Component; import dev.galasa.ICredentials; +import dev.galasa.ICredentialsUsernamePassword; import dev.galasa.ManagerException; import dev.galasa.Tags; import dev.galasa.TestAreas; @@ -222,6 +223,20 @@ public ICredentials getCredentials(@NotNull String credentialsId) throws CoreMan throw new CoreManagerException("Unable to retrieve credentials for id " + credentialsId, e); } } + + @Override + public ICredentialsUsernamePassword getUsernamePassword(@NotNull String credentialsId) throws CoreManagerException { + ICredentials cred; + try { + cred = getFramework().getCredentialsService().getCredentials(credentialsId); + + }catch (CredentialsException e) { + throw new CoreManagerException("Unable to retrieve credentials for id " + credentialsId, e); + } + if(!(cred instanceof ICredentialsUsernamePassword)) { + throw new CoreManagerException("Unable to retrieve username/password credentials for id"+ credentialsId); + } + } @Override public void registerConfidentialText(String confidentialString, String comment) { From 0a55e27c4c1eeb7a14f024017634edd00cc4155d Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Thu, 13 Oct 2022 13:44:48 +0100 Subject: [PATCH 011/263] Revised code options for implementation --- .../dev/galasa/core/manager/internal/CoreManagerImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java index 0f282ad76..c58650a2c 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java @@ -226,13 +226,15 @@ public ICredentials getCredentials(@NotNull String credentialsId) throws CoreMan @Override public ICredentialsUsernamePassword getUsernamePassword(@NotNull String credentialsId) throws CoreManagerException { - ICredentials cred; - try { + ICredentials cred =getCredentials(credentialsId); + /* + try { cred = getFramework().getCredentialsService().getCredentials(credentialsId); }catch (CredentialsException e) { throw new CoreManagerException("Unable to retrieve credentials for id " + credentialsId, e); } + */ if(!(cred instanceof ICredentialsUsernamePassword)) { throw new CoreManagerException("Unable to retrieve username/password credentials for id"+ credentialsId); } From 7c0a78b842fd636b5147fabf3d8192bb05c195b0 Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Thu, 13 Oct 2022 15:00:34 +0100 Subject: [PATCH 012/263] Completed correct path Signed-off-by: Savvas Kyriacou --- .../main/java/dev/galasa/core/manager/ICoreManager.java | 6 ++---- .../dev/galasa/core/manager/internal/CoreManagerImpl.java | 8 -------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ICoreManager.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ICoreManager.java index 2a424d045..5637b2d39 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ICoreManager.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ICoreManager.java @@ -1,8 +1,6 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. - */ +* Copyright contributors to the Galasa project +*/ package dev.galasa.core.manager; import javax.validation.constraints.NotNull; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java index c58650a2c..7ed9cd284 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java @@ -227,14 +227,6 @@ public ICredentials getCredentials(@NotNull String credentialsId) throws CoreMan @Override public ICredentialsUsernamePassword getUsernamePassword(@NotNull String credentialsId) throws CoreManagerException { ICredentials cred =getCredentials(credentialsId); - /* - try { - cred = getFramework().getCredentialsService().getCredentials(credentialsId); - - }catch (CredentialsException e) { - throw new CoreManagerException("Unable to retrieve credentials for id " + credentialsId, e); - } - */ if(!(cred instanceof ICredentialsUsernamePassword)) { throw new CoreManagerException("Unable to retrieve username/password credentials for id"+ credentialsId); } From 452ad73ac74fd4585176795747197c4506dfb1fa Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Fri, 14 Oct 2022 11:24:00 +0100 Subject: [PATCH 013/263] added object return to getUsernamePassword implemntation Signed-off-by: Savvas Kyriacou --- .../java/dev/galasa/core/manager/internal/CoreManagerImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java index 7ed9cd284..2ac826e22 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java @@ -230,6 +230,7 @@ public ICredentialsUsernamePassword getUsernamePassword(@NotNull String credenti if(!(cred instanceof ICredentialsUsernamePassword)) { throw new CoreManagerException("Unable to retrieve username/password credentials for id"+ credentialsId); } + return (ICredentialsUsernamePassword) cred; } @Override From 2f667efa729cb9205991a2906ea3d0cad5bfe2e0 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Fri, 4 Nov 2022 10:06:59 +0000 Subject: [PATCH 014/263] javadoc fixes Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../java/dev/galasa/cicsts/ICeciResponseOutputValue.java | 2 +- .../src/main/java/dev/galasa/docker/DockerContainer.java | 4 ++++ .../src/main/java/dev/galasa/docker/IDockerContainer.java | 1 + .../main/java/dev/galasa/docker/IDockerContainerConfig.java | 6 +++--- .../src/main/java/dev/galasa/docker/IDockerVolume.java | 2 ++ .../dev/galasa/docker/internal/DockerContainerImpl.java | 2 +- .../java/dev/galasa/docker/internal/DockerEngineImpl.java | 4 +++- galasa-managers-parent/gradle.properties | 2 +- 8 files changed, 16 insertions(+), 7 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeciResponseOutputValue.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeciResponseOutputValue.java index 8ab556ab2..6a5799a1a 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeciResponseOutputValue.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeciResponseOutputValue.java @@ -12,7 +12,7 @@ * e.g. the request output screen might * show:
* INTO('A.....')
- * and in Hex:<
+ * and in Hex:
* INTO(X'C13456789ABC')
* Both representations are available using the {@link #getTextValue()} and {@link #getHexValue()} methods respectively */ diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerContainer.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerContainer.java index b1ceade41..41e229d73 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerContainer.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerContainer.java @@ -46,6 +46,7 @@ * The dockerContainerTag is used to identify the Docker Container to other Managers or Shared Environments. If a test is using multiple * Docker Containers, each separate Docker Container must have a unique tag. If two Docker Containers use the same tag, they will refer to the * same Docker Container. + * @return The tag for this container. */ public String dockerContainerTag() default "PRIMARY"; @@ -54,6 +55,7 @@ * include the Docker Registry as this is provided in the CPS. If using a public official image from DockerHub, then the * image name must be prefixed with library/, for example library/httpd:latest, the Docker Manager will * not default to the library namespace like the Docker commands do. + * @return the name of the image. */ public String image(); @@ -61,12 +63,14 @@ * The start attribute indicates whether the Docker Container should be started automatically. If the * test needs to perform some work before the container is started, then start=false should be used, after which * IDockerContainer.start() can be called to start the container. + * @return true if the docker container should be started automatically. false otherwise. */ public boolean start() default true; /** * The dockerEngineTag will be used in the future so that a container can be run on a specific Docker Engine type. * You would not normally need to provide a Docker Engine tag. + * @return The docker engine tag associate with this container. */ public String dockerEngineTag() default "PRIMARY"; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainer.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainer.java index 3b2a3e91a..bf14f431a 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainer.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainer.java @@ -82,6 +82,7 @@ public interface IDockerContainer { * Start the Docker Container with a provided galasa DockerContainerConfig. This will stop and remove * any previous containers. * + * @param config * @throws DockerManagerException */ public void startWithConfig(IDockerContainerConfig config) throws DockerManagerException; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainerConfig.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainerConfig.java index a89f69951..5855701a2 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainerConfig.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainerConfig.java @@ -34,9 +34,9 @@ public interface IDockerContainerConfig { public List getVolumes(); /** - * Return a volume from the configuration of a specfic tag. - * - * @return + * Get the volume by the tag it is known as. + * @param volumeTag + * @return a volume from the configuration of a specfic tag. */ public IDockerVolume getVolumeByTag(String volumeTag); diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerVolume.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerVolume.java index fb5767e62..74dbbef69 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerVolume.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerVolume.java @@ -52,6 +52,7 @@ public interface IDockerVolume { * * @param fileName * @param data + * @throws DockerManagerException */ public void LoadFile(String fileName, InputStream data) throws DockerManagerException; @@ -60,6 +61,7 @@ public interface IDockerVolume { * * @param fileName * @param data + * @throws DockerManagerException */ public void LoadFileAsString(String fileName, String data) throws DockerManagerException; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerImpl.java index fb2f96955..79c7d75e6 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerImpl.java @@ -641,7 +641,7 @@ public DockerEngineImpl getDockerEngineImpl() { } /** - * Retrieves the docker running ID + * @return the docker running ID */ public String getContainerId() { return containerID; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerEngineImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerEngineImpl.java index 583f83095..990c28ef4 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerEngineImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerEngineImpl.java @@ -58,6 +58,8 @@ public class DockerEngineImpl implements IDockerEngine { * * @param framework * @param dockerManager + * @param dockerEngineTag + * @param dss * @throws DockerProvisionException */ public DockerEngineImpl(IFramework framework, DockerManagerImpl dockerManager, String dockerEngineTag, @@ -299,7 +301,7 @@ public JsonObject getContainer(@NotNull String containerId) throws DockerManager /** * Creates a container from a image name * - * @param containerName + * @param imageName * @param imageData * @return JsonObject * @throws DockerManagerException diff --git a/galasa-managers-parent/gradle.properties b/galasa-managers-parent/gradle.properties index e72fcbda6..7f825bc0a 100644 --- a/galasa-managers-parent/gradle.properties +++ b/galasa-managers-parent/gradle.properties @@ -4,6 +4,6 @@ jacocoEnabled=false isRelease=false -sourceMaven=http://repo.maven.apache.org/maven2/ +sourceMaven=https://repo.maven.apache.org/maven2/ centralMaven=https://repo.maven.apache.org/maven2/ targetMaven=https://repo.maven.apache.org/maven2/ From 0d32b0a609cb56e6f8efe505b931dd0e6c772b9e Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Fri, 4 Nov 2022 10:07:37 +0000 Subject: [PATCH 015/263] build locally script added. Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- build-locally.sh | 189 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) create mode 100755 build-locally.sh diff --git a/build-locally.sh b/build-locally.sh new file mode 100755 index 000000000..6a3106483 --- /dev/null +++ b/build-locally.sh @@ -0,0 +1,189 @@ +#! /usr/bin/env bash + +#----------------------------------------------------------------------------------------- +# +# Objectives: Build this repository code locally. +# +# Environment variable over-rides: +# LOGS_DIR - Optional. Where logs are placed. Defaults to creating a temporary directory. +# SOURCE_MAVEN - Optional. Where a maven repository is from which the build will draw artifacts. +# DEBUG - Optional. Defaults to 0 (off) +# +#----------------------------------------------------------------------------------------- + +# Where is this script executing from ? +BASEDIR=$(dirname "$0");pushd $BASEDIR 2>&1 >> /dev/null ;BASEDIR=$(pwd);popd 2>&1 >> /dev/null +# echo "Running from directory ${BASEDIR}" +export ORIGINAL_DIR=$(pwd) +# cd "${BASEDIR}" + +cd "${BASEDIR}/.." +WORKSPACE_DIR=$(pwd) + + +#----------------------------------------------------------------------------------------- +# +# Set Colors +# +#----------------------------------------------------------------------------------------- +bold=$(tput bold) +underline=$(tput sgr 0 1) +reset=$(tput sgr0) +red=$(tput setaf 1) +green=$(tput setaf 76) +white=$(tput setaf 7) +tan=$(tput setaf 202) +blue=$(tput setaf 25) + +#----------------------------------------------------------------------------------------- +# +# Headers and Logging +# +#----------------------------------------------------------------------------------------- +underline() { printf "${underline}${bold}%s${reset}\n" "$@" +} +h1() { printf "\n${underline}${bold}${blue}%s${reset}\n" "$@" +} +h2() { printf "\n${underline}${bold}${white}%s${reset}\n" "$@" +} +debug() { printf "${white}%s${reset}\n" "$@" +} +info() { printf "${white}➜ %s${reset}\n" "$@" +} +success() { printf "${green}✔ %s${reset}\n" "$@" +} +error() { printf "${red}✖ %s${reset}\n" "$@" +} +warn() { printf "${tan}➜ %s${reset}\n" "$@" +} +bold() { printf "${bold}%s${reset}\n" "$@" +} +note() { printf "\n${underline}${bold}${blue}Note:${reset} ${blue}%s${reset}\n" "$@" +} + +#----------------------------------------------------------------------------------------- +# Functions +#----------------------------------------------------------------------------------------- +function usage { + info "Syntax: build-locally.sh [OPTIONS]" + cat << EOF +Options are: +-c | --clean : Do a clean build. One of the --clean or --delta flags are mandatory. +-d | --delta : Do a delta build. One of the --clean or --delta flags are mandatory. +EOF +} + +#----------------------------------------------------------------------------------------- +# Process parameters +#----------------------------------------------------------------------------------------- +exportbuild_type="" + +while [ "$1" != "" ]; do + case $1 in + -c | --clean ) export build_type="clean" + ;; + -d | --delta ) export build_type="delta" + ;; + -h | --help ) usage + exit + ;; + * ) error "Unexpected argument $1" + usage + exit 1 + esac + shift +done + +if [[ "${build_type}" == "" ]]; then + error "Need to use either the --clean or --delta parameter." + usage + exit 1 +fi + +#----------------------------------------------------------------------------------------- +# Main logic. +#----------------------------------------------------------------------------------------- + +source_dir="galasa-managers-parent" + +project=$(basename ${BASEDIR}) +h1 "Building ${project}" + +# Debug or not debug ? Override using the DEBUG flag. +if [[ -z ${DEBUG} ]]; then + export DEBUG=0 + # export DEBUG=1 + info "DEBUG defaulting to ${DEBUG}." + info "Over-ride this variable if you wish. Valid values are 0 and 1." +else + info "DEBUG set to ${DEBUG} by caller." +fi + +# Over-rode SOURCE_MAVEN if you want to build from a different maven repo... +if [[ -z ${SOURCE_MAVEN} ]]; then + export SOURCE_MAVEN=https://galasadev-cicsk8s.hursley.ibm.com/main/maven/obr/ + info "SOURCE_MAVEN repo defaulting to ${SOURCE_MAVEN}." + info "Set this environment variable if you want to over-ride this value." +else + info "SOURCE_MAVEN set to ${SOURCE_MAVEN} by caller." +fi + +# Create a temporary dir. +# Note: This bash 'spell' works in OSX and Linux. +if [[ -z ${LOGS_DIR} ]]; then + export LOGS_DIR=$(mktemp -d 2>/dev/null || mktemp -d -t "galasa-logs") + info "Logs are stored in the ${LOGS_DIR} folder." + info "Over-ride this setting using the LOGS_DIR environment variable." +else + mkdir -p ${LOGS_DIR} 2>&1 > /dev/null # Don't show output. We don't care if it already existed. + info "Logs are stored in the ${LOGS_DIR} folder." + info "Over-ridden by caller using the LOGS_DIR variable." +fi + +info "Using source code at ${source_dir}" +cd ${BASEDIR}/${source_dir} +if [[ "${DEBUG}" == "1" ]]; then + OPTIONAL_DEBUG_FLAG="-debug" +else + OPTIONAL_DEBUG_FLAG="-info" +fi + +# auto plain rich or verbose +CONSOLE_FLAG=--console=plain + +log_file=${LOGS_DIR}/${project}.txt +info "Log will be placed at ${log_file}" + +if [[ "${build_type}" == "clean" ]]; then + goals="clean build publishToMavenLocal" +else + goals="clean build publishToMavenLocal" +fi + +# DAEMON_FLAG="--no-daemon" +DAEMON_FLAG="" + +cat << EOF +Using command: + +gradle ${DAEMON_FLAG} \ +${CONSOLE_FLAG} \ +-Dorg.gradle.java.home=${JAVA_HOME} \ +-PsourceMaven=${SOURCE_MAVEN} ${OPTIONAL_DEBUG_FLAG} \ +${goals} \ +2>&1 > ${log_file} + +EOF + + +gradle ${DAEMON_FLAG} \ +${CONSOLE_FLAG} \ +-Dorg.gradle.java.home=${JAVA_HOME} \ +-PsourceMaven=${SOURCE_MAVEN} ${OPTIONAL_DEBUG_FLAG} \ +${goals} \ +2>&1 > ${log_file} + + + +rc=$? ; if [[ "${rc}" != "0" ]]; then cat ${log_file} ; error "Failed to build ${project}" ; exit 1 ; fi +success "Project ${project} built - OK - log is at ${log_file}" From 5c58fb76aa8fc0f0d4444093e915b46db6975e6e Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Fri, 4 Nov 2022 12:53:21 +0000 Subject: [PATCH 016/263] corrected copyright in some manager code Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../java/dev/galasa/cicsts/ICeciResponseOutputValue.java | 5 ++--- .../src/main/java/dev/galasa/docker/DockerContainer.java | 4 +--- .../src/main/java/dev/galasa/docker/DockerEngine.java | 4 +--- .../main/java/dev/galasa/docker/DockerManagerException.java | 4 +--- .../java/dev/galasa/docker/DockerProvisionException.java | 4 +--- .../src/main/java/dev/galasa/docker/DockerVolume.java | 5 ++--- .../src/main/java/dev/galasa/docker/IDockerEngine.java | 4 +--- .../src/main/java/dev/galasa/docker/IDockerExec.java | 4 +--- .../src/main/java/dev/galasa/docker/IDockerImage.java | 4 +--- .../src/main/java/dev/galasa/docker/IDockerManager.java | 4 +--- .../java/dev/galasa/docker/internal/DockerManagerField.java | 4 +--- .../main/java/dev/galasa/docker/internal/DockerSlotImpl.java | 4 +--- .../dev/galasa/docker/internal/json/DockerContainerJSON.java | 3 +++ .../galasa/docker/internal/json/DockerContainerLabels.java | 3 +++ .../galasa/docker/internal/properties/DockerDSEEngine.java | 4 +--- .../dev/galasa/docker/internal/properties/DockerEngine.java | 4 +--- .../galasa/docker/internal/properties/DockerEnginePort.java | 4 +--- .../dev/galasa/docker/internal/properties/DockerEngines.java | 4 +--- .../internal/properties/DockerPropertiesSingleton.java | 4 +--- .../galasa/docker/internal/properties/DockerRegistry.java | 4 +--- .../internal/properties/DockerRegistryCredentials.java | 4 +--- .../galasa/docker/internal/properties/DockerRegistryURL.java | 4 +--- .../dev/galasa/docker/internal/properties/DockerSlots.java | 4 +--- .../src/main/java/dev/galasa/docker/package-info.java | 4 +--- .../main/java/dev/galasa/docker/spi/IDockerManagerSpi.java | 4 +--- 25 files changed, 31 insertions(+), 69 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeciResponseOutputValue.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeciResponseOutputValue.java index 6a5799a1a..3d15a75b5 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeciResponseOutputValue.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeciResponseOutputValue.java @@ -1,8 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ + package dev.galasa.cicsts; /** diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerContainer.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerContainer.java index 41e229d73..38d7f08e4 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerContainer.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerContainer.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.docker; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerEngine.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerEngine.java index 91e3e2ab8..87ae973d0 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerEngine.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerEngine.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.docker; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerManagerException.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerManagerException.java index 74ff1d642..acf62e2cc 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerManagerException.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerManagerException.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.docker; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerProvisionException.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerProvisionException.java index 555f42eff..f2cc25367 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerProvisionException.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerProvisionException.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.docker; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerVolume.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerVolume.java index aed601dc2..03d3e9002 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerVolume.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerVolume.java @@ -1,8 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project */ + package dev.galasa.docker; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerEngine.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerEngine.java index 2727eacd7..97c9fe8b7 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerEngine.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerEngine.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.docker; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerExec.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerExec.java index 0632154bb..32dfca368 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerExec.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerExec.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.docker; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerImage.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerImage.java index 3185ef622..872a93afb 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerImage.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerImage.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.docker; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerManager.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerManager.java index a4315a2e4..06f2b8d41 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerManager.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerManager.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.docker; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerField.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerField.java index 2327aea97..8aea08519 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerField.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerField.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.docker.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerSlotImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerSlotImpl.java index 4d9dfea9c..6aaa496b3 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerSlotImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerSlotImpl.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.docker.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/json/DockerContainerJSON.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/json/DockerContainerJSON.java index 957c0b8ca..e9a986ad2 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/json/DockerContainerJSON.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/json/DockerContainerJSON.java @@ -1,3 +1,6 @@ +/* + * Copyright contributors to the Galasa project + */ package dev.galasa.docker.internal.json; /** diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/json/DockerContainerLabels.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/json/DockerContainerLabels.java index d0879c8c9..f5cc39c17 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/json/DockerContainerLabels.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/json/DockerContainerLabels.java @@ -1,3 +1,6 @@ +/* + * Copyright contributors to the Galasa project + */ package dev.galasa.docker.internal.json; public class DockerContainerLabels { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerDSEEngine.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerDSEEngine.java index b3457a5f7..f3289ea31 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerDSEEngine.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerDSEEngine.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.docker.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEngine.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEngine.java index 15832e6be..c02147f61 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEngine.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEngine.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.docker.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEnginePort.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEnginePort.java index 56ceeb3e4..641467686 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEnginePort.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEnginePort.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.docker.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEngines.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEngines.java index 80178baf3..3b5585bb4 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEngines.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEngines.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.docker.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerPropertiesSingleton.java index 671697592..36b9c7d3b 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerPropertiesSingleton.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.docker.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistry.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistry.java index cce92c2d4..7aedb9bfd 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistry.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistry.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.docker.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistryCredentials.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistryCredentials.java index 034b933cc..461b5b43d 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistryCredentials.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistryCredentials.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.docker.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistryURL.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistryURL.java index f2363459e..c87c5c36f 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistryURL.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistryURL.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.docker.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerSlots.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerSlots.java index 7face0cf9..8f444bc43 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerSlots.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerSlots.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.docker.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/package-info.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/package-info.java index b9ce7810b..553f0bd8e 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/package-info.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/package-info.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ /** * Docker Manager diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/spi/IDockerManagerSpi.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/spi/IDockerManagerSpi.java index 208f91446..a2b09f908 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/spi/IDockerManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/spi/IDockerManagerSpi.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.docker.spi; From dbfb1cc8ac4559cc3fb2ba4c6cf5cd54938069bf Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Mon, 7 Nov 2022 13:47:17 +0000 Subject: [PATCH 017/263] Add more datastream test cases Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../extended/ExtendedDatastreamTest.java | 121 +++++++++++++++--- 1 file changed, 103 insertions(+), 18 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/extended/ExtendedDatastreamTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/extended/ExtendedDatastreamTest.java index 42b971c66..aebeac14b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/extended/ExtendedDatastreamTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/extended/ExtendedDatastreamTest.java @@ -8,9 +8,12 @@ import java.nio.ByteBuffer; import java.util.ArrayList; +import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Hex; +import org.junit.Before; import org.junit.Test; +import dev.galasa.zos3270.TerminalInterruptedException; import dev.galasa.zos3270.internal.comms.Inbound3270Message; import dev.galasa.zos3270.internal.comms.Network; import dev.galasa.zos3270.internal.datastream.AbstractOrder; @@ -22,27 +25,45 @@ import dev.galasa.zos3270.internal.datastream.OrderText; import dev.galasa.zos3270.internal.datastream.WriteControlCharacter; import dev.galasa.zos3270.spi.Colour; +import dev.galasa.zos3270.spi.DatastreamException; import dev.galasa.zos3270.spi.Highlight; import dev.galasa.zos3270.spi.Screen; public class ExtendedDatastreamTest { - @Test - public void testColour1() throws Exception { - - String redReverse = "0341f242f2c0f8"; - String greenBlink = "0341f142f4c0f8"; - String blueNormal = "0341f042f1c0f8"; - byte[] redReverseStream = Hex.decodeHex(redReverse); - byte[] greenBlinkStream = Hex.decodeHex(greenBlink); - byte[] blueNormalStream = Hex.decodeHex(blueNormal); - ByteBuffer redReverseBuffer = ByteBuffer.wrap(redReverseStream); - ByteBuffer greenBlinkBuffer = ByteBuffer.wrap(greenBlinkStream); - ByteBuffer blueNormalBuffer = ByteBuffer.wrap(blueNormalStream); - + private final String RED = "42f2"; + private final String GREEN = "42f4"; + private final String BLUE = "42f1"; + + private final String REVERSE = "41f2"; + private final String BLINK = "41f1"; + private final String NORMAL = "41f0"; + private final String UNDERSCORE = "41f4"; + + private final String CHARS = "c0f8"; + + private Screen screen; + + private ByteBuffer getBuffer(String data) throws DecoderException { + byte[] stream = Hex.decodeHex(data); + return ByteBuffer.wrap(stream); + } + + @Before + public void setUp() throws TerminalInterruptedException { Network network = new Network("here", 1, "a"); - Screen screen = new Screen(10, 2, network); + screen = new Screen(10, 2, network); screen.erase(); + } + + @Test + public void testColourAndHighlighting() throws DecoderException, DatastreamException { + String redReverse = "03" + REVERSE + RED + CHARS; + String greenBlink = "03" + BLINK + GREEN + CHARS; + String blueNormal = "03" + NORMAL + BLUE + CHARS; + ByteBuffer redReverseBuffer = getBuffer(redReverse); + ByteBuffer greenBlinkBuffer = getBuffer(greenBlink); + ByteBuffer blueNormalBuffer = getBuffer(blueNormal); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); @@ -64,15 +85,79 @@ public void testColour1() throws Exception { assertThat(screen.getColourAtPosition(2)).as("Field 1 should be red").isEqualTo(Colour.RED); assertThat(screen.getHighlightAtPosition(2)).as("Field 1 should be reverse").isEqualTo(Highlight.REVERSE); - assertThat(screen.getColourAtPosition(7)).as("Field 2 should be red").isEqualTo(Colour.GREEN); - assertThat(screen.getHighlightAtPosition(7)).as("Field 2 should be reverse").isEqualTo(Highlight.BLINK); + assertThat(screen.getColourAtPosition(7)).as("Field 2 should be green").isEqualTo(Colour.GREEN); + assertThat(screen.getHighlightAtPosition(7)).as("Field 2 should be blinking").isEqualTo(Highlight.BLINK); - assertThat(screen.getColourAtPosition(12)).as("Field 3 should be red").isEqualTo(Colour.BLUE); - assertThat(screen.getHighlightAtPosition(12)).as("Field 3 should be reverse").isEqualTo(Highlight.NORMAL); + assertThat(screen.getColourAtPosition(12)).as("Field 3 should be blue").isEqualTo(Colour.BLUE); + assertThat(screen.getHighlightAtPosition(12)).as("Field 3 should be normal").isEqualTo(Highlight.NORMAL); assertThat(screen.getColourAtPosition(17)).as("Field 4 should be standard field").isNull();; assertThat(screen.getHighlightAtPosition(17)).as("Field 4 should be standard field").isNull(); + } + + @Test + public void testColourNoHighlighting() throws DecoderException, DatastreamException { + String red = "02" + RED + CHARS; + String green = "02" + GREEN + CHARS; + String blue = "02" + BLUE + CHARS; + ByteBuffer redBuffer = getBuffer(red); + ByteBuffer greenBuffer = getBuffer(green); + ByteBuffer blueBuffer = getBuffer(blue); + + ArrayList orders = new ArrayList<>(); + orders.add(new OrderSetBufferAddress(new BufferAddress(0))); + orders.add(new OrderStartFieldExtended(redBuffer)); + orders.add(new OrderText("1234")); + orders.add(new OrderSetBufferAddress(new BufferAddress(5))); + orders.add(new OrderStartFieldExtended(greenBuffer)); + orders.add(new OrderText("5678")); + orders.add(new OrderSetBufferAddress(new BufferAddress(10))); + orders.add(new OrderStartFieldExtended(blueBuffer)); + orders.add(new OrderText("ABCD")); + + screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), + new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); + assertThat(screen.getColourAtPosition(2)).as("Field 1 should be red").isEqualTo(Colour.RED); + assertThat(screen.getHighlightAtPosition(2)).as("Field 1 should have no highlighting").isNull(); + + assertThat(screen.getColourAtPosition(7)).as("Field 2 should be green").isEqualTo(Colour.GREEN); + assertThat(screen.getHighlightAtPosition(7)).as("Field 2 should have no highlighting").isNull(); + + assertThat(screen.getColourAtPosition(12)).as("Field 3 should be blue").isEqualTo(Colour.BLUE); + assertThat(screen.getHighlightAtPosition(12)).as("Field 3 should have no highlighting").isNull(); } + @Test + public void testHighlightingNoColour() throws DecoderException, DatastreamException { + String normal = "02" + NORMAL + CHARS; + String blink = "02" + BLINK + CHARS; + String underscore = "02" + UNDERSCORE + CHARS; + ByteBuffer blinkBuffer = getBuffer(blink); + ByteBuffer underscoreBuffer = getBuffer(underscore); + ByteBuffer normalBuffer = getBuffer(normal); + + ArrayList orders = new ArrayList<>(); + orders.add(new OrderSetBufferAddress(new BufferAddress(0))); + orders.add(new OrderStartFieldExtended(blinkBuffer)); + orders.add(new OrderText("1234")); + orders.add(new OrderSetBufferAddress(new BufferAddress(5))); + orders.add(new OrderStartFieldExtended(underscoreBuffer)); + orders.add(new OrderText("5678")); + orders.add(new OrderSetBufferAddress(new BufferAddress(10))); + orders.add(new OrderStartFieldExtended(normalBuffer)); + orders.add(new OrderText("ABCD")); + + screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), + new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); + + assertThat(screen.getHighlightAtPosition(2)).as("Field 1 should be blinking").isEqualTo(Highlight.BLINK); + assertThat(screen.getColourAtPosition(2)).as("Field 1 should have no colour").isNull(); + + assertThat(screen.getHighlightAtPosition(7)).as("Field 2 should be underscore").isEqualTo(Highlight.UNDERSCORE); + assertThat(screen.getColourAtPosition(7)).as("Field 2 should have no colour").isNull(); + + assertThat(screen.getHighlightAtPosition(12)).as("Field 3 should be normal").isEqualTo(Highlight.NORMAL); + assertThat(screen.getColourAtPosition(12)).as("Field 3 should have no colour").isNull(); + } } From 6c7d485881e537851dee79744d268474bacac53f Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Wed, 9 Nov 2022 14:48:59 +0000 Subject: [PATCH 018/263] Add colour support IVTs Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../zos3270/manager/ivt/Zos3270IVT.java | 54 ++++++++++++++++--- 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/src/main/java/dev/galasa/zos3270/manager/ivt/Zos3270IVT.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/src/main/java/dev/galasa/zos3270/manager/ivt/Zos3270IVT.java index 8a2924501..e8b1690f5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/src/main/java/dev/galasa/zos3270/manager/ivt/Zos3270IVT.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/src/main/java/dev/galasa/zos3270/manager/ivt/Zos3270IVT.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019-2021. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.manager.ivt; @@ -9,8 +7,10 @@ import org.apache.commons.logging.Log; +import dev.galasa.ICredentialsUsernamePassword; import dev.galasa.Test; import dev.galasa.core.manager.CoreManager; +import dev.galasa.core.manager.CoreManagerException; import dev.galasa.core.manager.ICoreManager; import dev.galasa.core.manager.Logger; import dev.galasa.core.manager.TestProperty; @@ -25,6 +25,8 @@ import dev.galasa.zos3270.TimeoutException; import dev.galasa.zos3270.Zos3270Exception; import dev.galasa.zos3270.Zos3270Terminal; +import dev.galasa.zos3270.spi.Colour; +import dev.galasa.zos3270.spi.Highlight; import dev.galasa.zos3270.spi.NetworkException; @Test @@ -46,8 +48,12 @@ public class Zos3270IVT { public String providedRunName; private String runName = new String(); + private String credentialsId = "PRIMARY"; private String applid = "IYK2ZNB5"; + @TestProperty(prefix = "IVT.REGION", suffix = "APPLID") + public String cbsaApplid; + @Test public void checkInjection() { assertThat(logger).as("Logger Field").isNotNull(); @@ -167,8 +173,44 @@ public void driveWaitForTextInField() throws TextNotFoundException, ErrorTextFou logger.info("No text found exception correctly thrown"); assertThat(tnfe.getMessage()).contains("Unable to find a field containing any of the request text"); } - - } - + + @Test + public void cursorColourTest() throws Zos3270Exception, CoreManagerException { + ICredentialsUsernamePassword credentials = (ICredentialsUsernamePassword) coreManager.getCredentials(credentialsId); + coreManager.registerConfidentialText(credentials.getPassword(), "password"); + terminal.disconnect(); + terminal.connect(); + + terminal.wfk().type("logon applid(" + cbsaApplid + ")").enter().wfk().waitForTextInField("Signon to CICS"); + terminal.wfk().type(credentials.getUsername()).tab().tab().type(credentials.getPassword()).enter().wfk(); + + // access CBSA and look up customer with ID 1 + terminal.type("OMEN").enter().wfk().waitForTextInField("CICS Bank Sample Application"); + terminal.type("1").enter().wfk().type("1").enter().wfk(); + + terminal.reportExtendedScreen(true, true, true, false, false, false, false); + assertThat(terminal.retrieveColourAtCursor()).isNull(); + + terminal.positionCursorToFieldContaining("CUSTOMER NUMBER").cursorRight(); + assertThat(terminal.retrieveColourAtCursor()).isEqualTo(Colour.TURQUOISE); + + terminal.positionCursorToFieldContaining("CICS Bank Sample Application").cursorRight(); + assertThat(terminal.retrieveColourAtCursor()).isEqualTo(Colour.RED); + + terminal.positionCursorToFieldContaining("Sort Code").cursorRight(); + assertThat(terminal.retrieveColourAtCursor()).isEqualTo(Colour.NEUTRAL); + } + + @Test + public void cursorHighlightingTest() throws Zos3270Exception { + // press f10 to switch to the view used to update customer information in CBSA + terminal.pf10().wfk(); + terminal.reportExtendedScreen(true, true, true, false, false, false, false); + assertThat(terminal.retrieveHighlightAtCursor()).isEqualTo(Highlight.UNDERSCORE); + + // the "Customer Number" field cannot be modified, so it is not highlighted + terminal.positionCursorToFieldContaining("Customer Number"); + assertThat(terminal.retrieveHighlightAtCursor()).isNull(); + } } From eb4635f4bac5a011486e5352cefeaf6529236eb7 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Wed, 9 Nov 2022 14:52:58 +0000 Subject: [PATCH 019/263] Initial modify field order Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../zos3270/internal/comms/NetworkThread.java | 4 + .../internal/datastream/OrderModifyField.java | 91 +++++++++++++++++++ .../java/dev/galasa/zos3270/spi/Screen.java | 21 +++++ 3 files changed, 116 insertions(+) create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderModifyField.java diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/NetworkThread.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/NetworkThread.java index 84241c7ae..6ea2bc4a6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/NetworkThread.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/NetworkThread.java @@ -28,6 +28,7 @@ import dev.galasa.zos3270.internal.datastream.OrderFormFeed; import dev.galasa.zos3270.internal.datastream.OrderGraphicsEscape; import dev.galasa.zos3270.internal.datastream.OrderInsertCursor; +import dev.galasa.zos3270.internal.datastream.OrderModifyField; import dev.galasa.zos3270.internal.datastream.OrderNewLine; import dev.galasa.zos3270.internal.datastream.OrderRepeatToAddress; import dev.galasa.zos3270.internal.datastream.OrderSetAttribute; @@ -883,6 +884,9 @@ public static List processOrders(ByteBuffer buffer) throws Datast case OrderSetAttribute.ID: order = new OrderSetAttribute(buffer); break; + case OrderModifyField.ID: + order = new OrderModifyField(buffer); + break; case OrderInsertCursor.ID: order = new OrderInsertCursor(); break; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderModifyField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderModifyField.java new file mode 100644 index 000000000..0c6913988 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderModifyField.java @@ -0,0 +1,91 @@ +/* + * Copyright contributors to the Galasa project + */ +package dev.galasa.zos3270.internal.datastream; + +import java.nio.ByteBuffer; + +import dev.galasa.zos3270.spi.DatastreamException; + +public class OrderModifyField extends AbstractOrder { + + public static final byte ID = 0x2c; + + private OrderStartField orderStartField = null; + @SuppressWarnings("unused") + private AttributeFieldValidation attributeFieldValidation = null; + @SuppressWarnings("unused") + private AttributeFieldOutlining attributeFieldOutlining = null; + private AttributeExtendedHighlighting attributeExtendedHighlighting = null; + @SuppressWarnings("unused") + private AttributeCharacterSet attributeCharacterSet = null; + private AttributeForegroundColour attributeForegroundColour = null; + private AttributeBackgroundColour attributeBackgroundColour = null; + @SuppressWarnings("unused") + private AttributeTransparency attributeTransparency = null; + + public OrderModifyField(ByteBuffer buffer) throws DatastreamException { + byte[] rep = new byte[4]; + rep[0] = 0; + rep[1] = 0; + rep[2] = 0; + rep[3] = buffer.get(); + + ByteBuffer countBuffer = ByteBuffer.wrap(rep); + int fieldAttributeCount = countBuffer.getInt(); + + for (int i = 0; i < fieldAttributeCount; i++) { + byte attributeId = buffer.get(); + switch (attributeId) { + case OrderStartField.ATTRIBUTE_ID: + orderStartField = new OrderStartField(buffer); + break; + case AttributeFieldValidation.ATTRIBUTE_ID: + attributeFieldValidation = new AttributeFieldValidation(buffer); + break; + case AttributeFieldOutlining.ATTRIBUTE_ID: + attributeFieldOutlining = new AttributeFieldOutlining(buffer); + break; + case AttributeExtendedHighlighting.ATTRIBUTE_ID: + attributeExtendedHighlighting = new AttributeExtendedHighlighting(buffer); + break; + case AttributeForegroundColour.ATTRIBUTE_ID: + attributeForegroundColour = new AttributeForegroundColour(buffer); + break; + case AttributeCharacterSet.ATTRIBUTE_ID: + attributeCharacterSet = new AttributeCharacterSet(buffer); + break; + case AttributeBackgroundColour.ATTRIBUTE_ID: + attributeBackgroundColour = new AttributeBackgroundColour(buffer); + break; + case AttributeTransparency.ATTRIBUTE_ID: + attributeTransparency = new AttributeTransparency(buffer); + break; + default: + throw new DatastreamException("Unrecognised attribute in MF, '" + attributeId + "'"); + } + } + } + + @Override + public byte[] getBytes() { + throw new UnsupportedOperationException("Not available yet"); + } + + public OrderStartField getOrderStartField() { + return orderStartField; + } + + public AttributeExtendedHighlighting getHighlight() { + return attributeExtendedHighlighting; + } + + public AttributeForegroundColour getForegroundColour() { + return this.attributeForegroundColour; + } + + public AttributeBackgroundColour getBackgroundColor() { + return this.attributeBackgroundColour; + } + +} diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Screen.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Screen.java index 6b1d43bda..15f1c7b18 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Screen.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Screen.java @@ -51,6 +51,7 @@ import dev.galasa.zos3270.internal.datastream.OrderFormFeed; import dev.galasa.zos3270.internal.datastream.OrderGraphicsEscape; import dev.galasa.zos3270.internal.datastream.OrderInsertCursor; +import dev.galasa.zos3270.internal.datastream.OrderModifyField; import dev.galasa.zos3270.internal.datastream.OrderNewLine; import dev.galasa.zos3270.internal.datastream.OrderRepeatToAddress; import dev.galasa.zos3270.internal.datastream.OrderSetAttribute; @@ -464,6 +465,8 @@ public synchronized void processOrders(List orders, WriteControlC processSFE((OrderStartFieldExtended) order); } else if (order instanceof OrderSetAttribute) { processSA((OrderSetAttribute) order); + } else if (order instanceof OrderModifyField) { + processMF((OrderModifyField) order); } else if (order instanceof OrderInsertCursor) { this.screenCursor = this.workingCursor; } else if (order instanceof OrderEraseUnprotectedToAddress) { @@ -615,6 +618,24 @@ private void processSFE(OrderStartFieldExtended order) { incrementWorkingCursor(); } + private void processMF(OrderModifyField order) { + OrderStartField sf = order.getOrderStartField(); + BufferStartOfField bsf = null; + + if (sf != null) { + bsf = new BufferStartOfField(this.workingCursor, sf.isFieldProtected(), sf.isFieldNumeric(), + sf.isFieldDisplay(), sf.isFieldIntenseDisplay(), sf.isFieldSelectorPen(), sf.isFieldModifed(), + order.getHighlight(), order.getForegroundColour(), order.getBackgroundColor()); + } + + if (bsf == null) { + bsf = new BufferStartOfField(this.workingCursor, false, false, true, false, false, false); + } + + this.buffer[this.workingCursor] = bsf; + incrementWorkingCursor(); + } + private void processEUA(OrderEraseUnprotectedToAddress order) { boolean charProtected = true; IBufferHolder bh = this.buffer[this.workingCursor]; From 53b0672fb69e8eecb5aabc790159356f92a655d3 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 9 Nov 2022 16:37:07 +0000 Subject: [PATCH 020/263] Test PR Signed-off-by: Jade Carino --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 93b07c072..9a6c770db 100644 --- a/README.md +++ b/README.md @@ -27,5 +27,3 @@ Other Galasa repositories are available on [GitHub](https://github.com/galasa-de This code is under the [Eclipse Public License 2.0](https://github.com/galasa-dev/maven/blob/main/LICENSE). - - From 05829fb28effac5fa21cc1bc67c465dac46651dd Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Wed, 9 Nov 2022 17:07:45 +0000 Subject: [PATCH 021/263] Bump DB2 manager up to v0.25.0 so it matches the release.yaml file content version. Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../dev.galasa.db2.manager/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle index 7e50268d0..cd8329675 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Db2 Manager' -version = '0.24.0' +version = '0.25.0' dependencies { // implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') From 199ab27ee23fa25620fba5a43c00dccdcf85add4 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Thu, 10 Nov 2022 17:42:53 +0000 Subject: [PATCH 022/263] make sure we call unit tests in local builds. Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- build-locally.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/build-locally.sh b/build-locally.sh index 6a3106483..693d1b36a 100755 --- a/build-locally.sh +++ b/build-locally.sh @@ -155,18 +155,15 @@ log_file=${LOGS_DIR}/${project}.txt info "Log will be placed at ${log_file}" if [[ "${build_type}" == "clean" ]]; then - goals="clean build publishToMavenLocal" + goals="clean build check publishToMavenLocal -no-build-cache --no-daemon" else - goals="clean build publishToMavenLocal" + goals="build check publishToMavenLocal" fi -# DAEMON_FLAG="--no-daemon" -DAEMON_FLAG="" - cat << EOF Using command: -gradle ${DAEMON_FLAG} \ +gradle \ ${CONSOLE_FLAG} \ -Dorg.gradle.java.home=${JAVA_HOME} \ -PsourceMaven=${SOURCE_MAVEN} ${OPTIONAL_DEBUG_FLAG} \ @@ -176,7 +173,7 @@ ${goals} \ EOF -gradle ${DAEMON_FLAG} \ +gradle \ ${CONSOLE_FLAG} \ -Dorg.gradle.java.home=${JAVA_HOME} \ -PsourceMaven=${SOURCE_MAVEN} ${OPTIONAL_DEBUG_FLAG} \ From c988f3011938328854738b6d1688052ffdcf72f7 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Fri, 11 Nov 2022 09:09:06 +0000 Subject: [PATCH 023/263] Temporarily disable colour support IVTs Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../zos3270/manager/ivt/Zos3270IVT.java | 67 ++++++++++--------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/src/main/java/dev/galasa/zos3270/manager/ivt/Zos3270IVT.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/src/main/java/dev/galasa/zos3270/manager/ivt/Zos3270IVT.java index e8b1690f5..f67b4a533 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/src/main/java/dev/galasa/zos3270/manager/ivt/Zos3270IVT.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/src/main/java/dev/galasa/zos3270/manager/ivt/Zos3270IVT.java @@ -175,42 +175,43 @@ public void driveWaitForTextInField() throws TextNotFoundException, ErrorTextFou } } - @Test - public void cursorColourTest() throws Zos3270Exception, CoreManagerException { - ICredentialsUsernamePassword credentials = (ICredentialsUsernamePassword) coreManager.getCredentials(credentialsId); - coreManager.registerConfidentialText(credentials.getPassword(), "password"); - terminal.disconnect(); - terminal.connect(); - - terminal.wfk().type("logon applid(" + cbsaApplid + ")").enter().wfk().waitForTextInField("Signon to CICS"); - terminal.wfk().type(credentials.getUsername()).tab().tab().type(credentials.getPassword()).enter().wfk(); - - // access CBSA and look up customer with ID 1 - terminal.type("OMEN").enter().wfk().waitForTextInField("CICS Bank Sample Application"); - terminal.type("1").enter().wfk().type("1").enter().wfk(); + // TODO: Re-enable colour support IVTs once CBSA is installed on a region provisioned for the tests + // @Test + // public void cursorColourTest() throws Zos3270Exception, CoreManagerException { + // ICredentialsUsernamePassword credentials = (ICredentialsUsernamePassword) coreManager.getCredentials(credentialsId); + // coreManager.registerConfidentialText(credentials.getPassword(), "password"); + // terminal.disconnect(); + // terminal.connect(); + + // terminal.wfk().type("logon applid(" + cbsaApplid + ")").enter().wfk().waitForTextInField("Signon to CICS"); + // terminal.wfk().type(credentials.getUsername()).tab().tab().type(credentials.getPassword()).enter().wfk(); + + // // access CBSA and look up customer with ID 1 + // terminal.type("OMEN").enter().wfk().waitForTextInField("CICS Bank Sample Application"); + // terminal.type("1").enter().wfk().type("1").enter().wfk(); - terminal.reportExtendedScreen(true, true, true, false, false, false, false); - assertThat(terminal.retrieveColourAtCursor()).isNull(); + // terminal.reportExtendedScreen(true, true, true, false, false, false, false); + // assertThat(terminal.retrieveColourAtCursor()).isNull(); - terminal.positionCursorToFieldContaining("CUSTOMER NUMBER").cursorRight(); - assertThat(terminal.retrieveColourAtCursor()).isEqualTo(Colour.TURQUOISE); + // terminal.positionCursorToFieldContaining("CUSTOMER NUMBER").cursorRight(); + // assertThat(terminal.retrieveColourAtCursor()).isEqualTo(Colour.TURQUOISE); - terminal.positionCursorToFieldContaining("CICS Bank Sample Application").cursorRight(); - assertThat(terminal.retrieveColourAtCursor()).isEqualTo(Colour.RED); + // terminal.positionCursorToFieldContaining("CICS Bank Sample Application").cursorRight(); + // assertThat(terminal.retrieveColourAtCursor()).isEqualTo(Colour.RED); - terminal.positionCursorToFieldContaining("Sort Code").cursorRight(); - assertThat(terminal.retrieveColourAtCursor()).isEqualTo(Colour.NEUTRAL); - } + // terminal.positionCursorToFieldContaining("Sort Code").cursorRight(); + // assertThat(terminal.retrieveColourAtCursor()).isEqualTo(Colour.NEUTRAL); + // } - @Test - public void cursorHighlightingTest() throws Zos3270Exception { - // press f10 to switch to the view used to update customer information in CBSA - terminal.pf10().wfk(); - terminal.reportExtendedScreen(true, true, true, false, false, false, false); - assertThat(terminal.retrieveHighlightAtCursor()).isEqualTo(Highlight.UNDERSCORE); - - // the "Customer Number" field cannot be modified, so it is not highlighted - terminal.positionCursorToFieldContaining("Customer Number"); - assertThat(terminal.retrieveHighlightAtCursor()).isNull(); - } + // @Test + // public void cursorHighlightingTest() throws Zos3270Exception { + // // press f10 to switch to the view used to update customer information in CBSA + // terminal.pf10().wfk(); + // terminal.reportExtendedScreen(true, true, true, false, false, false, false); + // assertThat(terminal.retrieveHighlightAtCursor()).isEqualTo(Highlight.UNDERSCORE); + + // // the "Customer Number" field cannot be modified, so it is not highlighted + // terminal.positionCursorToFieldContaining("Customer Number"); + // assertThat(terminal.retrieveHighlightAtCursor()).isNull(); + // } } From 31ddf99e10cc7d6e738c9d00daccdf572ad412c0 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Fri, 11 Nov 2022 09:58:13 +0000 Subject: [PATCH 024/263] Update IVTs Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../galasa/zos3270/manager/ivt/Zos3270IVT.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/src/main/java/dev/galasa/zos3270/manager/ivt/Zos3270IVT.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/src/main/java/dev/galasa/zos3270/manager/ivt/Zos3270IVT.java index f67b4a533..c68699f2e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/src/main/java/dev/galasa/zos3270/manager/ivt/Zos3270IVT.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/src/main/java/dev/galasa/zos3270/manager/ivt/Zos3270IVT.java @@ -13,6 +13,7 @@ import dev.galasa.core.manager.CoreManagerException; import dev.galasa.core.manager.ICoreManager; import dev.galasa.core.manager.Logger; +import dev.galasa.core.manager.RunName; import dev.galasa.core.manager.TestProperty; import dev.galasa.zos.IZosImage; import dev.galasa.zos.ZosImage; @@ -44,27 +45,18 @@ public class Zos3270IVT { @CoreManager public ICoreManager coreManager; - @TestProperty(prefix = "IVT.RUN",suffix = "NAME", required = false) - public String providedRunName; - private String runName = new String(); + @RunName + public String runName; private String credentialsId = "PRIMARY"; private String applid = "IYK2ZNB5"; - @TestProperty(prefix = "IVT.REGION", suffix = "APPLID") + @TestProperty(prefix = "IVT.REGION", suffix = "APPLID", required = false) public String cbsaApplid; @Test public void checkInjection() { - assertThat(logger).as("Logger Field").isNotNull(); - assertThat(image).as("zOS Image Field").isNotNull(); - assertThat(terminal).as("zOS 3270 Terminal Field").isNotNull(); assertThat(terminal.isConnected()).isTrue(); - if (providedRunName != null) { - runName = providedRunName; - } else { - runName = coreManager.getRunName(); - } logger.info("Using Run ID of: " + runName); } From 1af8d03ad97053c5eb579f886f2da7db5fef0e7a Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Mon, 21 Nov 2022 12:29:36 +0000 Subject: [PATCH 025/263] Local builds pick up OBR from different location Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- build-locally.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-locally.sh b/build-locally.sh index 693d1b36a..f7dad0337 100755 --- a/build-locally.sh +++ b/build-locally.sh @@ -121,7 +121,7 @@ fi # Over-rode SOURCE_MAVEN if you want to build from a different maven repo... if [[ -z ${SOURCE_MAVEN} ]]; then - export SOURCE_MAVEN=https://galasadev-cicsk8s.hursley.ibm.com/main/maven/obr/ + export SOURCE_MAVEN=https://development.galasa.dev/main/maven-repo/obr/ info "SOURCE_MAVEN repo defaulting to ${SOURCE_MAVEN}." info "Set this environment variable if you want to over-ride this value." else From b81661358e666f0792a2f91ef5b852f470263073 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Mon, 21 Nov 2022 13:45:31 +0000 Subject: [PATCH 026/263] spotted that obr version was wrong. Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- galasa-managers-parent/galasa-uber-javadoc/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/galasa-managers-parent/galasa-uber-javadoc/pom.xml b/galasa-managers-parent/galasa-uber-javadoc/pom.xml index 9ed301a83..caa762a3a 100644 --- a/galasa-managers-parent/galasa-uber-javadoc/pom.xml +++ b/galasa-managers-parent/galasa-uber-javadoc/pom.xml @@ -4,7 +4,7 @@ dev.galasa galasa-managers-parent - 0.15.0 + 0.25.0 galasa-uber-javadoc @@ -14,7 +14,7 @@ dev.galasa dev.galasa.uber.obr - 0.15.0 + 0.25.0 obr From 980f8d2a03494ba4ef804f687bcd7a73005bf478 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Mon, 21 Nov 2022 16:56:01 +0000 Subject: [PATCH 027/263] build-locally.sh script places logs locally Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- build-locally.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build-locally.sh b/build-locally.sh index f7dad0337..dad6c8aa5 100755 --- a/build-locally.sh +++ b/build-locally.sh @@ -131,14 +131,14 @@ fi # Create a temporary dir. # Note: This bash 'spell' works in OSX and Linux. if [[ -z ${LOGS_DIR} ]]; then - export LOGS_DIR=$(mktemp -d 2>/dev/null || mktemp -d -t "galasa-logs") + export LOGS_DIR="${BASEDIR}/local-builds/logs" info "Logs are stored in the ${LOGS_DIR} folder." info "Over-ride this setting using the LOGS_DIR environment variable." else - mkdir -p ${LOGS_DIR} 2>&1 > /dev/null # Don't show output. We don't care if it already existed. info "Logs are stored in the ${LOGS_DIR} folder." info "Over-ridden by caller using the LOGS_DIR variable." fi +mkdir -p ${LOGS_DIR} 2>&1 > /dev/null # Don't show output. We don't care if it already existed. info "Using source code at ${source_dir}" cd ${BASEDIR}/${source_dir} @@ -151,13 +151,13 @@ fi # auto plain rich or verbose CONSOLE_FLAG=--console=plain -log_file=${LOGS_DIR}/${project}.txt +log_file=${LOGS_DIR}/logs.txt info "Log will be placed at ${log_file}" if [[ "${build_type}" == "clean" ]]; then - goals="clean build check publishToMavenLocal -no-build-cache --no-daemon" + goals="clean build check publishToMavenLocal -no-build-cache --no-daemon --parallel" else - goals="build check publishToMavenLocal" + goals="build check publishToMavenLocal --parallel" fi cat << EOF @@ -182,5 +182,5 @@ ${goals} \ -rc=$? ; if [[ "${rc}" != "0" ]]; then cat ${log_file} ; error "Failed to build ${project}" ; exit 1 ; fi +rc=$? ; if [[ "${rc}" != "0" ]]; then cat ${log_file} ; error "Failed to build ${project} see logs at ${log_file}" ; exit 1 ; fi success "Project ${project} built - OK - log is at ${log_file}" From 4b5fa93dff80b1df9a2eecdce71f3cb5cb4121ae Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Mon, 21 Nov 2022 16:56:50 +0000 Subject: [PATCH 028/263] fix some glaring javadoc errors Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .gitignore | 1 + .../jmeter/internal/JMeterManagerImpl.java | 4 +--- .../jmeter/internal/JMeterSessionImpl.java | 4 +--- .../java/dev/galasa/zosfile/IZosUNIXFile.java | 2 +- .../java/dev/galasa/zosprogram/package-info.java | 16 +++++++--------- .../main/java/dev/galasa/zosrseapi/IRseapi.java | 2 ++ .../zosrseapi/IRseapiRestApiProcessor.java | 10 +++++----- .../main/java/dev/galasa/zosrseapi/Rseapi.java | 5 ++--- .../internal/RseapiRestApiProcessor.java | 14 ++++++++------ .../internal/properties/RequestRetry.java | 6 ++---- .../java/dev/galasa/zosrseapi/package-info.java | 4 +--- .../dev/galasa/zossecurity/IZosSecurity.java | 8 +++++--- .../ssh/manager/internal/package-info.java | 13 +++++++------ .../manager/internal/properties/TsocmdPath.java | 4 +--- .../ssh/manager/internal/package-info.java | 13 +++++++------ 15 files changed, 51 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index e1b2dfdb3..66d361d6e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ Snap*.trc **/build **/.gradle **/gradle/wrapper +local-builds/ diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/internal/JMeterManagerImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/internal/JMeterManagerImpl.java index 5f095ab03..8e6958f38 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/internal/JMeterManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/internal/JMeterManagerImpl.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020,2021. + * Copyright contributors to the Galasa project */ package dev.galasa.jmeter.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/internal/JMeterSessionImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/internal/JMeterSessionImpl.java index 63dd79200..9d99093a1 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/internal/JMeterSessionImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/internal/JMeterSessionImpl.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.jmeter.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosUNIXFile.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosUNIXFile.java index 72af4d943..d35a4ea4d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosUNIXFile.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosUNIXFile.java @@ -305,7 +305,7 @@ public static String posixFilePermissionsToSymbolicNotation(Set to Numeric Notation (e.g. 777) + * Convert {@link Set}<{@link PosixFilePermission}> to Numeric Notation (e.g. 777) * @param accessPermissions * @return a {@link String} containing the file permissions in Numeric Notation */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/package-info.java index 7115fb443..2e2bc5624 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/package-info.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ /** * zOS Program Manager @@ -12,22 +10,22 @@ * * @galasa.description * - * This Manager allows Galasa tests to compile and link zOS Programs.

+ * This Manager allows Galasa tests to compile and link zOS Programs. * * The @ZosProgram annotation defines the program to the Galasa test. Program attributes, for * example, program name, programming language and source location are specified by using the annotation - * elements.

+ * elements. * The source for the program is stored as a resource, along with the test. The z/OS Program Manager processes * each @ZosProgram annotation before any of the test methods are executed. The Manager * retrieves the source from the test bundle, builds and submits the relevant compile and link JCL based on * the programs attributes and CPS properties. The batch job is saved with the test run archive. The * program can be executed in the test by retrieving the library containing the load module by using - * the getLoadLibrary() method.

+ * the getLoadLibrary() method. * * The Simbank tutorial BatchAccountsOpenTestBatchAccountsOpenTest - * contains an example of running a simulated z/OS program called SIMBANK by using the EXEC PGM=SIMBANK command.

- *

- * You can view the Javadoc documentation for the Manager here.

+ * contains an example of running a simulated z/OS program called SIMBANK by using the EXEC PGM=SIMBANK command. + * + * You can view the Javadoc documentation for the Manager here.

* */ package dev.galasa.zosprogram; \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapi.java index 79041101d..c1d152ecc 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapi.java @@ -23,12 +23,14 @@ public interface IRseapi { /** * Enumeration of RSE API request types: + *

    *
  • {@link #GET}
    • *
  • {@link #PUT_TEXT}
    • *
  • {@link #PUT_JSON}
    • *
  • {@link #POST}
    • *
  • {@link #POST_JSON}
    • *
  • {@link #DELETE}
    • + *
*/ public enum RseapiRequestType { /** diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapiRestApiProcessor.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapiRestApiProcessor.java index 178ff187f..265a48066 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapiRestApiProcessor.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapiRestApiProcessor.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zosrseapi; @@ -24,7 +22,9 @@ public interface IRseapiRestApiProcessor { * @param validStatusCodes list HTTP status codes expected from this request. default of HTTP 200 when null * @param convert is a data conversion required. If true, data will be converted between EBCDIC to ISO8859-1. If false, no data conversion will take place. * @return the response {@link IRseapiResponse} - * @throws ZosBatchException + * @throws RseapiException */ - public @NotNull IRseapiResponse sendRequest(RseapiRequestType requestType, String path, Map headers, Object body, List validStatusCodes, boolean convert) throws RseapiException; + public @NotNull IRseapiResponse sendRequest(RseapiRequestType requestType, String path, + Map headers, Object body, List validStatusCodes, + boolean convert) throws RseapiException; } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/Rseapi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/Rseapi.java index 033b08f26..caeac7ebf 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/Rseapi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/Rseapi.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zosrseapi; @@ -41,6 +39,7 @@ /** * The tag of the zOS Image this variable is to be populated with + * @return The tag name of the image */ String imageTag() default "PRIMARY"; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiRestApiProcessor.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiRestApiProcessor.java index 01f581efe..1fafb9aa7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiRestApiProcessor.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiRestApiProcessor.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. + * Copyright contributors to the Galasa project */ package dev.galasa.zosrseapi.internal; @@ -50,13 +48,17 @@ public RseapiRestApiProcessor(Map rseapis) { * Send RSE API request * @param requestType * @param path - * @param body * @param headers + * @param body * @param validStatusCodes + * @param convert * @return - * @throws ZosBatchException + * @throws RseapiException */ - public @NotNull IRseapiResponse sendRequest(RseapiRequestType requestType, String path, Map headers, Object body, List validStatusCodes, boolean convert) throws RseapiException { + public @NotNull IRseapiResponse sendRequest(RseapiRequestType requestType, String path, + Map headers, Object body, List validStatusCodes, + boolean convert) throws RseapiException { + if (validStatusCodes == null) { validStatusCodes = new ArrayList<>(Arrays.asList(HttpStatus.SC_OK)); } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/RequestRetry.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/RequestRetry.java index 0f234e817..8cb50080a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/RequestRetry.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/RequestRetry.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zosrseapi.internal.properties; @@ -23,7 +21,7 @@ * * @galasa.default 3 * - * @galasa.valid_values numerical value > 0 + * @galasa.valid_values numerical value > 0 * * @galasa.examples * rseapi.server.request.retry=5
diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/package-info.java index 88a273a04..8bf6db581 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/package-info.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ /** * RSE API Manager diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosSecurity.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosSecurity.java index 4c6729727..ceebf9d0f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosSecurity.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosSecurity.java @@ -83,7 +83,7 @@ public interface IZosSecurity { /** * Create a new profile on the specified image/sysplex. - * + * @param className * @param image - The image/sysplex * @param name - The name of the profiles * @param uacc - The uacc to assign, or null @@ -98,6 +98,7 @@ public interface IZosSecurity { * Create a new profile on the specified image/sysplex. * * @param image - The image/sysplex + * @param className * @param name - The name of the profiles * @param uacc - The uacc to assign, or null * @return The profile @@ -122,6 +123,7 @@ public interface IZosSecurity { * Create a new profile on the specified image/sysplex. * * @param image - The image/sysplex + * @param className * @param name - The name of the profiles * @param uacc - The uacc to assign, or null * @param refresh - issue SETROPTS REFRESH @@ -387,7 +389,7 @@ public interface IZosSecurity { * Free this certificate. This will be performed automatically at the end of the * run * - * @param keyring + * @param certificate The certificate to free * @throws ZosSecurityManagerException */ public void freeCertificate(IZosCertificate certificate) throws ZosSecurityManagerException; @@ -397,7 +399,7 @@ public interface IZosSecurity { * best let the Resource Manager to clean this resource, so you run will perform * faster. * - * @param certificate + * @param certificate The certificate to delete * @throws ZosSecurityManagerException */ public void deleteCertificate(IZosCertificate certificate) throws ZosSecurityManagerException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/package-info.java index c16f4738a..965feb8e2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/package-info.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ /** * zOS TSO Command Manager - SSH Internal Implementation @@ -13,8 +11,11 @@ * @galasa.description * * This Manager is the internal implementation of the zOS TSO Command Manager using SSH. - *

See the zOS Manager for details of the z/OS TSO annotations and - * code snippets.

You can view the Javadoc - * documentation for the Manager here.

+ * + * See the zOS Manager for details of the z/OS TSO annotations and + * code snippets. + * + * You can view the Javadoc + * documentation for the Manager here. */ package dev.galasa.zostsocommand.ssh.manager.internal; \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/TsocmdPath.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/TsocmdPath.java index 71fb5a65d..b7e9b4fb2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/TsocmdPath.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/TsocmdPath.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zostsocommand.ssh.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/package-info.java index e063b3cc0..e1ca62fff 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/package-info.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ /** * zOS UNIX Manager - SSH Internal Implementation @@ -13,8 +11,11 @@ * @galasa.description * * This Manager is the internal implementation of the z/OS UNIX Command Manager using SSH. - *

See the zOS Manager for details of the z/OS UNIX annotations and - * code snippets.

You can view the Javadoc - * documentation for the Manager here.

+ * + * See the zOS Manager for details of the z/OS UNIX annotations and + * code snippets. + * + * You can view the Javadoc + * documentation for the Manager here */ package dev.galasa.zosunixcommand.ssh.manager.internal; \ No newline at end of file From 92830323436db7ce52682f1e19b73cdfd6acdbf3 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Mon, 21 Nov 2022 17:12:52 +0000 Subject: [PATCH 029/263] copyright Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../src/main/java/dev/galasa/zosrseapi/IRseapi.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapi.java index c1d152ecc..e34c4ffa6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapi.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. + * Copyright contributors to the Galasa project */ package dev.galasa.zosrseapi; From da34d7c1606b9bf495b43d1f7769397db2a2ac66 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Wed, 23 Nov 2022 10:43:21 +0000 Subject: [PATCH 030/263] javadoc improvements to remove some errors Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../main/java/dev/galasa/cicsts/ICeci.java | 11 ++- .../cicsts/cicsresource/ICicsBundle.java | 4 +- .../cicsts/cicsresource/ICicsResource.java | 8 +- .../cicsts/cicsresource/IJvmprofile.java | 5 +- .../cicsts/cicsresource/IJvmserver.java | 4 +- .../cicsts/cicsresource/IJvmserverLog.java | 88 ++++++++++++------- .../galasa/docker/DockerContainerConfig.java | 13 ++- .../java/dev/galasa/docker/DockerVolume.java | 35 ++++---- .../dev/galasa/docker/IDockerContainer.java | 9 +- .../java/dev/galasa/docker/IDockerVolume.java | 24 ++--- .../dev/galasa/ipnetwork/ICommandShell.java | 16 ++-- .../dev/galasa/artifact/IBundleResources.java | 37 +++++--- .../dev/galasa/core/manager/CoreManager.java | 8 +- .../dev/galasa/core/manager/ICoreManager.java | 13 +-- .../java/dev/galasa/core/manager/RunName.java | 16 ++-- .../core/manager/StoredArtifactRoot.java | 10 +-- .../java/dev/galasa/textscan/LogScanner.java | 14 +-- .../java/dev/galasa/textscan/TextScanner.java | 12 +-- .../dev/galasa/zosconsole/ZosConsole.java | 23 ++--- .../galasa/zostsocommand/ZosTSOCommand.java | 16 ++-- .../galasa/zosunixcommand/ZosUNIXCommand.java | 8 +- .../zosliberty/angel/ZosLibertyAngel.java | 10 ++- .../main/java/dev/galasa/zosmf/IZosmf.java | 23 +---- .../src/main/java/dev/galasa/zosmf/Zosmf.java | 14 +-- .../dev/galasa/zosprogram/ZosProgram.java | 12 +-- .../java/dev/galasa/zosrseapi/IRseapi.java | 10 +-- .../java/dev/galasa/zosrseapi/Rseapi.java | 7 +- 27 files changed, 209 insertions(+), 241 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeci.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeci.java index d2ec2b5c3..765948ef0 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeci.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeci.java @@ -38,12 +38,15 @@ public interface ICeci { * @param ceciTerminal an {@link ICicsTerminal} object logged on to the CICS region and in an active CECI session. * If mixed case is required, the terminal should be presented with no upper case translate status. * For example, the test could first issue CEOT TRANIDONLY + * * @param command a {@link String} containing the CECI command * @param parseOutput parse the command output and store in {@link ICeciResponse}. Setting to false can improve performance on commands - * that contain a lot of output fields, e.g. ASSIGN.

- * The following examples shows how to retrieve a specific returned value:
- * issueCommand(ICicsTerminal, "ASSIGN USERID(&VAR)", false)
- * retrieveVariableText(ICicsTerminal, "&VAR") + * that contain a lot of output fields, e.g. ASSIGN. + * + * The following examples shows how to retrieve a specific returned value:
+ * + * issueCommand(ICicsTerminal, "ASSIGN USERID(&VAR)", false)
+ * retrieveVariableText(ICicsTerminal, "&VAR") * * @return an {@link ICeciResponse} object containing the command's response. * @throws CeciException diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsBundle.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsBundle.java index fcf8f71f1..e574d74b0 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsBundle.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsBundle.java @@ -84,12 +84,14 @@ public interface ICicsBundle { /** * Check if the CICS BUNDLE resource definition exist via CEDA DISPLAY + * @return true if the resource definition exists, false otherwise * @throws CicsBundleResourceException */ public boolean resourceDefined() throws CicsBundleResourceException; /** * Check if the CICS BUNDLE resource has been installed via CEMT INQUIRE + * @return true if it has been installed, false otherwise. * @throws CicsBundleResourceException */ public boolean resourceInstalled() throws CicsBundleResourceException; @@ -140,7 +142,7 @@ public interface ICicsBundle { * Wait for the CICS BUNDLE resource to be disabled with specified timeout. Does NOT issue the disable command * @param timeout timeout in seconds * @return true if disabled, false if not disabled - * @throws CicsJvmserverResourceException + * @throws CicsBundleResourceException */ public boolean waitForDisable(int timeout) throws CicsBundleResourceException; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsResource.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsResource.java index d88abb5aa..a41669082 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsResource.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsResource.java @@ -19,25 +19,25 @@ public interface ICicsResource { * Create a CICS BUNDLE resource object supplying the CICS bundle content. The source bundle should have the same file structure as it exists * on the zOS UNIX file system and will be transferred to the host in binary mode. * @param cicsTerminal a ICicsTerminal object for CEDA and CEMT transactions - * @param testClass a {@link class} in the same bundle containing the application archive file, use this.getClass() + * @param testClass a class in the same bundle containing the application archive file, use this.getClass() * @param name the CICS BUNDLE RDO name * @param group the CICS BUNDLE RDO group name * @param bundlePath the path to the directory in the test class bundle containing the CICS bundle * @param parameters substitution parameters to replace variables in the META-INF/cics.xml. Can be null * @return the CICS Bundle object - * @throws CicsJvmserverResourceException + * @throws CicsBundleResourceException */ public ICicsBundle newCicsBundle(ICicsTerminal cicsTerminal, Class testClass, String name, String group, String bundlePath, Map parameters) throws CicsBundleResourceException; /** * Create a CICS BUNDLE resource object without supplying the CICS bundle content, i.e. the bundle already exists on the zOS UNIX file system * @param cicsTerminal a ICicsTerminal object for CEDA and CEMT transactions - * @param testClass a {@link class} in the same bundle containing the application archive file, use this.getClass() + * @param testClass a class in the same bundle containing the application archive file, use this.getClass() * @param name the CICS BUNDLE RDO name * @param group the CICS BUNDLE RDO group name * @param bundleDir the CICS BUNDLE RDO BUNDLEDIR value, i.e. the location of the existing CICS bundle * @return the CICS Bundle object - * @throws CicsJvmserverResourceException + * @throws CicsBundleResourceException */ public ICicsBundle newCicsBundle(ICicsTerminal cicsTerminal, Class testClass, String name, String group, String bundleDir) throws CicsBundleResourceException; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmprofile.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmprofile.java index e9c42cff9..79d432ab8 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmprofile.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmprofile.java @@ -160,7 +160,9 @@ public interface IJvmprofile { public void saveToResultsArchive(String rasPath) throws CicsJvmserverResourceException; /** - * Set the value of the WLP_INSTALL_DIR environment variable in the JVM profile
Galasa sets the default value of&USSHOME;/wlp + * Set the value of the WLP_INSTALL_DIR environment variable in the JVM profile + * + * Galasa sets the default value ofUSSHOME/wlp * @param wlpInstallDir the value of WLP_INSTALL_DIR * @throws CicsJvmserverResourceException */ @@ -183,7 +185,6 @@ public interface IJvmprofile { /** * Set the value of the ZCEE_INSTALL_DIR environment variable in the JVM profile using the value supplied * in the Galasa Configuration Property Service - * @param zOSConnectInstallDir the value of ZCEE_INSTALL_DIR * @throws CicsJvmserverResourceException */ void setZosConnectInstallDir() throws CicsJvmserverResourceException; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserver.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserver.java index 85b807c19..2617e7d07 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserver.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserver.java @@ -260,7 +260,7 @@ public enum PurgeType { /** * Set the JVMSERVER Threadlimit value in CEMT - * @param the Threadlimit value + * @param threadlimit max number of threads used by the JVM server * @throws CicsJvmserverResourceException */ public void setThreadLimit(int threadlimit) throws CicsJvmserverResourceException; @@ -371,7 +371,7 @@ public enum PurgeType { public void checkpointLogs() throws CicsJvmserverResourceException; /** - * Get a <@link List} of Java log files, i.e Snap.*.trc, javacore.*.txt etc. + * Get a {@link List} of Java log files, i.e Snap.*.trc, javacore.*.txt etc. * @return * @throws CicsJvmserverResourceException */ diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserverLog.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserverLog.java index f145c0b71..3e6c1c2c9 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserverLog.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserverLog.java @@ -52,8 +52,9 @@ public interface IJvmserverLog { public OutputStream retrieve() throws CicsJvmserverResourceException; /** - * Delete the {@link IZosUNIXFile} if it exists. Will throw {@link CicsJvmserverResourceException} if the log is a {@link IZosBatchJobOutputSpoolFile} - * @throws CicsJvmserverResourceException + * Delete the {@link IZosUNIXFile} if it exists. + * + * @throws CicsJvmserverResourceException the log is a {@link IZosBatchJobOutputSpoolFile} */ public void delete() throws CicsJvmserverResourceException; @@ -143,19 +144,23 @@ public interface IJvmserverLog { /** * Searches contents of log for specified search or fail Pattern since the last checkpoint * @param searchPattern the Pattern to search + * @param failPattern the failure pattern to search * @return the string found or null * @throws CicsJvmserverResourceException */ public String searchForPatternSinceCheckpoint(Pattern searchPattern, Pattern failPattern) throws CicsJvmserverResourceException; /** - * Wait for a search search String to appear in specified log. Will check every 3 seconds until one of: + * Wait for a search search String to appear in specified log. + * + * Will check every 3 seconds until one of: *
    - *
  • the searchText is found;
    • - *
  • the failText is found;
    • - *
  • the specified timeout is reached.
    • + *
  • the searchText is found
    • + *
  • the failText is found
    • + *
  • the specified timeout is reached
    • *
- * @param searchString the text to search + * + * @param searchText the text to search * @param timeout timeout in seconds * @return the string found or null * @throws CicsJvmserverResourceException @@ -163,14 +168,17 @@ public interface IJvmserverLog { public String waitForText(String searchText, long timeout) throws CicsJvmserverResourceException; /** - * Wait for a search String or fail text to appear in specified log. Will check every 3 seconds until one of: + * Wait for a search String or fail text to appear in specified log. + * + * Will check every 3 seconds until one of: *
    - *
  • the searchText is found;
    • - *
  • the failText is found;
    • - *
  • the specified timeout is reached.
    • + *
  • the searchText is found
    • + *
  • the failText is found
    • + *
  • the specified timeout is reached
    • *
- * @param searchString the text to search - * @param failString the failure text to search + * + * @param searchText the text to search + * @param failText the failure text to search * @param timeout timeout in seconds * @return the string found or null * @throws CicsJvmserverResourceException @@ -178,11 +186,13 @@ public interface IJvmserverLog { public String waitForText(String searchText, String failText, long timeout) throws CicsJvmserverResourceException; /** - * Wait for a search String to appear in specified log since the last checkpoint. Will check every 3 seconds until one of: + * Wait for a search String to appear in specified log since the last checkpoint. + * + * Will check every 3 seconds until one of: *
    - *
  • the searchText is found;
    • - *
  • the failText is found;
    • - *
  • the specified timeout is reached.
    • + *
  • the searchText is found
    • + *
  • the failText is found
    • + *
  • the specified timeout is reached
    • *
* @param searchText the text to search * @param timeout timeout in seconds @@ -192,12 +202,15 @@ public interface IJvmserverLog { public String waitForTextSinceCheckpoint(String searchText, long timeout) throws CicsJvmserverResourceException; /** - * Wait for a search or fail String to appear in specified log since the last checkpoint. Will check every 3 seconds until one of: + * Wait for a search or fail String to appear in specified log since the last checkpoint. + * + * Will check every 3 seconds until one of: *
    - *
  • the searchText is found;
    • - *
  • the failText is found;
    • - *
  • the specified timeout is reached.
    • + *
  • the searchText is found
    • + *
  • the failText is found
    • + *
  • the specified timeout is reached
    • *
+ * * @param searchText the text to search * @param failText the failure text to search * @param timeout timeout in seconds @@ -221,12 +234,15 @@ public interface IJvmserverLog { public String waitForPattern(Pattern searchPattern, long timeout) throws CicsJvmserverResourceException; /** - * Wait for a search or fail Pattern or fail Pattern to appear in specified log. Will check every 3 seconds until one of: + * Wait for a search or fail Pattern or fail Pattern to appear in specified log. + * + * Will check every 3 seconds until one of: *
    - *
  • the searchPattern is found;
    • - *
  • the failPattern is found;
    • - *
  • the specified timeout is reached.
    • + *
  • the searchPattern is found
    • + *
  • the failPattern is found
    • + *
  • the specified timeout is reached
    • *
+ * * @param searchPattern the Pattern to search * @param failPattern the failure pattern to search * @param timeout timeout in seconds @@ -236,12 +252,15 @@ public interface IJvmserverLog { public String waitForPattern(Pattern searchPattern, Pattern failPattern, long timeout) throws CicsJvmserverResourceException; /** - * Wait for a search Pattern to appear in specified log since the last checkpoint. Will check every 3 seconds until one of: + * Wait for a search Pattern to appear in specified log since the last checkpoint. + * + * Will check every 3 seconds until one of: *
    - *
  • the searchPattern is found;
    • - *
  • the failPattern is found;
    • - *
  • the specified timeout is reached.
    • + *
  • the searchPattern is found
    • + *
  • the failPattern is found
    • + *
  • the specified timeout is reached
    • *
+ * * @param searchPattern the Pattern to search * @param timeout timeout in seconds * @return the string found or null @@ -250,12 +269,15 @@ public interface IJvmserverLog { public String waitForPatternSinceCheckpoint(Pattern searchPattern, long timeout) throws CicsJvmserverResourceException; /** - * Wait for a search or fail Pattern or fail Pattern to appear in specified log since the last checkpoint. Will check every 3 seconds until one of: + * Wait for a search or fail Pattern or fail Pattern to appear in specified log since the last checkpoint. + * + * Will check every 3 seconds until one of: *
    - *
  • the searchPattern is found;
    • - *
  • the failPattern is found;
    • - *
  • the specified timeout is reached.
    • + *
  • the searchPattern is found
    • + *
  • the failPattern is found
    • + *
  • the specified timeout is reached
    • *
+ * * @param searchPattern the Pattern to search * @param failPattern the failure pattern to search * @param timeout timeout in seconds diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerContainerConfig.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerContainerConfig.java index fd3532a21..0a8ddb010 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerContainerConfig.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerContainerConfig.java @@ -16,22 +16,21 @@ * * @galasa.annotation * - * @galasa.description The code>{@literal @}DockerContainerConfig annotation provides an object to manually configure certain aspects + * @galasa.description The {@literal @}DockerContainerConfig annotation provides an object to manually configure certain aspects * of a containers run. Within the annotation, volumes can be requests, for both binding and provisioning. Look at the Docker volume annotation * description for more details. The IDockerContainerConfig object it self allows for non provisioing configurations to be set at test time and * ammended between container startups. The IDockerContainer object needs to use the startWithConfig() method to take use of the customised * startup config * * @galasa.examples - * {@literal @}DockerContainerConfig( - * dockerVolumes = { - @DockerVolume(mountPath = "/tmp/testvol"), + * 
+   {@literal @}DockerContainerConfig(
+        dockerVolumes =  {
+            {@literal @}DockerVolume(mountPath = "/tmp/testvol"),
         }
     )
     public IDockerContainerConfig config;
- * 
- * 
- * @author James Davies
+
*/ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.FIELD }) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerVolume.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerVolume.java index 03d3e9002..7d148e8b3 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerVolume.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerVolume.java @@ -17,34 +17,35 @@ * * @galasa.annotation * - * @galasa.description The code>{@literal @}DockerVolume annotation provides the capability to bind or provision docker volumes. The + * @galasa.description The {@literal @}DockerVolume annotation provides the capability to bind or provision docker volumes. The * volumes were desgined with three Docker volume use cases in mind: - * 1. Mounting configuration - in this usecase any volume to be mounted contains configuration data and must not be edited by the running + * + *
    + *
  1. Mounting configuration - in this usecase any volume to be mounted contains configuration data and must not be edited by the running * container, as this could affect parallelization of test running. Therefore, in the DockerVolume annotation, if a volume name is provided - * (aka already exists), the mount will be read only. - * 2. Sharing volumes - when a volume is required for multiple containers to use to share data. This shoult not be a provided volume, so it + * (aka already exists), the mount will be read only.
    2. + *
  2. Sharing volumes - when a volume is required for multiple containers to use to share data. This shoult not be a provided volume, so it * is expected that a volume name will not be passed to the DockerVolume annotation, and the docker engine will generate a name. This * volume will be tagged for later reference. Current limitation is that the config used to provision the volume must be used for all - * containers wanting to mount the same volume. This results in the path having to be the same in all containers. - * 3. Persisting data - There may be a use case for a volume to exsist outside the life span of the test. For this I have encorparated a + * containers wanting to mount the same volume. This results in the path having to be the same in all containers.
    3. + *
  3. Persisting data - There may be a use case for a volume to exsist outside the life span of the test. For this I have encorparated a * boolean called persist on the DockerVolume annotation. This is not indefinate, but controlled by resource management. A good default - * would probably be 24 hours, but can utimately be set by the user with a CPS property. + * would probably be 24 hours, but can utimately be set by the user with a CPS property.
    4. + *
* * @galasa.examples * {@literal @}DockerContainerConfig( * dockerVolumes = { * // A read only mount, as a specific volume was requested. - * @DockerVolume(volumeName = config, mountPath = "/configs"), + * {@literal @}DockerVolume(volumeName = config, mountPath = "/configs"), * // A data volume that will persist past the life of the test - * @DockerVolume(mountPath = "/data", persist = true), + * {@literal @}DockerVolume(mountPath = "/data", persist = true), * // A sharing volume that will be cleanup post test. - * @DockerVolume(mountPath = "/mnt/appShare"), + * {@literal @}DockerVolume(mountPath = "/mnt/appShare"), * } * ) * public IDockerContainerConfig config; * - * - * @author James Davies */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.FIELD }) @@ -61,16 +62,14 @@ public String existingVolumeName() default ""; /** - * Where to mount the volume on the container. - * - * @return + * @return Where to mount the volume on the container. */ public String mountPath(); /** - * When wanting to reference a mount that is going to be provisioned, this tage will be used. + * When wanting to reference a mount that is going to be provisioned, this tag will be used. * - * @return + * @return The tag for this volume */ public String volumeTag(); @@ -86,7 +85,7 @@ * This field is used to protect this volume. If this volume is intended to be mounted to multiple containers, which you do not want * editing the contents, set this to be true * - * @return + * @return true if the volume is read-only, false otherwise. */ public boolean readOnly() default false; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainer.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainer.java index bf14f431a..79150541a 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainer.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainer.java @@ -10,15 +10,13 @@ /** * Docker Container Resource Object - *

+ * * Provides a resource object representing a Docker Container on a Docker * Engine. The normal method of obtaining a Docker Container resource object is * by using a field:-
* @DockerContainer(dockerContainerTag="a", image="galasadocker/ivp:1.0.0")
* private IDockerContainer containerA;
- * You can also retrieve a Docker Container using the - * {@link IDockerManager#getDockerContainer(String)} method. - *

+ * * The following are DSE Environment properties:-
* docker.container.TAG.name=BOB to define the name the container * is to use.
@@ -29,9 +27,6 @@ * container is to run on.
* docker.registries=http://localhost:5000 a list of Docker * registries to search for an image
- * - * @author Michael Baylis - * */ public interface IDockerContainer { /** diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerVolume.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerVolume.java index 74dbbef69..d27734d7c 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerVolume.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerVolume.java @@ -8,41 +8,31 @@ /** * A Galasa object to track, bind and provision Docker volumes with. * - * @author James Davies -*/ + */ public interface IDockerVolume { /** - * Returns the volume names, specified or provisioned. - * - * @return String volumeName + * @return the volume names, specified or provisioned. */ public String getVolumeName(); - /** - * Return the volume tag - * - * @return String volumeName + /** + * @return the volume tag */ public String getVolumeTag(); /** - * Returns the specified mount path. - * @return String mountPath + * @return the specified mount path. */ public String getMountPath(); /** - * Returns the read state of the volume. - * - * @return boolean readOnly + * @return the read state of the volume. */ public boolean readOnly(); /** - * Get the Tag of the engine used to host the volume. - * - * @return + * @return the Tag of the engine used to host the volume. */ public String getEngineTag(); diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/ICommandShell.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/ICommandShell.java index 0d6d32bfa..1ba4ab031 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/ICommandShell.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/ICommandShell.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. + * Copyright contributors to the Galasa project */ package dev.galasa.ipnetwork; @@ -58,10 +56,12 @@ public interface ICommandShell { public void setChangePromptCommand(String command); /** - * Issue a command using SSH shell. Equivalent to + * Issue a command using SSH shell. + * + * Equivalent to * {@link #issueCommandToShell(String, false, defaultTimeout)} - not valid for * Rexec implementation - equivalent to - * {@link #issueCommand(String, boolean, long)} for Telnet implementation + * {@link #issueCommand(String, long)} for Telnet implementation * * @param command - command to issue * @return the output of the command (stdout and stderr) @@ -72,7 +72,7 @@ public interface ICommandShell { /** * Issue a command using SSH shell. Equivalent to * {@link #issueCommandToShell(String, false, long)} - not valid for Rexec - * implementation - equivalent to {@link #issueCommand(String, boolean, long)} + * implementation - equivalent to {@link #issueCommand(String, long)} * for Telnet implementation * * @param command - command to issue - if true will start a new @@ -85,7 +85,7 @@ public interface ICommandShell { * Issue a command using SSH shell. Equivalent to * {@link #issueCommandToShell(String, boolean, defaultTimeout)} - not valid for * Rexec implementation - equivalent to - * {@link #issueCommand(String, boolean, long)} for Telnet implementation + * {@link #issueCommand(String, long)} for Telnet implementation * * @param command - command to issue * @param newShell - if true will start a new @@ -96,7 +96,7 @@ public interface ICommandShell { /** * Issue a command using SSH shell - not valid for Rexec implementation - - * equivalent to {@link #issueCommand(String, boolean, long)} for Telnet + * equivalent to {@link #issueCommand(String, long)} for Telnet * implementation * * @param command - command to issue diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IBundleResources.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IBundleResources.java index 71c439913..ae819515a 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IBundleResources.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IBundleResources.java @@ -22,10 +22,12 @@ public interface IBundleResources { InputStream retrieveFile(String path) throws TestBundleResourceException; /** - * Retrieve a file as a String - * @param path - * @return + * Retrieve the contents of a file as a String + * + * @param path The path to the file to which will be read + * @return The contents of the file * @throws TestBundleResourceException + * @throws IOException */ String retrieveFileAsString(String path) throws TestBundleResourceException, IOException; @@ -44,25 +46,32 @@ InputStream retrieveSkeletonFile(String path, Map parameters, in /** - * Retrieve a single file as an InputStream, if the file is a skeleton then any - * required substitutions will be performed before the stream is returned. Uses - * the default skeleton processor {@link SkeletonType#PLUSPLUS} + * Retrieve a single file as an InputStream * - * @param path + * If the file is a skeleton then any + * required substitutions will be performed before the stream is returned. + * + * Uses the default {@link ISkeletonProcessor} + * + * @param path The path to the file * @param parameters - * @return + * @return A stream so the caller can read the contents of the file * @throws TestBundleResourceException */ InputStream retrieveSkeletonFile(String path, Map parameters) throws TestBundleResourceException; /** - * Retrieve a single file as a String, if the file is a skeleton then any - * required substitutions will be performed before the string is returned. Uses - * the default skeleton processor {@link SkeletonType#PLUSPLUS} - * @param path - * @param parameters - * @return + * Retrieve a single file as a String + * + * If the file is a skeleton then any required substitutions will + * be performed before the string is returned. + * + * Uses the default {@link ISkeletonProcessor} + * + * @param path The path to the file to be read + * @param parameters + * @return The contents of the file * @throws TestBundleResourceException */ String retrieveSkeletonFileAsString(String path, Map parameters) throws TestBundleResourceException, IOException; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/CoreManager.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/CoreManager.java index 66f11210b..9e13fd181 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/CoreManager.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/CoreManager.java @@ -12,17 +12,11 @@ import dev.galasa.framework.spi.ValidAnnotatedFields; /** - *

* Fill this field with the Core Manager instance. - *

* - *

* Will only populate public {@link ICoreManager} fields. - *

- * - * @author Michael Baylis - * @see {@link ICoreManager} * + * @see ICoreManager */ @Retention(RUNTIME) @Target(FIELD) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ICoreManager.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ICoreManager.java index 5637b2d39..36b57b8f1 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ICoreManager.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ICoreManager.java @@ -9,22 +9,17 @@ import dev.galasa.ICredentialsUsernamePassword; /** - *

* The Core Manager provides Tests with access to some of the most common * features within the Galasa Framework - *

* - *

* To gain access to the Core Manager, include the following in the test class:- - *

* * 
- * @CoreManager
- * public ICoreManager coreManager;
- *
+ @CoreManager + public ICoreManager coreManager; + * - * @author Michael Baylis - * @See {@link CoreManager} + * @see CoreManager * */ public interface ICoreManager { diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/RunName.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/RunName.java index 3944b51f3..e3ca0f199 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/RunName.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/RunName.java @@ -12,19 +12,13 @@ import dev.galasa.framework.spi.ValidAnnotatedFields; /** - *

- * Fill this field with the name of the Test Run. Can be used for making - * resource names unique to this run. The Test Run will be unique across all - * Local and Automated runs that are in the system at that point. - *

+ * Fill this field with the name of the Test Run. + * + * Can be used for making resource names unique to this run. + * The Test Run will be unique across all Local and Automated runs + * that are in the system at that point. * - *

* Will only populate public {@link java.lang.String} fields. - *

- * - * @author Michael Baylis - * @see {@link java.lang.String} - * */ @Retention(RUNTIME) @Target(FIELD) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/StoredArtifactRoot.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/StoredArtifactRoot.java index 1d1825619..8b78af568 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/StoredArtifactRoot.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/StoredArtifactRoot.java @@ -13,18 +13,12 @@ import dev.galasa.framework.spi.ValidAnnotatedFields; /** - *

* Fill this field Root path of the Stored Artifacts for this Test Run. This can * be used to record test logs, job output, trace files etc. - *

* - *

* Will only populate public {@link java.nio.files.Path} fields. - *

- * - * @author Michael Baylis - * @see {@link java.nio.files.Path} - * + * + * @see java.nio.files.Path */ @Retention(RUNTIME) @Target(FIELD) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/LogScanner.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/LogScanner.java index b456dd46d..4426ee048 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/LogScanner.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/LogScanner.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.textscan; @@ -14,17 +12,11 @@ import dev.galasa.framework.spi.ValidAnnotatedFields; /** - *

* Fill this field with a Log Scanner object. - *

- * - *

+ * * Will only populate public {@link ILogScanner} fields. - *

- * - * @author Michael Baylis - * @see {@link ILogScanner} * + * @see ILogScanner */ @Retention(RUNTIME) @Target(FIELD) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanner.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanner.java index bfec48d4d..193a508b3 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanner.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanner.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.textscan; @@ -14,17 +12,11 @@ import dev.galasa.framework.spi.ValidAnnotatedFields; /** - *

* Fill this field with a Text Scanner object. - *

* - *

* Will only populate public {@link ITextScanner} fields. - *

- * - * @author Michael Baylis - * @see {@link ITextScanner} * + * @see ITextScanner */ @Retention(RUNTIME) @Target(FIELD) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/ZosConsole.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/ZosConsole.java index 039a38c0f..acb8966f2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/ZosConsole.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/ZosConsole.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zosconsole; @@ -18,21 +16,26 @@ * @galasa.annotation * * @galasa.description The {@literal @}ZosConsole annotation requests the z/OS Manager to provide a - * z/OS Console instance associated with a z/OS image. - * The test can request multiple z/OS Console instances, with the default being associated with the primary z/OS image.
+ * z/OS Console instance associated with a z/OS image. + * + * The test can request multiple z/OS Console instances, with the default being associated with the primary z/OS image. * * @galasa.examples + * * {@literal @}ZosImage(imageTag="A")
* public IZosImage zosImageA;
* {@literal @}ZosConsole(imageTag="A")
- * public IZosConsole zosConsoleA;
 + * public IZosConsole zosConsoleA;
+ * * * @galasa.extra - * The IZosConsole interface has two methods, {@link IZosConsole#issueCommand(String)} and - * {@link IZosConsole#issueCommand(String, String)} to issue a command to the z/OS console and returns a IZosConsoleCommand - * instance.

- * See {@link ZosConsole}, {@link IZosConsole} and {@link IZosConsoleCommand} to find out more. + * The {@link IZosConsole} interface has two methods, {@link IZosConsole#issueCommand(String)} and + * {@link IZosConsole#issueCommand(String, String)} to issue a command to the z/OS console and + * returns a {@link IZosConsoleCommand} instance. * + * @see ZosConsole + * @see IZosConsole + * @see IZosConsoleCommand */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD}) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/ZosTSOCommand.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/ZosTSOCommand.java index 5e57f16ed..92b88516b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/ZosTSOCommand.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/ZosTSOCommand.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zostsocommand; @@ -19,19 +17,21 @@ * * @galasa.description The {@literal @}ZosTSOCommand annotation requests the z/OS Manager to provide a * z/OS TSO Command instance associated with a z/OS image. - * The test can request multiple z/OS TSO Command instances, with the default being associated with the primary z/OS image.
+ * The test can request multiple z/OS TSO Command instances, with the default being associated with the primary z/OS image. * * @galasa.examples + * * {@literal @}ZosImage(imageTag="A")
* public IZosImage zosImageA;
* {@literal @}ZosTSOCommand(imageTag="A")
- * public IZosTSOCpmmand zosTSOA;
 + * public IZosTSOCpmmand zosTSOA;
+ * * * @galasa.extra * The IZosTSOCommand interface provides the methods {@link IZosTSOCommand#issueCommand(String)} and {@link IZosTSOCommand#issueCommand(String, long)} - * to issue a command to z/OS TSO Command and returns a String.

- * See {@link IZosTSOCommand} to find out more. - * + * to issue a command to z/OS TSO Command and returns a String. + * + * @see IZosTSOCommand */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD}) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommand.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommand.java index 35d8d512f..3670b2b12 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommand.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommand.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zosunixcommand; @@ -22,10 +20,12 @@ * The test can request multiple z/OS UNIX Command instances, with the default being associated with the primary z/OS image.
* * @galasa.examples + * * {@literal @}ZosImage(imageTag="A")
* public IZosImage zosImageA;
* {@literal @}ZosUNIXCommand(imageTag="A")
- * public IZosUNIXCommand zosUNIXCommandA;
 + * public IZosUNIXCommand zosUNIXCommandA;
+ * * * @galasa.extra * The IZosUNIXCommand interface provides the methods {@link IZosUNIXCommand#issueCommand(String)} and {@link IZosUNIXCommand#issueCommand(String, long)} diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/ZosLibertyAngel.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/ZosLibertyAngel.java index 7a0a119d1..8fde668bb 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/ZosLibertyAngel.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/ZosLibertyAngel.java @@ -20,10 +20,12 @@ * zOS Liberty Angel instance. * * @galasa.examples - * @galasa.examples {@literal @}ZosImage(imageTag="A")
+ * + * {@literal @}ZosImage(imageTag="A")
* public IZosImage zosImageA;
* {@literal @}ZosLibertyAngel(imageTag="A", name="ANGELA")
- * public IZosLibertyAngel zosLibertyAngel;
 + * public IZosLibertyAngel zosLibertyAngel;
+ * * * @galasa.extra * The IZosLibertyAngel interface has a number of methods to manage a zOS Liberty Angel @@ -36,12 +38,12 @@ public @interface ZosLibertyAngel { /** - * The imageTag is used to identify the zOS image + * @return The imageTag is used to identify the zOS image */ String imageTag() default "primary"; /** - * The Liberty Named Angel name. If null, a name will be generated + * @return The Liberty Named Angel name. If null, a name will be generated */ String name() default ""; } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmf.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmf.java index c8129974d..f4597db56 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmf.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmf.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zosmf; @@ -22,14 +20,7 @@ public interface IZosmf { /** - * Enumeration of zOSMF request types: - *
  • {@link #POST}
    • - *
  • {@link #POST_JSON}
    • - *
  • {@link #GET}
    • - *
  • {@link #PUT}
    • - *
  • {@link #PUT_TEXT}
    • - *
  • {@link #PUT_JSON}
    • - *
  • {@link #DELETE}
    • + * Enumeration of zOSMF request types */ public enum ZosmfRequestType { /** @@ -67,15 +58,7 @@ public enum ZosmfRequestType { } /** - * Enumeration of zOSMF Custom HTTP headers: - *
  • {@link #X_IBM_ATTRIBUTES}
    • - *
  • {@link #X_IBM_DATA_TYPE}
    • - *
  • {@link #X_IBM_JOB_MODIFY_VERSION}
    • - *
  • {@link #X_IBM_LSTAT}
    • - *
  • {@link #X_IBM_MAX_ITEMS}
    • - *
  • {@link #X_IBM_OPTION}
    • - *
  • {@link #X_IBM_REQUESTED_METHOD}
    • - * + * Enumeration of zOSMF Custom HTTP headers */ public enum ZosmfCustomHeaders { /** diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/Zosmf.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/Zosmf.java index 56111c8d5..1c66bb856 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/Zosmf.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/Zosmf.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zosmf; @@ -23,14 +21,18 @@ * The test can request multiple z/OSMF instances, with the default being associated with the primary zOS image. * * @galasa.examples + * * {@literal @}ZosImage(imageTag="A")
    * public IZosImage zosImageA;
    * {@literal @}Zosmf(imageTag="A")
    - * public IZosmf zosmfA;
     + * public IZosmf zosmfA;
    + * * * @galasa.extra * The IZosmf interface has a number of methods to issue requests to the zOSMF REST API. - * See {@link Zosmf} and {@link IZosmf} to find out more. + * + * @see Zosmf + * @see IZosmf * */ @Retention(RetentionPolicy.RUNTIME) @@ -40,7 +42,7 @@ public @interface Zosmf { /** - * The tag of the zOS Image this variable is to be populated with + * @return The tag of the zOS Image with which this variable will to be populated */ String imageTag() default "PRIMARY"; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgram.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgram.java index d9225bb3a..9f3ad6f85 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgram.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgram.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zosprogram; @@ -23,14 +21,18 @@ * The test can request multiple z/OS Program instances * * @galasa.examples + * * {@literal @}ZosImage(imageTag="A")
    * public IZosImage zosImageA;
    * {@literal @}ZosProgram(imageTag="A")
    - * public IZosProgram zosProgramA;
     + * public IZosProgram zosProgramA;
    + * * * @galasa.extra * The IZosProgram interface has a number of methods to manage the zOS Program. - * See {@link ZosProgram} and {@link IZosProgram} to find out more. + * + * @see ZosProgram + * @see IZosProgram * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapi.java index e34c4ffa6..ce7b47342 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapi.java @@ -20,15 +20,7 @@ public interface IRseapi { /** - * Enumeration of RSE API request types: - *
      - *
    • {@link #GET}
      • - *
    • {@link #PUT_TEXT}
      • - *
    • {@link #PUT_JSON}
      • - *
    • {@link #POST}
      • - *
    • {@link #POST_JSON}
      • - *
    • {@link #DELETE}
      • - *
    + * Enumeration of RSE API request types */ public enum RseapiRequestType { /** diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/Rseapi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/Rseapi.java index caeac7ebf..ad0b180aa 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/Rseapi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/Rseapi.java @@ -21,15 +21,18 @@ * The test can request multiple RSE API instances, with the default being associated with the primary zOS image. * * @galasa.examples + * * {@literal @}ZosImage(imageTag="A")
    * public IZosImage zosImageA;
    * {@literal @}Rseapi(imageTag="A")
    - * public IRseapi rseapiA;
     + * public IRseapi rseapiA;
    + * * * @galasa.extra * The IRseapi interface has a number of methods to issue requests to the RSE API REST API. - * See {@link Rseapi} and {@link IRseapi} to find out more. * + * @see Rseapi + * @see IRseapi */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.FIELD }) From 6b505523bc8b7ce9cf0be2b4cf6fdbc048d9f894 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Wed, 23 Nov 2022 10:45:30 +0000 Subject: [PATCH 031/263] copyright fix Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../src/main/java/dev/galasa/cicsts/ICeci.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeci.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeci.java index 765948ef0..8d65e6298 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeci.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeci.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.cicsts; From cda6f0444ebe706fa415fa1f89e237888d8b7ff6 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Wed, 23 Nov 2022 12:14:07 +0000 Subject: [PATCH 032/263] empty commit to cause a pr build to happen Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> From 11868b86187645b99629e9326872c172d363fff3 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Wed, 23 Nov 2022 13:28:31 +0000 Subject: [PATCH 033/263] Improvements suggested in PR review. Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../java/dev/galasa/cicsts/cicsresource/ICicsResource.java | 5 ++++- .../java/dev/galasa/cicsts/cicsresource/IJvmserverLog.java | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsResource.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsResource.java index a41669082..95f805026 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsResource.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsResource.java @@ -16,8 +16,11 @@ public interface ICicsResource { /** - * Create a CICS BUNDLE resource object supplying the CICS bundle content. The source bundle should have the same file structure as it exists + * Create a CICS BUNDLE resource object supplying the CICS bundle content. + * + * The source bundle should have the same file structure as it exists * on the zOS UNIX file system and will be transferred to the host in binary mode. + * * @param cicsTerminal a ICicsTerminal object for CEDA and CEMT transactions * @param testClass a class in the same bundle containing the application archive file, use this.getClass() * @param name the CICS BUNDLE RDO name diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserverLog.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserverLog.java index 3e6c1c2c9..b45313655 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserverLog.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserverLog.java @@ -87,6 +87,7 @@ public interface IJvmserverLog { /** * Searches contents of log for specified search text + * * @param searchText the text to search * @return true if text found * @throws CicsJvmserverResourceException @@ -95,6 +96,7 @@ public interface IJvmserverLog { /** * Searches contents of log for specified search or fail String + * * @param searchText the text to search * @return true if text found * @throws CicsJvmserverResourceException @@ -111,6 +113,7 @@ public interface IJvmserverLog { /** * Searches contents of log for specified search or fail String since the last checkpoint + * * @param searchText the text to search * @return the string found or null * @throws CicsJvmserverResourceException @@ -119,6 +122,7 @@ public interface IJvmserverLog { /** * Searches contents of log for specified search Pattern + * * @param searchPattern the Pattern to search * @return the string found or null * @throws CicsJvmserverResourceException @@ -127,6 +131,7 @@ public interface IJvmserverLog { /** * Searches contents of log for specified search or fail Pattern + * * @param searchPattern the Pattern to search * @return the string found or null * @throws CicsJvmserverResourceException @@ -151,7 +156,7 @@ public interface IJvmserverLog { public String searchForPatternSinceCheckpoint(Pattern searchPattern, Pattern failPattern) throws CicsJvmserverResourceException; /** - * Wait for a search search String to appear in specified log. + * Wait for a search String to appear in specified log. * * Will check every 3 seconds until one of: *
      From a23539d20ef00c831c56fda2e9eaa69ec8db48d0 Mon Sep 17 00:00:00 2001 From: Will Yates Date: Fri, 25 Nov 2022 09:35:10 +0000 Subject: [PATCH 034/263] Iss1276 (#827) * remove the double spi package * remove the double spi package * remove the double spi package Signed-off-by: Will Yates Signed-off-by: Will Yates --- .../dev.galasa.cicsts.ceci.manager/bnd.bnd | 2 +- .../dev.galasa.cicsts.ceci.manager/build.gradle | 2 +- .../cicsts/ceci/internal/CeciManagerImpl.java | 6 ++---- .../dev/galasa/cicsts/ceci/spi/ICeciManagerSpi.java | 11 +++++++++++ .../cicsts/ceci/spi/{spi => }/codesnippet_01.md | 0 .../dev/galasa/cicsts/ceci/spi/package-info.java | 7 +++++++ .../galasa/cicsts/ceci/spi/spi/ICeciManagerSpi.java | 13 ------------- .../galasa/cicsts/ceci/spi/spi/package-info.java | 4 ---- .../dev.galasa.cicsts.cemt.manager/bnd.bnd | 2 +- .../dev.galasa.cicsts.cemt.manager/build.gradle | 2 +- .../cicsts/cemt/internal/CemtManagerImpl.java | 6 ++---- .../dev/galasa/cicsts/cemt/spi/ICemtManagerSpi.java | 10 ++++++++++ .../dev/galasa/cicsts/cemt/spi/package-info.java | 4 ++++ .../galasa/cicsts/cemt/spi/spi/ICemtManagerSpi.java | 12 ------------ .../galasa/cicsts/cemt/spi/spi/package-info.java | 8 -------- release.yaml | 4 ++-- 16 files changed, 42 insertions(+), 51 deletions(-) create mode 100644 galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/ICeciManagerSpi.java rename galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/{spi => }/codesnippet_01.md (100%) create mode 100644 galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/package-info.java delete mode 100644 galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/spi/ICeciManagerSpi.java delete mode 100644 galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/spi/package-info.java create mode 100644 galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/ICemtManagerSpi.java create mode 100644 galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/package-info.java delete mode 100644 galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/spi/ICemtManagerSpi.java delete mode 100644 galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/spi/package-info.java diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/bnd.bnd index 3eeacfa2d..6cd1df397 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/bnd.bnd @@ -1,5 +1,5 @@ -snapshot: ${tstamp} Bundle-Name: Galasa CICS/TS CECI Manager -Export-Package: dev.galasa.cicsts.ceci.spi.spi +Export-Package: dev.galasa.cicsts.ceci.spi Import-Package: !javax.validation.constraints, \ * diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/build.gradle index d4ebce2de..6cdcdafc2 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa CICS/TS CECI Manager' -version = '0.21.0' +version = '0.25.0' dependencies { api project (':galasa-managers-cicsts-parent:dev.galasa.cicsts.manager') diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciManagerImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciManagerImpl.java index 2e8ef8655..da1fa9216 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciManagerImpl.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019, 2021. + * Copyright contributors to the Galasa project */ package dev.galasa.cicsts.ceci.internal; @@ -18,7 +16,7 @@ import dev.galasa.cicsts.ICeci; import dev.galasa.cicsts.ICicsRegion; import dev.galasa.cicsts.ceci.internal.properties.CeciPropertiesSingleton; -import dev.galasa.cicsts.ceci.spi.spi.ICeciManagerSpi; +import dev.galasa.cicsts.ceci.spi.ICeciManagerSpi; import dev.galasa.cicsts.spi.ICeciProvider; import dev.galasa.cicsts.spi.ICicstsManagerSpi; import dev.galasa.framework.spi.AbstractManager; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/ICeciManagerSpi.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/ICeciManagerSpi.java new file mode 100644 index 000000000..bb64ed6e9 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/ICeciManagerSpi.java @@ -0,0 +1,11 @@ +/* + * Copyright contributors to the Galasa project + */ +package dev.galasa.cicsts.ceci.spi; + +/** + * Provides the SPI access to the CICS/TS CECI Manager + */ +public interface ICeciManagerSpi { + +} diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/spi/codesnippet_01.md b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/codesnippet_01.md similarity index 100% rename from galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/spi/codesnippet_01.md rename to galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/codesnippet_01.md diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/package-info.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/package-info.java new file mode 100644 index 000000000..97dade872 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/package-info.java @@ -0,0 +1,7 @@ +/* + * Copyright contributors to the Galasa project + */ +/** + * zOSMF Batch Manager - Internal SPI + */ +package dev.galasa.cicsts.ceci.spi; \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/spi/ICeciManagerSpi.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/spi/ICeciManagerSpi.java deleted file mode 100644 index e1c33603a..000000000 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/spi/ICeciManagerSpi.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ -package dev.galasa.cicsts.ceci.spi.spi; - -/** - * Provides the SPI access to the CICS/TS CECI Manager - */ -public interface ICeciManagerSpi { - -} diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/spi/package-info.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/spi/package-info.java deleted file mode 100644 index aa574b9c5..000000000 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/spi/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * zOSMF Batch Manager - Internal SPI - */ -package dev.galasa.cicsts.ceci.spi.spi; \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/bnd.bnd index a56a758fa..6f5e6af99 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/bnd.bnd @@ -1,5 +1,5 @@ -snapshot: ${tstamp} Bundle-Name: Galasa CICS/TS CEMT Manager -Export-Package: dev.galasa.cicsts.cemt.spi.spi +Export-Package: dev.galasa.cicsts.cemt.spi Import-Package: !javax.validation.constraints, \ * diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/build.gradle index f8390a2a5..a667d177c 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa CICS/TS CEMT Manager' -version = '0.21.0' +version = '0.25.0' dependencies { api project (':galasa-managers-cicsts-parent:dev.galasa.cicsts.manager') diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/internal/CemtManagerImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/internal/CemtManagerImpl.java index e8fa6b526..95742fcca 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/internal/CemtManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/internal/CemtManagerImpl.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. + * Copyright contributors to the Galasa project */ package dev.galasa.cicsts.cemt.internal; @@ -25,7 +23,7 @@ import dev.galasa.cicsts.ICemt; import dev.galasa.cicsts.ICicsRegion; import dev.galasa.cicsts.cemt.internal.properties.CemtPropertiesSingleton; -import dev.galasa.cicsts.cemt.spi.spi.ICemtManagerSpi; +import dev.galasa.cicsts.cemt.spi.ICemtManagerSpi; import dev.galasa.cicsts.spi.ICemtProvider; import dev.galasa.cicsts.spi.ICicstsManagerSpi; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/ICemtManagerSpi.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/ICemtManagerSpi.java new file mode 100644 index 000000000..270131cad --- /dev/null +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/ICemtManagerSpi.java @@ -0,0 +1,10 @@ +/* + * Copyright contributors to the Galasa project + */ + +package dev.galasa.cicsts.cemt.spi; + + +public interface ICemtManagerSpi { + +} diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/package-info.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/package-info.java new file mode 100644 index 000000000..73c2b5a1d --- /dev/null +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/package-info.java @@ -0,0 +1,4 @@ +/* + * Copyright contributors to the Galasa project + */ +package dev.galasa.cicsts.cemt.spi; \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/spi/ICemtManagerSpi.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/spi/ICemtManagerSpi.java deleted file mode 100644 index e4adcd1a8..000000000 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/spi/ICemtManagerSpi.java +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ - -package dev.galasa.cicsts.cemt.spi.spi; - - -public interface ICemtManagerSpi { - -} diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/spi/package-info.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/spi/package-info.java deleted file mode 100644 index 6a5f44b85..000000000 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/spi/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ - - -package dev.galasa.cicsts.cemt.spi.spi; \ No newline at end of file diff --git a/release.yaml b/release.yaml index 143e134e6..34d0f10c1 100644 --- a/release.yaml +++ b/release.yaml @@ -45,7 +45,7 @@ managers: isolated: true - artifact: dev.galasa.cicsts.ceci.manager - version: 0.21.0 + version: 0.25.0 obr: true mvp: true javadoc: true @@ -76,7 +76,7 @@ managers: isolated: true - artifact: dev.galasa.cicsts.cemt.manager - version: 0.21.0 + version: 0.25.0 obr: true mvp: true javadoc: true From 5403b4e667470f6cfaf1fca58e964b094c0a9b74 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Mon, 28 Nov 2022 16:41:54 +0000 Subject: [PATCH 035/263] Update io.kubernetes:client-java to 16.0.2 (#823) * Update io.kubernetes:client-java to 16.0.2 Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> * Empty commit to trigger build Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../dev.galasa.kubernetes.manager/bnd.bnd | 16 ++++++++-------- .../dev.galasa.kubernetes.manager/build.gradle | 2 +- .../internal/KubernetesNamespaceImpl.java | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd index f0be6d10c..09d7f1e2c 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd @@ -27,9 +27,9 @@ Embed-Dependency: *;scope=compile -includeresource: bcpkix-jdk15on-1.69.jar; lib:=true,\ bcprov-ext-jdk15on-1.69.jar; lib:=true,\ bcprov-jdk15on-1.69.jar; lib:=true,\ - client-java-14.0.0.jar; lib:=true,\ - client-java-api-14.0.0.jar; lib:=true,\ - client-java-proto-14.0.0.jar; lib:=true,\ + client-java-16.0.2.jar; lib:=true,\ + client-java-api-16.0.2.jar; lib:=true,\ + client-java-proto-16.0.2.jar; lib:=true,\ commons-codec-1.15.jar; lib:=true,\ commons-collections4-4.4.jar; lib:=true,\ commons-lang3-3.1.jar; lib:=true,\ @@ -42,11 +42,11 @@ Embed-Dependency: *;scope=compile jsr305-3.0.2.jar; lib:=true,\ kotlin-stdlib-1.4.10.jar; lib:=true,\ kotlin-stdlib-common-1.4.10.jar; lib:=true,\ - logging-interceptor-4.9.1.jar; lib:=true,\ - okhttp-4.9.1.jar; lib:=true,\ + logging-interceptor-4.9.2.jar; lib:=true,\ + okhttp-4.9.2.jar; lib:=true,\ okio-jvm-2.8.0.jar; lib:=true,\ - protobuf-java-3.19.1.jar; lib:=true,\ - slf4j-api-1.7.32.jar; lib:=true,\ + protobuf-java-3.21.2.jar; lib:=true,\ + slf4j-api-1.7.36.jar; lib:=true,\ snakeyaml-1.29.jar; lib:=true,\ - swagger-annotations-1.6.3.jar; lib:=true + swagger-annotations-1.6.6.jar; lib:=true -fixupmessages "Classes found in the wrong directory"; restrict:=error; is:=warning diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle index 7a48e6de7..1225fdfca 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle @@ -55,6 +55,6 @@ dependencies { strictly '1.21' } } - implementation 'io.kubernetes:client-java:14.0.0' + implementation 'io.kubernetes:client-java:16.0.2' implementation 'commons-io:commons-io:2.9.0' } diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesNamespaceImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesNamespaceImpl.java index 99894fb2f..e20e5ddb2 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesNamespaceImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesNamespaceImpl.java @@ -140,7 +140,7 @@ public void initialiseNamespace() throws KubernetesManagerException { addRunLabel(metadata); try { - api.createNamespacedConfigMap(this.namespaceId, configMap, null, null, null); + api.createNamespacedConfigMap(this.namespaceId, configMap, null, null, null, null); } catch(ApiException e) { if (e.getCode() == 409) { throw new KubernetesManagerException("The allocated namespace " + this.namespaceId + " on cluster " + this.cluster.getId() + " is dirty, the configmap galasa still exists", e); @@ -422,7 +422,7 @@ public IResource createResource(@NotNull String yaml) throws KubernetesManagerEx spec.setStorageClassName(storageClass); } - V1PersistentVolumeClaim actualPvc = api.createNamespacedPersistentVolumeClaim(this.namespaceId, persistentVolumeClaim, null, null, null); + V1PersistentVolumeClaim actualPvc = api.createNamespacedPersistentVolumeClaim(this.namespaceId, persistentVolumeClaim, null, null, null, null); logger.debug("PersistentVolumeClaim " + actualPvc.getMetadata().getName() + " created in namespace " + this.namespaceId + " on cluster " + this.cluster.getId()); @@ -443,7 +443,7 @@ private void addRunLabel(V1ObjectMeta metadata) { addRunLabel(configMap.getMetadata()); CoreV1Api api = new CoreV1Api(cluster.getApi()); - V1ConfigMap actualConfig = api.createNamespacedConfigMap(namespaceId, configMap, null, null, null); + V1ConfigMap actualConfig = api.createNamespacedConfigMap(namespaceId, configMap, null, null, null, null); logger.debug("ConfigMap " + actualConfig.getMetadata().getName() + " created in namespace " + this.namespaceId + " on cluster " + this.cluster.getId()); @@ -458,7 +458,7 @@ private void addRunLabel(V1ObjectMeta metadata) { addRunLabel(secret.getMetadata()); CoreV1Api api = new CoreV1Api(cluster.getApi()); - V1Secret actualSecret = api.createNamespacedSecret(namespaceId, secret, null, null, null); + V1Secret actualSecret = api.createNamespacedSecret(namespaceId, secret, null, null, null, null); logger.debug("Secret " + actualSecret.getMetadata().getName() + " created in namespace " + this.namespaceId + " on cluster " + this.cluster.getId()); @@ -472,7 +472,7 @@ private void addRunLabel(V1ObjectMeta metadata) { addRunLabel(service.getMetadata()); CoreV1Api api = new CoreV1Api(cluster.getApi()); - V1Service actualService = api.createNamespacedService(namespaceId, service, null, null, null); + V1Service actualService = api.createNamespacedService(namespaceId, service, null, null, null, null); logger.debug("Service " + actualService.getMetadata().getName() + " created in namespace " + this.namespaceId + " on cluster " + this.cluster.getId()); @@ -495,7 +495,7 @@ private void addRunLabel(V1ObjectMeta metadata) { AppsV1Api api = new AppsV1Api(cluster.getApi()); - V1Deployment actualDeployment = api.createNamespacedDeployment(namespaceId, deployment, null, null, null); + V1Deployment actualDeployment = api.createNamespacedDeployment(namespaceId, deployment, null, null, null, null); logger.debug("Deployment " + actualDeployment.getMetadata().getName() + " created in namespace " + this.namespaceId + " on cluster " + this.cluster.getId()); @@ -550,7 +550,7 @@ private void addRunLabel(V1ObjectMeta metadata) { - V1StatefulSet actualStatefulSet = api.createNamespacedStatefulSet(namespaceId, statefulSet, null, null, null); + V1StatefulSet actualStatefulSet = api.createNamespacedStatefulSet(namespaceId, statefulSet, null, null, null, null); logger.debug("StatefulSet " + actualStatefulSet.getMetadata().getName() + " created in namespace " + this.namespaceId + " on cluster " + this.cluster.getId()); From accc241a9808c028aa50325ce18dec201e5a3d0f Mon Sep 17 00:00:00 2001 From: Will Yates Date: Mon, 28 Nov 2022 16:56:18 +0000 Subject: [PATCH 036/263] Iss1281 (#829) * remove the double spi package * remove the double spi package * remove the double spi package Signed-off-by: Will Yates * Make the SSH Client disconnect message a little easier to understand - plus cleanup of javadoc Signed-off-by: Will Yates * review comments Signed-off-by: Will Yates Signed-off-by: Will Yates --- .../dev.galasa.ipnetwork.manager/build.gradle | 2 +- .../dev/galasa/ipnetwork/spi/SSHClient.java | 70 ++++++++----------- release.yaml | 2 +- 3 files changed, 32 insertions(+), 42 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/build.gradle index 361cadb36..42f0ffafc 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'IP Network Manager' -version = '0.21.0' +version = '0.25.0' dependencies { implementation 'dev.galasa:com.jcraft.jsch:0.1.55' diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/SSHClient.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/SSHClient.java index da9c51001..d74d490ba 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/SSHClient.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/SSHClient.java @@ -68,11 +68,11 @@ public class SSHClient implements ICommandShell { // Default value: Linux command private String changePromptCommand = "PS1=" + specialPrompt; - public SSHClient(String hostname, int port, ICredentials credentials, long defaultTimeout) throws SSHException { + public SSHClient(String hostname, int port, ICredentials credentials, long defaultTimeoutInMillis) throws SSHException { this.hostname = hostname; this.port = port; - this.defaultTimeout = defaultTimeout; + this.defaultTimeout = defaultTimeoutInMillis; this.sshClient = new JSch(); this.session = null; @@ -99,8 +99,7 @@ public SSHClient(String hostname, int port, ICredentials credentials, long defau } /** - * Issue a command using SSH. Equivalent to {@link #issueCommand(String, false, - * defaultTimeout)} + * Issue a command using SSH. Equivalent to {@link #issueCommand(String, boolean, long)} * * @param command - command to issue * @return the output of the command (stdout and stderr) @@ -113,23 +112,23 @@ public String issueCommand(String command) throws SSHException { } /** - * Issue a command using SSH. Equivalent to {@link #issueCommand(String, false, + * Issue a command using SSH. Equivalent to {@link #issueCommand(String, boolean, * long)} * * @param command - command to issue - * @param timeout - time (in milliseconds) to wait with no new output appearing + * @param timeoutInMillis - time (in milliseconds) to wait with no new output appearing * before timing out * @return the output of the command (stdout and stderr) * @throws SSHException */ @Override - public String issueCommand(String command, long timeout) throws SSHException { - return issueCommand(command, false, timeout); + public String issueCommand(String command, long timeoutInMillis) throws SSHException { + return issueCommand(command, false, timeoutInMillis); } /** * Issue a command using SSH. Equivalent to - * {@link #issueCommand(String, boolean, defaultTimeout)} + * {@link #issueCommand(String, boolean, long)} * * @param command - command to issue * @param newShell - if true will start a new @@ -146,13 +145,13 @@ public String issueCommand(String command, boolean newShell) throws SSHException * * @param command - command to issue * @param newShell - if true will start a new - * @param timeout - time (in milliseconds) to wait with no new output appearing + * @param timeoutInMillis - time (in milliseconds) to wait with no new output appearing * before timing out * @return the output of the command (stdout and stderr) * @throws SSHException */ @Override - public synchronized String issueCommand(String command, boolean newShell, long timeout) throws SSHException { + public synchronized String issueCommand(String command, boolean newShell, long timeoutInMillis) throws SSHException { // Connect if we are not already connected connect(); @@ -167,7 +166,7 @@ public synchronized String issueCommand(String command, boolean newShell, long t // Issue the desired command and retrieve the response to a // string - String response = retrieveOutput(command, timeout); + String response = retrieveOutput(command, timeoutInMillis); if (logShellResults) { logger.trace("Received '" + response); @@ -201,12 +200,11 @@ public void setChangePromptCommand(String command) { /** * Issue a command using SSH shell. Equivalent to - * {@link #issueCommandToShell(String, false, defaultTimeout)} + * {@link #issueCommandToShell(String, boolean, long)} * * @param command - command to issue * @return the output of the command * @throws SSHException - * @throws JSchException */ @Override public String issueCommandToShell(String command) throws SSHException { @@ -216,29 +214,27 @@ public String issueCommandToShell(String command) throws SSHException { /** * Issue a command using SSH shell. Equivalent to - * {@link #issueCommandToShell(String, false, long)} + * {@link #issueCommandToShell(String, boolean, long)} * * @param command - command to issue - * @param timeout - time (in milliseconds) to wait with no new output appearing + * @param timeoutInMillis - time (in milliseconds) to wait with no new output appearing * before timing out * @return the output of the command * @throws SSHException - * @throws JSchException */ @Override - public String issueCommandToShell(String command, long timeout) throws SSHException { - return issueCommandToShell(command, false, timeout); + public String issueCommandToShell(String command, long timeoutInMillis) throws SSHException { + return issueCommandToShell(command, false, timeoutInMillis); } /** * Issue a command using SSH shell. Equivalent to - * {@link #issueCommandToShell(String, boolean, defaultTimeout)} + * {@link #issueCommandToShell(String, boolean, long)} * * @param command - command to issue * @param newShell - if true will start a new * @return the output of the command * @throws SSHException - * @throws JSchException */ @Override public String issueCommandToShell(String command, boolean newShell) throws SSHException { @@ -250,14 +246,13 @@ public String issueCommandToShell(String command, boolean newShell) throws SSHEx * * @param command - command to issue * @param newShell - if true will start a new - * @param timeout - time (in milliseconds) to wait with no new output appearing + * @param timeoutInMillis - time (in milliseconds) to wait with no new output appearing * before timing out * @return the output of the command * @throws SSHException - * @throws JSchException */ @Override - public synchronized String issueCommandToShell(String command, boolean newShell, long timeout) throws SSHException { + public synchronized String issueCommandToShell(String command, boolean newShell, long timeoutInMillis) throws SSHException { connect(); @@ -279,12 +274,12 @@ public synchronized String issueCommandToShell(String command, boolean newShell, lastCommandTimestamp = System.currentTimeMillis(); // Set a special prompt so we can easily identify responses to our commands logger.trace("Setting special prompt '" + specialPrompt + "'"); - retrieveOutputFromShell(channel, changePromptCommand, timeout); + retrieveOutputFromShell(channel, changePromptCommand, timeoutInMillis); Thread.sleep(500); // NOSONAR - Sleep is sufficent // Issue the desired command and retrieve the response to a string lastCommandTimestamp = System.currentTimeMillis(); - String response = retrieveOutputFromShell(channel, command, timeout); + String response = retrieveOutputFromShell(channel, command, timeoutInMillis); lastCommandTimestamp = System.currentTimeMillis(); return response; @@ -406,17 +401,16 @@ public synchronized void disconnect() throws SSHException { * Retrieve all output from the shell, returning only that which is found * between the command issued and the next occurrence of the special prompt we * defined in {@link #issueCommand(String)} - * - * @param session + * * @param command - * @param timeout + * @param timeoutInMillis * @return * @throws IOException * @throws InterruptedException * @throws ExecutionException * @throws SSHException */ - private String retrieveOutput(String command, long timeout) + private String retrieveOutput(String command, long timeoutInMillis) throws IOException, InterruptedException, ExecutionException, SSHException { StringBuilder sb = new StringBuilder(); @@ -432,7 +426,7 @@ private String retrieveOutput(String command, long timeout) InputStream err = channel.getErrStream(); channel.connect(); - long whenTimeout = Calendar.getInstance().getTimeInMillis() + timeout; + long whenTimeout = Calendar.getInstance().getTimeInMillis() + timeoutInMillis; byte[] tmp = new byte[1024]; while (true) { @@ -498,14 +492,14 @@ private byte[] removeAnsiEscapeCodes(byte[] bytes) throws IOException { * * @param channel * @param command - * @param timeout + * @param timeoutInMillis * @return * @throws IOException * @throws InterruptedException * @throws ExecutionException * @throws SSHException */ - private String retrieveOutputFromShell(Channel channel, String command, long timeout) + private String retrieveOutputFromShell(Channel channel, String command, long timeoutInMillis) throws IOException, InterruptedException, ExecutionException, SSHException { // Get the input stream from the current session @@ -537,7 +531,7 @@ private String retrieveOutputFromShell(Channel channel, String command, long tim // Create an executor and a callable which will allow us to read continuously // from - // the input stream with a timeout + // the input stream with a timeoutInMillis ExecutorService executor = Executors.newFixedThreadPool(2); Callable reader = new Callable() { @@ -557,7 +551,7 @@ public Integer call() throws Exception { Future future = executor.submit(reader); int read = 0; try { - read = future.get(timeout, TimeUnit.MILLISECONDS); + read = future.get(timeoutInMillis, TimeUnit.MILLISECONDS); } catch (TimeoutException e) { executor.shutdown(); throw new SSHException("Timed out waiting for response from ssh. Response so far: " + responseBuilder); @@ -598,8 +592,6 @@ public KeepAliveThread(Session session) { // } // // } - - return; } @Override @@ -613,7 +605,7 @@ public void run() { long timeout = System.currentTimeMillis() - idleTimeout; if (timeout >= lastCommandTimestamp) { - logger.debug("No command issued after " + idleTimeout + " milliseconds, closing SSH session"); + logger.debug("SSH Client unused after " + idleTimeout + " milliseconds, freeing session"); this.monitorSession.disconnect(); } } @@ -624,8 +616,6 @@ public void run() { return; } } - - return; } } diff --git a/release.yaml b/release.yaml index 34d0f10c1..2f72efc09 100644 --- a/release.yaml +++ b/release.yaml @@ -199,7 +199,7 @@ managers: isolated: true - artifact: dev.galasa.ipnetwork.manager - version: 0.21.0 + version: 0.25.0 obr: true javadoc: true bom: true From 6c608a999be0cf60fc16bf6e6a2217e448401283 Mon Sep 17 00:00:00 2001 From: Will Yates Date: Mon, 28 Nov 2022 18:02:42 +0000 Subject: [PATCH 037/263] Ceci unit test (#830) --- .../cicsts/ceci/internal/TestCeciImpl.java | 3102 ++++++++--------- 1 file changed, 1540 insertions(+), 1562 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestCeciImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestCeciImpl.java index c910bb2b4..c2303eb60 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestCeciImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestCeciImpl.java @@ -3,1567 +3,1545 @@ */ package dev.galasa.cicsts.ceci.internal; -//import java.util.Arrays; -//import java.util.HashMap; -//import java.util.LinkedHashMap; -// -//import org.junit.Assert; -//import org.junit.Before; -//import org.junit.Test; -//import org.junit.runner.RunWith; -//import org.mockito.Mock; -//import org.mockito.Mockito; -//import org.powermock.api.mockito.PowerMockito; -//import org.powermock.modules.junit4.PowerMockRunner; -//import org.powermock.reflect.Whitebox; -// -//import dev.galasa.cicsts.CeciException; -//import dev.galasa.cicsts.CicstsManagerException; -//import dev.galasa.cicsts.ICeciResponse; -//import dev.galasa.cicsts.ICicsRegion; -//import dev.galasa.cicsts.ICicsTerminal; -//import dev.galasa.zos3270.FieldNotFoundException; -//import dev.galasa.zos3270.KeyboardLockedException; -//import dev.galasa.zos3270.TerminalInterruptedException; -//import dev.galasa.zos3270.TimeoutException; -//import dev.galasa.zos3270.spi.NetworkException; - -//@RunWith(PowerMockRunner.class) +import java.lang.reflect.Field; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedHashMap; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.Mockito; + +import dev.galasa.cicsts.CeciException; +import dev.galasa.cicsts.CicstsManagerException; +import dev.galasa.cicsts.ICeciResponse; +import dev.galasa.cicsts.ICicsRegion; +import dev.galasa.cicsts.ICicsTerminal; +import dev.galasa.zos3270.FieldNotFoundException; +import dev.galasa.zos3270.KeyboardLockedException; +import dev.galasa.zos3270.TerminalInterruptedException; +import dev.galasa.zos3270.TimeoutException; +import dev.galasa.zos3270.spi.NetworkException; +import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.verification.VerificationMode; + +@RunWith(MockitoJUnitRunner.class) public class TestCeciImpl { - - -// private CeciImpl ceci; -// -// private CeciImpl ceciSpy; -// -// // Static fields in CeciImpl -// private static final String INITIAL_SCREEN_ID = "STATUS: ENTER ONE OF THE FOLLOWING"; -// private static final String VAR_SCREEN_ID = "VARIABLES LENGTH DATA"; -// private static final String COMMAND_EXECUTION_COMPLETE = "STATUS: COMMAND EXECUTION COMPLETE"; -// private static final String MESSAGE_DFHAC2206 = "DFHAC2206"; -// private static final String NO_SYNTAX_MESSAGES = "THERE ARE NO MESSAGES"; -// private static final String WRONG_CICS_REGION = "Provided terminal does not belong to the correct CICS TS Region"; -// -// private static final String COMMAND_VALUE = "COMMAND"; -// private static final String TEXT_VARIABLE_NAME = "&VARIABLE"; -// private static final String TEXT_VARIABLE_VALUE = "VARIABLE"; -// private static final String PROGRAM_NAME = "MYPROG"; -// private static final String CHANNEL_NAME = "CHANNEL"; -// private static final String CONTAINER_NAME = "CONTAINER"; -// private static final String SPACES = " "; -// -// @Mock -// private ICicsTerminal ceciTerminalMock; -// -// @Mock -// private ICicsTerminal wrongCeciTerminalMock; -// -// @Mock -// private ICicsRegion cicsRegionMock; -// -// @Mock -// private ICicsRegion wrongCicsRegionMock; -// -// @Mock -// private ICeciResponse ceciResponseMock; -// -// @Before -// public void setup() throws FieldNotFoundException, KeyboardLockedException, NetworkException, TerminalInterruptedException, TimeoutException { -// ceci = new CeciImpl(null, cicsRegionMock); -// ceciSpy = Mockito.spy(ceci); -// -// // Mock all terminal function -// Mockito.when(ceciTerminalMock.type(Mockito.any())).thenReturn(ceciTerminalMock); -// Mockito.when(ceciTerminalMock.enter()).thenReturn(ceciTerminalMock); -// Mockito.when(ceciTerminalMock.pf2()).thenReturn(ceciTerminalMock); -// Mockito.when(ceciTerminalMock.pf3()).thenReturn(ceciTerminalMock); -// Mockito.when(ceciTerminalMock.pf4()).thenReturn(ceciTerminalMock); -// Mockito.when(ceciTerminalMock.pf5()).thenReturn(ceciTerminalMock); -// Mockito.when(ceciTerminalMock.pf9()).thenReturn(ceciTerminalMock); -// Mockito.when(ceciTerminalMock.pf10()).thenReturn(ceciTerminalMock); -// Mockito.when(ceciTerminalMock.pf11()).thenReturn(ceciTerminalMock); -// Mockito.when(ceciTerminalMock.tab()).thenReturn(ceciTerminalMock); -// Mockito.when(ceciTerminalMock.home()).thenReturn(ceciTerminalMock); -// Mockito.when(ceciTerminalMock.newLine()).thenReturn(ceciTerminalMock); -// Mockito.when(ceciTerminalMock.cursorLeft()).thenReturn(ceciTerminalMock); -// Mockito.when(ceciTerminalMock.eraseEof()).thenReturn(ceciTerminalMock); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenReturn(ceciTerminalMock); -// Mockito.when(ceciTerminalMock.reportScreenWithCursor()).thenReturn(ceciTerminalMock); -// Mockito.when(ceciTerminalMock.getCicsRegion()).thenReturn(cicsRegionMock); -// Mockito.when(wrongCeciTerminalMock.getCicsRegion()).thenReturn(wrongCicsRegionMock); -// } -// -// @Test -// public void teststartCECISession() throws Exception { -// setupTestIssueCommand(); -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(INITIAL_SCREEN_ID); -// Mockito.when(ceciTerminalMock.isClearScreen()).thenReturn(true); -// ceciSpy.startCECISession(ceciTerminalMock); -// -// Mockito.when(ceciTerminalMock.isClearScreen()).thenReturn(false); -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn("NOT_INITIAL_SCREEN_ID"); -// String expectedMessage = "Not on CECI initial screen"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.startCECISession(ceciTerminalMock); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// -// Mockito.when(ceciTerminalMock.resetAndClear()).thenThrow(new CicstsManagerException()); -// expectedMessage = "Problem starting CECI session"; -// expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.startCECISession(ceciTerminalMock); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// -// expectedMessage = WRONG_CICS_REGION; -// expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.startCECISession(wrongCeciTerminalMock); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testIssueCommand() throws Exception { -// setupTestIssueCommand(); -// -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(COMMAND_EXECUTION_COMPLETE); -// Assert.assertEquals("Error in issueCommand() method", ceciResponseMock, ceciSpy.issueCommand(ceciTerminalMock, COMMAND_VALUE)); -// -// PowerMockito.doReturn(COMMAND_VALUE).when(ceciSpy, "retrieveVariableText", Mockito.any(), Mockito.any()); -// Assert.assertEquals("Error in issueCommand() method", ceciResponseMock, ceciSpy.issueCommand(ceciTerminalMock, TEXT_VARIABLE_NAME)); -// -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn("USER SCREEN").thenReturn("USER SCREEN").thenReturn(COMMAND_EXECUTION_COMPLETE); -// Assert.assertEquals("Error in issueCommand() method", ceciResponseMock, ceciSpy.issueCommand(ceciTerminalMock, COMMAND_VALUE)); -// -// Assert.assertEquals("Error in issueCommand() method", ceciResponseMock, ceciSpy.issueCommand(ceciTerminalMock, COMMAND_VALUE, null)); -// -// HashMap options = new HashMap<>(); -// Assert.assertEquals("Error in issueCommand() method", ceciResponseMock, ceciSpy.issueCommand(ceciTerminalMock, COMMAND_VALUE, options)); -// -// options.put("KEY1", null); -// options.put("KEY2", ""); -// options.put("KEY3", "VALUE"); -// Assert.assertEquals("Error in issueCommand() method", ceciResponseMock, ceciSpy.issueCommand(ceciTerminalMock, COMMAND_VALUE, options)); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.issueCommand(wrongCeciTerminalMock, COMMAND_VALUE, true); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testIssueCommandException1() throws Exception { -// setupTestIssueCommand(); -// -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(MESSAGE_DFHAC2206); -// String expectedMessage = "Command abended - see previous screen"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.issueCommand(ceciTerminalMock, COMMAND_VALUE); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testIssueCommandException2() throws Exception { -// setupTestIssueCommand(); -// -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn("USER SCREEN").thenReturn("USER SCREEN").thenReturn("USER SCREEN"); -// String expectedMessage = "Command failed - see previous screen"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.issueCommand(ceciTerminalMock, COMMAND_VALUE); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// -// } -// -// @Test -// public void testIssueCommandException3() throws Exception { -// setupTestIssueCommand(); -// -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); -// String expectedMessage = "Error issuing CECI command"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.issueCommand(ceciTerminalMock, COMMAND_VALUE); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// -// } -// -// @Test -// public void testIssueCommandException4() throws Exception { -// setupTestIssueCommand(); -// -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); -// String expectedMessage = "Error issuing CECI command"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.issueCommand(ceciTerminalMock, COMMAND_VALUE); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// -// } -// -// private void setupTestIssueCommand() throws Exception { -// PowerMockito.doReturn(0).when(ceciSpy, "defineVariableText", Mockito.any(), Mockito.any(), Mockito.any()); -// PowerMockito.doReturn(true).when(ceciSpy, "isCeciScreen"); -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "initialScreen"); -// PowerMockito.doNothing().when(ceciSpy, "checkForSyntaxMessages"); -// PowerMockito.doReturn(ceciResponseMock).when(ceciSpy, "newCeciResponse", Mockito.anyBoolean()); -// } -// -// @Test -// public void testDefineVariableText() throws Exception { -// PowerMockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy, "validateVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// PowerMockito.doReturn(TEXT_VARIABLE_VALUE.length()).when(ceciSpy, "setVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// -// Assert.assertEquals("Error in defineVariableText() method", TEXT_VARIABLE_VALUE.length(), ceciSpy.defineVariableText(ceciTerminalMock, TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE)); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.defineVariableText(wrongCeciTerminalMock, TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testDefineVariableBinary() throws Exception { -// PowerMockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy, "validateVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// PowerMockito.doReturn(TEXT_VARIABLE_VALUE.length()).when(ceciSpy, "setVariableHex", Mockito.any(), Mockito.any()); -// Assert.assertEquals("Error in defineVariableBinary() method", TEXT_VARIABLE_VALUE.length(), ceciSpy.defineVariableBinary(ceciTerminalMock, TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.toCharArray())); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.defineVariableBinary(wrongCeciTerminalMock, TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.toCharArray()); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testDefineVariableDoubleWord() throws Exception { -// PowerMockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy, "validateVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// PowerMockito.doReturn(99).when(ceciSpy, "setVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// Assert.assertEquals("Error in defineVariableDoubleWord() method", 99, ceciSpy.defineVariableDoubleWord(ceciTerminalMock, TEXT_VARIABLE_NAME, 0)); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.defineVariableDoubleWord(wrongCeciTerminalMock, TEXT_VARIABLE_NAME, 0); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testDefineVariableFullWord() throws Exception { -// PowerMockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy, "validateVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// PowerMockito.doReturn(99).when(ceciSpy, "setVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// Assert.assertEquals("Error in defineVariableFullWord() method", 99, ceciSpy.defineVariableFullWord(ceciTerminalMock, TEXT_VARIABLE_NAME, 0)); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.defineVariableFullWord(wrongCeciTerminalMock, TEXT_VARIABLE_NAME, 0); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testDefineVariableHalfWord() throws Exception { -// PowerMockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy, "validateVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// PowerMockito.doReturn(99).when(ceciSpy, "setVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// Assert.assertEquals("Error in defineVariableHalfWord() method", 99, ceciSpy.defineVariableHalfWord(ceciTerminalMock, TEXT_VARIABLE_NAME, 0)); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.defineVariableHalfWord(wrongCeciTerminalMock, TEXT_VARIABLE_NAME, 0); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testDefineVariable4BytePacked() throws Exception { -// PowerMockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy, "validateVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// PowerMockito.doReturn(99).when(ceciSpy, "setVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// Assert.assertEquals("Error in defineVariablePacked() method", 99, ceciSpy.defineVariable4BytePacked(ceciTerminalMock, TEXT_VARIABLE_NAME, 0)); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.defineVariable4BytePacked(wrongCeciTerminalMock, TEXT_VARIABLE_NAME, 0); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testDefineVariable8BytePacked() throws Exception { -// PowerMockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy, "validateVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// PowerMockito.doReturn(99).when(ceciSpy, "setVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// Assert.assertEquals("Error in defineVariablePacked() method", 99, ceciSpy.defineVariable8BytePacked(ceciTerminalMock, TEXT_VARIABLE_NAME, 0)); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.defineVariable8BytePacked(wrongCeciTerminalMock, TEXT_VARIABLE_NAME, 0); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testRetrieveVariableText() throws Exception { -// PowerMockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy, "validateVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// PowerMockito.doReturn(TEXT_VARIABLE_VALUE).when(ceciSpy, "getVariable", Mockito.any(), Mockito.any()); -// Assert.assertEquals("Error in retrieveVariableText() method", TEXT_VARIABLE_VALUE, ceciSpy.retrieveVariableText(ceciTerminalMock, TEXT_VARIABLE_NAME)); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.retrieveVariableText(wrongCeciTerminalMock, TEXT_VARIABLE_NAME); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testRetrieveVariableBinary() throws Exception { -// PowerMockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy, "validateVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// PowerMockito.doReturn(TEXT_VARIABLE_VALUE.toCharArray()).when(ceciSpy, "getVariableHex", Mockito.any()); -// Assert.assertTrue("Error in retrieveVariableBinary() method", Arrays.equals(TEXT_VARIABLE_VALUE.toCharArray(), ceciSpy.retrieveVariableBinary(ceciTerminalMock, TEXT_VARIABLE_NAME))); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.retrieveVariableBinary(wrongCeciTerminalMock, TEXT_VARIABLE_NAME); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testRetrieveVariableDoubleWord() throws Exception { -// PowerMockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy, "validateVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// PowerMockito.doReturn("99").when(ceciSpy, "getVariable", Mockito.any(), Mockito.any()); -// Assert.assertEquals("Error in retrieveVariableDoubleWord() method", 99L, ceciSpy.retrieveVariableDoubleWord(ceciTerminalMock, TEXT_VARIABLE_NAME)); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.retrieveVariableDoubleWord(wrongCeciTerminalMock, TEXT_VARIABLE_NAME); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testRetrieveVariableFullWord() throws Exception { -// PowerMockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy, "validateVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// PowerMockito.doReturn("99").when(ceciSpy, "getVariable", Mockito.any(), Mockito.any()); -// Assert.assertEquals("Error in retrieveVariableFullWord() method", 99, ceciSpy.retrieveVariableFullWord(ceciTerminalMock, TEXT_VARIABLE_NAME)); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.retrieveVariableFullWord(wrongCeciTerminalMock, TEXT_VARIABLE_NAME); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testRetrieveVariableHalfWord() throws Exception { -// PowerMockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy, "validateVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// PowerMockito.doReturn("99").when(ceciSpy, "getVariable", Mockito.any(), Mockito.any()); -// Assert.assertEquals("Error in retrieveVariableHalfWord() method", 99, ceciSpy.retrieveVariableHalfWord(ceciTerminalMock, TEXT_VARIABLE_NAME)); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.retrieveVariableHalfWord(wrongCeciTerminalMock, TEXT_VARIABLE_NAME); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testRetrieveVariable4BytePacked() throws Exception { -// PowerMockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy, "validateVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// PowerMockito.doReturn("99").when(ceciSpy, "getVariable", Mockito.any(), Mockito.any()); -// Assert.assertEquals("Error in retrieveVariablePacked() method", 99, ceciSpy.retrieveVariable4BytePacked(ceciTerminalMock, TEXT_VARIABLE_NAME)); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.retrieveVariable4BytePacked(wrongCeciTerminalMock, TEXT_VARIABLE_NAME); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testRetrieveVariable8BytePacked() throws Exception { -// PowerMockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy, "validateVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// PowerMockito.doReturn("99").when(ceciSpy, "getVariable", Mockito.any(), Mockito.any()); -// Assert.assertEquals("Error in retrieveVariablePacked() method", 99, ceciSpy.retrieveVariable8BytePacked(ceciTerminalMock, TEXT_VARIABLE_NAME)); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.retrieveVariable8BytePacked(wrongCeciTerminalMock, TEXT_VARIABLE_NAME); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testDeleteVariable() throws Exception { -// setupTestDeleteVariable(); -// -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(SPACES); -// ceciSpy.deleteVariable(ceciTerminalMock, TEXT_VARIABLE_NAME); -// PowerMockito.verifyPrivate(ceciTerminalMock, Mockito.times(1)).invoke("retrieveScreen"); -// -// Mockito.clearInvocations(ceciTerminalMock); -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(String.format(" %-10s %+06d %s", TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.length(), TEXT_VARIABLE_VALUE)) -// .thenReturn(SPACES); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%-10s", TEXT_VARIABLE_NAME)); -// ceciSpy.deleteVariable(ceciTerminalMock, TEXT_VARIABLE_NAME); -// PowerMockito.verifyPrivate(ceciTerminalMock, Mockito.times(2)).invoke("retrieveScreen"); -// -// Mockito.clearInvocations(ceciTerminalMock); -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(String.format(" %-10s %+06d %s", TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.length(), TEXT_VARIABLE_VALUE)) -// .thenReturn(SPACES); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%-10s", "XXXX")) -// .thenReturn(String.format("%-10s", TEXT_VARIABLE_NAME)); -// ceciSpy.deleteVariable(ceciTerminalMock, TEXT_VARIABLE_NAME); -// PowerMockito.verifyPrivate(ceciTerminalMock, Mockito.times(2)).invoke("retrieveScreen"); -// ceciSpy.deleteVariable(ceciTerminalMock, TEXT_VARIABLE_NAME.substring(1)); -// PowerMockito.verifyPrivate(ceciTerminalMock, Mockito.times(3)).invoke("retrieveScreen"); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.deleteVariable(wrongCeciTerminalMock, TEXT_VARIABLE_NAME); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testDeleteVariableException1() throws Exception { -// setupTestDeleteVariable(); -// -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(String.format(" %-10s %+06d %s", TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.length(), TEXT_VARIABLE_VALUE)); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%-10s", "XXXX")) -// .thenReturn("PF"); -// String expectedMessage = "Unable to find variable to delete"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.deleteVariable(ceciTerminalMock, TEXT_VARIABLE_NAME); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testDeleteVariableException2() throws Exception { -// setupTestDeleteVariable(); -// -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(String.format(" %-10s %+06d %s", TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.length(), TEXT_VARIABLE_VALUE)); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%-10s", "XXXX")) -// .thenReturn(String.format("%-10s", TEXT_VARIABLE_NAME)); -// String expectedMessage = "Delete variable failed"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.deleteVariable(ceciTerminalMock, TEXT_VARIABLE_NAME); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testDeleteVariableException3() throws Exception { -// setupTestDeleteVariable(); -// -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(String.format(" %-10s %+06d %s", TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.length(), TEXT_VARIABLE_VALUE)); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%-10s", TEXT_VARIABLE_NAME)); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); -// String expectedMessage = "Unable to delete variable"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.deleteVariable(ceciTerminalMock, TEXT_VARIABLE_NAME); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testDeleteVariableException4() throws Exception { -// setupTestDeleteVariable(); -// -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(String.format(" %-10s %+06d %s", TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.length(), TEXT_VARIABLE_VALUE)); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%-10s", TEXT_VARIABLE_NAME)); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); -// String expectedMessage = "Unable to delete variable"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.deleteVariable(ceciTerminalMock, TEXT_VARIABLE_NAME); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testDeleteAllVariables() throws Exception { -// setupTestDeleteVariable(); -// -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(""); -// ceciSpy.deleteAllVariables(ceciTerminalMock); -// PowerMockito.verifyPrivate(ceciTerminalMock, Mockito.times(55)).invoke("tab"); -// -// Mockito.clearInvocations(ceciTerminalMock); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn("PF"); -// ceciSpy.deleteAllVariables(ceciTerminalMock); -// PowerMockito.verifyPrivate(ceciTerminalMock, Mockito.times(1)).invoke("tab"); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.deleteAllVariables(wrongCeciTerminalMock); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testDeleteAllVariablesException1() throws Exception { -// setupTestDeleteVariable(); -// -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(""); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); -// String expectedMessage = "Unable to delete all variables"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.deleteAllVariables(ceciTerminalMock); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testDeleteAllVariablesException2() throws Exception { -// setupTestDeleteVariable(); -// -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(""); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); -// String expectedMessage = "Unable to delete all variables"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.deleteAllVariables(ceciTerminalMock); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// private void setupTestDeleteVariable() throws Exception { -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "hexOff"); -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "variableScreen"); -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "multipleTab", Mockito.anyInt()); -// } -// -// @Test -// public void testGetEIB() throws Exception { -// setupTestGetEIB(); -// -// Assert.assertTrue("Error in getEIB() method", ceciSpy.getEIB(ceciTerminalMock) instanceof CeciExecInterfaceBlockImpl); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.getEIB(wrongCeciTerminalMock); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testGetEIBException1() throws Exception { -// setupTestGetEIB(); -// -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); -// String expectedMessage = "Unable to navigate to EIB screen"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.getEIB(ceciTerminalMock); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testGetEIBException2() throws Exception { -// setupTestGetEIB(); -// -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); -// String expectedMessage = "Unable to navigate to EIB screen"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.getEIB(ceciTerminalMock); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// private void setupTestGetEIB() throws Exception { -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "hexOff"); -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "hexOn"); -// } -// -// @Test -// public void testLinkProgram() throws Exception { -// PowerMockito.doReturn(ceciResponseMock).when(ceciSpy, "issueCommand", Mockito.any(), Mockito.any()); -// -// Assert.assertEquals("Error in linkProgram() method", ceciResponseMock, ceciSpy.linkProgram(ceciTerminalMock, PROGRAM_NAME, null, null, null, false)); -// -// Assert.assertEquals("Error in linkProgram() method", ceciResponseMock, ceciSpy.linkProgram(ceciTerminalMock, PROGRAM_NAME, TEXT_VARIABLE_NAME, "SYSID", null, false)); -// -// Assert.assertEquals("Error in linkProgram() method", ceciResponseMock, ceciSpy.linkProgram(ceciTerminalMock, PROGRAM_NAME, TEXT_VARIABLE_NAME, null, "TRAN", false)); -// -// Assert.assertEquals("Error in linkProgram() method", ceciResponseMock, ceciSpy.linkProgram(ceciTerminalMock, PROGRAM_NAME, TEXT_VARIABLE_NAME, null, null, true)); -// -// PowerMockito.doReturn(0).when(ceciSpy, "defineVariableText", Mockito.any(), Mockito.any(), Mockito.any()); -// Assert.assertEquals("Error in linkProgram() method", ceciResponseMock, ceciSpy.linkProgram(ceciTerminalMock, PROGRAM_NAME, "COMMAREA", null, null, false)); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.linkProgram(wrongCeciTerminalMock, PROGRAM_NAME, null, null, null, false); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testLinkProgramWithChannel() throws Exception { -// PowerMockito.doReturn(ceciResponseMock).when(ceciSpy, "issueCommand", Mockito.any(), Mockito.any()); -// -// Assert.assertEquals("Error in linkProgramWithChannel() method", ceciResponseMock, ceciSpy.linkProgramWithChannel(ceciTerminalMock, PROGRAM_NAME, null, null, null, false)); -// -// Assert.assertEquals("Error in linkProgramWithChannel() method", ceciResponseMock, ceciSpy.linkProgramWithChannel(ceciTerminalMock, PROGRAM_NAME, CHANNEL_NAME, "SYSID", null, false)); -// -// Assert.assertEquals("Error in linkProgramWithChannel() method", ceciResponseMock, ceciSpy.linkProgramWithChannel(ceciTerminalMock, PROGRAM_NAME, CHANNEL_NAME, null, "TRAN", false)); -// -// Assert.assertEquals("Error in linkProgramWithChannel() method", ceciResponseMock, ceciSpy.linkProgramWithChannel(ceciTerminalMock, PROGRAM_NAME, CHANNEL_NAME, null, null, true)); -// -// PowerMockito.doReturn(0).when(ceciSpy, "defineVariableText", Mockito.any(), Mockito.any(), Mockito.any()); -// Assert.assertEquals("Error in linkProgramWithChannel() method", ceciResponseMock, ceciSpy.linkProgramWithChannel(ceciTerminalMock, PROGRAM_NAME, "CHANNEL_NAME", null, null, false)); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.linkProgramWithChannel(wrongCeciTerminalMock, PROGRAM_NAME, null, null, null, false); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testPutContainer() throws Exception { -// PowerMockito.doReturn(ceciResponseMock).when(ceciSpy, "issueCommand", Mockito.any(), Mockito.any()); -// PowerMockito.doReturn(TEXT_VARIABLE_VALUE.length()).when(ceciSpy, "setVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// -// Assert.assertEquals("Error in putContainer() method", ceciResponseMock, ceciSpy.putContainer(ceciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_VALUE, null, null, null)); -// -// Assert.assertEquals("Error in putContainer() method", ceciResponseMock, ceciSpy.putContainer(ceciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_NAME, null, null, null)); -// -// Assert.assertEquals("Error in putContainer() method", ceciResponseMock, ceciSpy.putContainer(ceciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_NAME, "CHAR", null, null)); -// -// Assert.assertEquals("Error in putContainer() method", ceciResponseMock, ceciSpy.putContainer(ceciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_NAME, null, "CCID", null)); -// -// Assert.assertEquals("Error in putContainer() method", ceciResponseMock, ceciSpy.putContainer(ceciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_NAME, null, null, "CODEPAGE")); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.putContainer(wrongCeciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_VALUE, null, null, null); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testGetContainer() throws Exception { -// PowerMockito.doReturn(ceciResponseMock).when(ceciSpy, "issueCommand", Mockito.any(), Mockito.any()); -// PowerMockito.doReturn(TEXT_VARIABLE_VALUE.length()).when(ceciSpy, "setVariable", Mockito.any(), Mockito.any(), Mockito.any()); -// -// Assert.assertEquals("Error in getContainer() method", ceciResponseMock, ceciSpy.getContainer(ceciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_NAME, null, null)); -// -// Assert.assertEquals("Error in getContainer() method", ceciResponseMock, ceciSpy.getContainer(ceciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_NAME, "CCID", null)); -// -// Assert.assertEquals("Error in getContainer() method", ceciResponseMock, ceciSpy.getContainer(ceciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_NAME, null, "CODEPAGE")); -// -// Assert.assertEquals("Error in getContainer() method", ceciResponseMock, ceciSpy.getContainer(ceciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_NAME.substring(1), null, null)); -// -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.getContainer(wrongCeciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_NAME, null, null); -// }); -// Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); -// } -// -// @Test -// public void testInitialScreen() throws Exception { -// setupTestInitialScreen(); -// -// PowerMockito.doReturn(true).when(ceciSpy, "isCeciScreen"); -// PowerMockito.doReturn(false).when(ceciSpy, "isHelpScreen", Mockito.any()); -// Assert.assertEquals("Error in initialScreen() method", ceciTerminalMock, ceciSpy.initialScreen()); -// -// PowerMockito.doReturn(true).when(ceciSpy, "isHelpScreen", Mockito.any()); -// Assert.assertEquals("Error in initialScreen() method", ceciTerminalMock, ceciSpy.initialScreen()); -// -// PowerMockito.when(ceciSpy, "isCeciScreen").thenReturn(false).thenReturn(true); -// Assert.assertEquals("Error in initialScreen() method", ceciTerminalMock, ceciSpy.initialScreen()); -// -// PowerMockito.doReturn(false).when(ceciSpy, "isInitialScreen", Mockito.any()); -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.initialScreen(); -// }); -// Assert.assertEquals("exception should contain expected cause", "Unable to navigate to CECI initial screen", expectedException.getMessage()); -// } -// -// @Test -// public void testInitialScreenException1() throws Exception { -// setupTestInitialScreen(); -// -// PowerMockito.doReturn(false).when(ceciSpy, "isCeciScreen"); -// String expectedMessage = "Cannot identify terminal as CECI session"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.initialScreen(); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testInitialScreenException2() throws Exception { -// setupTestInitialScreen(); -// -// PowerMockito.doReturn(false).when(ceciSpy, "isCeciScreen"); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); -// String expectedMessage = "Unable to navigate to CECI initial screen"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.initialScreen(); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testInitialScreenException3() throws Exception { -// setupTestInitialScreen(); -// -// PowerMockito.doReturn(false).when(ceciSpy, "isCeciScreen"); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); -// String expectedMessage = "Unable to navigate to CECI initial screen"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.initialScreen(); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// private void setupTestInitialScreen() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(INITIAL_SCREEN_ID); -// } -// -// @Test -// public void testVariableScreen() throws Exception { -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "initialScreen"); -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn("").thenReturn(VAR_SCREEN_ID); -// Assert.assertEquals("Error in variableScreen() method", ceciTerminalMock, ceciSpy.variableScreen()); -// -// PowerMockito.doReturn(false).when(ceciSpy, "isVariablesScreen", Mockito.any()); -// String expectedMessage = "Unable to navigate to CECI variables screen"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.variableScreen(); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage , expectedException.getMessage()); -// } -// -// @Test -// public void testVariableScreenException1() throws Exception { -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "initialScreen"); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); -// String expectedMessage = "Unable to navigate to CECI variables screen"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.variableScreen(); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testVariableScreenException2() throws Exception { -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "initialScreen"); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); -// String expectedMessage = "Unable to navigate to CECI variables screen"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.variableScreen(); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testisCeciScreen() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// PowerMockito.doReturn(true).when(ceciSpy, "isInitialScreen", Mockito.any()); -// PowerMockito.doReturn(true).when(ceciSpy, "isHelpScreen", Mockito.any()); -// PowerMockito.doReturn(true).when(ceciSpy, "isCommandBeforeScreen", Mockito.any()); -// PowerMockito.doReturn(true).when(ceciSpy, "isCommandAfterScreen", Mockito.any()); -// PowerMockito.doReturn(true).when(ceciSpy, "isEibScreen", Mockito.any()); -// PowerMockito.doReturn(true).when(ceciSpy, "isVariablesScreen", Mockito.any()); -// PowerMockito.doReturn(true).when(ceciSpy, "isVariablesExpansionScreen", Mockito.any()); -// PowerMockito.doReturn(true).when(ceciSpy, "isMsgScreen", Mockito.any()); -// Assert.assertTrue("Error in isCeciScreen() method", ceciSpy.isCeciScreen()); -// -// PowerMockito.doReturn(false).when(ceciSpy, "isInitialScreen", Mockito.any()); -// Assert.assertTrue("Error in isCeciScreen() method", ceciSpy.isCeciScreen()); -// -// PowerMockito.doReturn(false).when(ceciSpy, "isHelpScreen", Mockito.any()); -// Assert.assertTrue("Error in isCeciScreen() method", ceciSpy.isCeciScreen()); -// -// PowerMockito.doReturn(false).when(ceciSpy, "isCommandBeforeScreen", Mockito.any()); -// Assert.assertTrue("Error in isCeciScreen() method", ceciSpy.isCeciScreen()); -// -// PowerMockito.doReturn(false).when(ceciSpy, "isCommandAfterScreen", Mockito.any()); -// Assert.assertTrue("Error in isCeciScreen() method", ceciSpy.isCeciScreen()); -// -// PowerMockito.doReturn(false).when(ceciSpy, "isEibScreen", Mockito.any()); -// Assert.assertTrue("Error in isCeciScreen() method", ceciSpy.isCeciScreen()); -// -// PowerMockito.doReturn(false).when(ceciSpy, "isVariablesScreen", Mockito.any()); -// Assert.assertTrue("Error in isCeciScreen() method", ceciSpy.isCeciScreen()); -// -// PowerMockito.doReturn(false).when(ceciSpy, "isVariablesExpansionScreen", Mockito.any()); -// Assert.assertTrue("Error in isCeciScreen() method", ceciSpy.isCeciScreen()); -// -// PowerMockito.doReturn(false).when(ceciSpy, "isMsgScreen", Mockito.any()); -// Assert.assertFalse("Error in isCeciScreen() method", ceciSpy.isCeciScreen()); -// -// } -// -// @Test -// public void testIsInitialScreen() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// Assert.assertFalse("Error in isInitialScreen() method", ceciSpy.isInitialScreen(SPACES)); -// } -// -// @Test -// public void testIsCommandBeforeScreen() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// Assert.assertFalse("Error in isCommandBeforeScreen() method", ceciSpy.isCommandBeforeScreen(SPACES)); -// } -// -// @Test -// public void testIsCommandAfterScreen() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// Assert.assertFalse("Error in isCommandAfterScreen() method", ceciSpy.isCommandAfterScreen(SPACES)); -// } -// -// @Test -// public void testIsHelpScreen() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// Assert.assertFalse("Error in isHelpScreen() method", ceciSpy.isHelpScreen(SPACES)); -// } -// -// @Test -// public void testIsEibScreen() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// Assert.assertFalse("Error in isEibScreen() method", ceciSpy.isEibScreen(SPACES)); -// } -// -// @Test -// public void testIsVariablesScreen() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// Assert.assertFalse("Error in isVariablesScreen() method", ceciSpy.isVariablesScreen(SPACES)); -// } -// -// @Test -// public void testIsMsgScreen() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// Assert.assertFalse("Error in isMsgScreen() method", ceciSpy.isMsgScreen(SPACES)); -// } -// -// @Test -// public void testIsVariablesExpansionScreen() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// Assert.assertFalse("Error in isVariablesExpansionScreen() method", ceciSpy.isVariablesExpansionScreen(SPACES)); -// } -// -// @Test -// public void testMultipleTab() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// -// Assert.assertEquals("Error in multipleTab() method", ceciTerminalMock, ceciSpy.multipleTab(1)); -// } -// -// @Test -// public void testCheckForSyntaxMessages() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(NO_SYNTAX_MESSAGES); -// -// ceciSpy.checkForSyntaxMessages(); -// PowerMockito.verifyPrivate(ceciTerminalMock, Mockito.times(1)).invoke("enter"); -// } -// -// @Test -// public void testCheckForSyntaxMessagesException1() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// Whitebox.setInternalState(ceciSpy, "command", COMMAND_VALUE); -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(SPACES); -// String expectedMessage = "Command failed syntax check. \nCommand:\n " + COMMAND_VALUE + "\nSyntax Error Screen:\n" + SPACES; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.checkForSyntaxMessages(); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testCheckForSyntaxMessagesException2() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(NO_SYNTAX_MESSAGES); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); -// String expectedMessage = "Unable to check for syntax messages"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.checkForSyntaxMessages(); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testCheckForSyntaxMessagesException3() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(NO_SYNTAX_MESSAGES); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); -// String expectedMessage = "Unable to check for syntax messages"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.checkForSyntaxMessages(); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testValidateVariable() throws Exception { -// Assert.assertEquals("Error in validateVariable() method", TEXT_VARIABLE_NAME, ceciSpy.validateVariable(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.toCharArray(), null)); -// -// Assert.assertEquals("Error in validateVariable() method", TEXT_VARIABLE_NAME, ceciSpy.validateVariable(TEXT_VARIABLE_NAME.substring(1), TEXT_VARIABLE_VALUE.toCharArray(), Integer.toString(TEXT_VARIABLE_VALUE.length()))); -// -// Assert.assertEquals("Error in validateVariable() method", TEXT_VARIABLE_NAME, ceciSpy.validateVariable(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.toCharArray(), null)); -// -// Assert.assertEquals("Error in validateVariable() method", TEXT_VARIABLE_NAME, ceciSpy.validateVariable(TEXT_VARIABLE_NAME, null, null)); -// -// String name = "&234567890"; -// Assert.assertEquals("Error in validateVariable() method", name, ceciSpy.validateVariable(name, TEXT_VARIABLE_VALUE.toCharArray(), null)); -// -// name = "&azAZ09@#"; -// Assert.assertEquals("Error in validateVariable() method", name, ceciSpy.validateVariable(name, TEXT_VARIABLE_VALUE.toCharArray(), null)); -// } -// -// @Test -// public void testValidateVariableException1() throws Exception { -// String name = "&2345678901"; -// String expectedMessage = "CECI variable name \"" + name + "\" greater than maximum length of 10 characters including the leading \"&\""; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.validateVariable(name, TEXT_VARIABLE_VALUE.toCharArray(), null); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testValidateVariableException2() throws Exception { -// String name = "&?"; -// String expectedMessage = "CECI variable name \"" + name + "\" invalid must. Must start with \"&\" and can contain one of more [a-zA-Z0-9@#]"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.validateVariable(name, TEXT_VARIABLE_VALUE.toCharArray(), null); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testValidateVariableException3() throws Exception { -// String value = "123456789"; -// String type = "H"; -// int maxLength = 6; -// String expectedMessage = "CECI variable value length " + value.length() + " greater than maximum of " + maxLength + " for type \"" + type + "\"" ; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.validateVariable(TEXT_VARIABLE_NAME, value.toCharArray(), type); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testValidateVariableException4() throws Exception { -// String value = new String(new char[32768]).replace("\0", "X"); -// String expectedMessage = "CECI variable value length " + value.length() + " greater than maximum 32767"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.validateVariable(TEXT_VARIABLE_NAME, value.toCharArray(), null); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testSetVariable() throws Exception { -// setupTestVariable(); -// PowerMockito.doReturn(TEXT_VARIABLE_VALUE.length()).when(ceciSpy, "setVariableOnPage", Mockito.any(), Mockito.anyInt(), Mockito.anyInt()); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%-10s", "X")).thenReturn(String.format("%-10s", " ")); -// Assert.assertEquals("Error in setVariable() method", TEXT_VARIABLE_VALUE.length(), ceciSpy.setVariable(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE, null)); -// -// Assert.assertEquals("Error in setVariable() method", TEXT_VARIABLE_VALUE.length(), ceciSpy.setVariable(TEXT_VARIABLE_NAME + "X", TEXT_VARIABLE_VALUE, null)); -// -// Assert.assertEquals("Error in setVariable() method", TEXT_VARIABLE_VALUE.length(), ceciSpy.setVariable(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE, "H")); -// -// int length = 1281; -// Mockito.when(ceciSpy.setVariableOnPage(Mockito.any(), Mockito.anyInt(), Mockito.anyInt())).thenReturn(20).thenReturn(21); -// Assert.assertEquals("Error in setVariable() method", length, ceciSpy.setVariable(TEXT_VARIABLE_NAME, new String(new char[length]).replace("\0", "X"), null)); -// } -// -// @Test -// public void testSetVariableException1() throws Exception { -// setupTestVariable(); -// PowerMockito.doReturn("PF").when(ceciTerminalMock, "retrieveFieldAtCursor"); -// String expectedMessage = "No space on CECI variable screen for new variables"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.setVariable(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE, null); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testSetVariableException2() throws Exception { -// setupTestVariable(); -// PowerMockito.doReturn(String.format("%-10s", " ")).when(ceciTerminalMock, "retrieveFieldAtCursor"); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); -// String expectedMessage = "Unable to set CECI variable"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.setVariable(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE, null); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testSetVariableException3() throws Exception { -// setupTestVariable(); -// PowerMockito.doReturn(String.format("%-10s", " ")).when(ceciTerminalMock, "retrieveFieldAtCursor"); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); -// String expectedMessage = "Unable to set CECI variable"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.setVariable(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE, null); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// private void setupTestVariable() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// PowerMockito.doNothing().when(ceciSpy, "deleteVariable", Mockito.any(), Mockito.any()); -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "hexOff"); -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "variableScreen"); -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "moveToVariable", Mockito.any()); -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "multipleTab", Mockito.anyInt()); -// } -// -// @Test -// public void testSetVariableOnPage() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// -// String[] chunks = new String[] {TEXT_VARIABLE_VALUE, TEXT_VARIABLE_VALUE}; -// int start = 0; -// int numberOfLines = 1; -// Assert.assertEquals("Error in setVariableOnPage() method", numberOfLines, ceciSpy.setVariableOnPage(chunks, start, numberOfLines)); -// -// numberOfLines = 2; -// Assert.assertEquals("Error in setVariableOnPage() method", numberOfLines, ceciSpy.setVariableOnPage(chunks, start, numberOfLines)); -// -// chunks = new String[] {String.format("%-65s", "X"), TEXT_VARIABLE_VALUE}; -// Assert.assertEquals("Error in setVariableOnPage() method", numberOfLines, ceciSpy.setVariableOnPage(chunks, start, numberOfLines)); -// } -// -// @Test -// public void testSetVariableOnPageException() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// Mockito.when(ceciTerminalMock.type(Mockito.any())).thenThrow(new FieldNotFoundException()); -// String expectedMessage = "Unable enter variable data"; -// -// String[] chunks = new String[] {TEXT_VARIABLE_VALUE, TEXT_VARIABLE_VALUE}; -// int start = 0; -// int numberOfLines = 1; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.setVariableOnPage(chunks, start, numberOfLines); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testSetVariableHex() throws Exception { -// setupTestVariable(); -// PowerMockito.doReturn(TEXT_VARIABLE_VALUE.length()).when(ceciSpy, "setVariableHexOnPage", Mockito.any(), Mockito.anyInt(), Mockito.anyInt()); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%-10s", "X")).thenReturn(String.format("%-10s", " ")); -// Assert.assertEquals("Error in setVariableHex() method", TEXT_VARIABLE_VALUE.length(), ceciSpy.setVariableHex(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.toCharArray())); -// -// Assert.assertEquals("Error in setVariableHex() method", TEXT_VARIABLE_VALUE.length(), ceciSpy.setVariableHex(TEXT_VARIABLE_NAME + "X", TEXT_VARIABLE_VALUE.toCharArray())); -// -// int length = 21; -// char[] value = new String(new char[length]).replace("\0", "X").toCharArray(); -// Mockito.when(ceciSpy.setVariableHexOnPage(Mockito.any(), Mockito.anyInt(), Mockito.anyInt())).thenReturn(20).thenReturn(21); -// Assert.assertEquals("Error in setVariableHex() method", length, ceciSpy.setVariableHex(TEXT_VARIABLE_NAME, value)); -// } -// -// @Test -// public void testSetVariableHexException1() throws Exception { -// setupTestVariable(); -// PowerMockito.doReturn("PF").when(ceciTerminalMock, "retrieveFieldAtCursor"); -// String expectedMessage = "No space on CECI variable screen for new variables"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.setVariableHex(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.toCharArray()); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testSetVariableHexException2() throws Exception { -// setupTestVariable(); -// PowerMockito.doReturn(String.format("%-10s", " ")).when(ceciTerminalMock, "retrieveFieldAtCursor"); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); -// String expectedMessage = "Unable to set CECI binary variable"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.setVariableHex(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.toCharArray()); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testSetVariableHexException3() throws Exception { -// setupTestVariable(); -// PowerMockito.doReturn(String.format("%-10s", " ")).when(ceciTerminalMock, "retrieveFieldAtCursor"); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); -// String expectedMessage = "Unable to set CECI binary variable"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.setVariableHex(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.toCharArray()); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testSetVariableHexOnPage() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// -// char[] value = TEXT_VARIABLE_VALUE.toCharArray(); -// int start = 0; -// int numberOfLines = 1; -// Assert.assertEquals("Error in setVariableHexOnPage() method", value.length, ceciSpy.setVariableHexOnPage(value, start, numberOfLines)); -// -// value = new String(new char[32]).replace("\0", "X").toCharArray(); -// numberOfLines = 2; -// Assert.assertEquals("Error in setVariableHexOnPage() method", value.length, ceciSpy.setVariableHexOnPage(value, start, numberOfLines)); -// -// numberOfLines = -1; -// Assert.assertEquals("Error in setVariableHexOnPage() method", 0, ceciSpy.setVariableHexOnPage(value, start, numberOfLines)); -// -// value = new char[0]; -// numberOfLines = -1; -// Assert.assertEquals("Error in setVariableHexOnPage() method", value.length, ceciSpy.setVariableHexOnPage(value, start, numberOfLines)); -// } -// -// @Test -// public void testSetVariableHexOnPageException() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// Mockito.when(ceciTerminalMock.type(Mockito.any())).thenThrow(new FieldNotFoundException()); -// String expectedMessage = "Unable enter variable data"; -// -// char[] value = TEXT_VARIABLE_VALUE.toCharArray(); -// int start = 0; -// int numberOfLines = 1; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.setVariableHexOnPage(value, start, numberOfLines); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testGetVariable() throws Exception { -// setupTestGetVariable(); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%+06d", TEXT_VARIABLE_VALUE.length())); -// PowerMockito.doReturn(TEXT_VARIABLE_VALUE).when(ceciSpy, "getVariableFromPage", Mockito.anyInt(), Mockito.anyInt()); -// -// Assert.assertEquals("Error in getVariable() method", TEXT_VARIABLE_VALUE, ceciSpy.getVariable(TEXT_VARIABLE_NAME, null)); -// -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%+06d", TEXT_VARIABLE_VALUE.length()*2)); -// Assert.assertEquals("Error in getVariable() method", TEXT_VARIABLE_VALUE + TEXT_VARIABLE_VALUE, ceciSpy.getVariable(TEXT_VARIABLE_NAME, null)); -// -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn("H"); -// String value = String.format("%012d", 0); -// PowerMockito.doReturn(value).when(ceciSpy, "getVariableFromPage", Mockito.anyInt(), Mockito.anyInt()); -// Assert.assertEquals("Error in getVariable() method", value, ceciSpy.getVariable(TEXT_VARIABLE_NAME, "H")); -// } -// -// @Test -// public void testGetVariableException1() throws Exception { -// setupTestGetVariable(); -// String lengthString = "XXXX"; -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(lengthString); -// String expectedMessage = "Unexpected variable type \"" + lengthString + "\" for \"" + TEXT_VARIABLE_NAME + "\""; -// String type = "H"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.getVariable(TEXT_VARIABLE_NAME, type); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testGetVariableException2() throws Exception { -// setupTestGetVariable(); -// String lengthString = "XXXX"; -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(lengthString); -// String expectedMessage = "Unable to determine variable field length"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.getVariable(TEXT_VARIABLE_NAME, null); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testGetVariableException3() throws Exception { -// setupTestGetVariable(); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); -// String expectedMessage = "Unable to get CECI variable"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.getVariable(TEXT_VARIABLE_NAME, null); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testGetVariableException4() throws Exception { -// setupTestGetVariable(); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); -// String expectedMessage = "Unable to get CECI variable"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.getVariable(TEXT_VARIABLE_NAME, null); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// private void setupTestGetVariable() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "moveToVariable", Mockito.any()); -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "multipleTab", Mockito.anyInt()); -// } -// -// @Test -// public void getVariableFromPage() throws Exception { -// setupTestGetVariable(); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(TEXT_VARIABLE_VALUE); -// -// Assert.assertEquals("Error in getVariableFromPage() method", TEXT_VARIABLE_VALUE, ceciSpy.getVariableFromPage(TEXT_VARIABLE_VALUE.length(), 1)); -// -// Assert.assertEquals("Error in getVariableFromPage() method", TEXT_VARIABLE_VALUE, ceciSpy.getVariableFromPage(TEXT_VARIABLE_VALUE.length()*2, 1)); -// -// } -// -// @Test -// public void getVariableFromPageException1() throws Exception { -// setupTestGetVariable(); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(TEXT_VARIABLE_VALUE); -// Mockito.when(ceciTerminalMock.tab()).thenThrow(new FieldNotFoundException()); -// String expectedMessage = "Unable to get variable from page"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.getVariableFromPage(1, 1); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// -// } -// -// @Test -// public void testGetVariableHex() throws Exception { -// setupTestGetVariable(); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%+06d", TEXT_VARIABLE_VALUE.length())).thenReturn(TEXT_VARIABLE_VALUE); -// PowerMockito.doReturn(TEXT_VARIABLE_VALUE).when(ceciSpy, "getVariableHexFromPage", Mockito.anyInt(), Mockito.anyInt()); -// -// Assert.assertTrue("Error in getVariableHex() method", Arrays.equals(TEXT_VARIABLE_VALUE.toCharArray(), ceciSpy.getVariableHex(TEXT_VARIABLE_VALUE))); -// -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%+06d", TEXT_VARIABLE_VALUE.length()*2)).thenReturn(TEXT_VARIABLE_VALUE); -// Assert.assertTrue("Error in getVariableHex() method", Arrays.equals((TEXT_VARIABLE_VALUE + TEXT_VARIABLE_VALUE).toCharArray(), ceciSpy.getVariableHex(TEXT_VARIABLE_VALUE))); -// } -// -// @Test -// public void testGetVariableHexException1() throws Exception { -// setupTestGetVariable(); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn("XXXX"); -// String expectedMessage = "Unable to determine variable field length"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.getVariableHex(TEXT_VARIABLE_VALUE); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testGetVariableHexException2() throws Exception { -// setupTestGetVariable(); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); -// String expectedMessage = "Unable to get CECI binary variable"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.getVariableHex(TEXT_VARIABLE_VALUE); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testGetVariableHexException3() throws Exception { -// setupTestGetVariable(); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); -// String expectedMessage = "Unable to get CECI binary variable"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.getVariableHex(TEXT_VARIABLE_VALUE); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testGetVariableHexPage() throws Exception { -// setupTestGetVariable(); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn("5A5A5A5A"); -// -// Assert.assertEquals("Error in getVariableHexFromPage() method", "ZZZZ", ceciSpy.getVariableHexFromPage(4, 1)); -// -// Assert.assertEquals("Error in getVariableHexFromPage() method", "ZZZZZZZZZZZZZZZZ", ceciSpy.getVariableHexFromPage(20, 1)); -// } -// -// @Test -// public void testGetVariableHexPageException1() throws Exception { -// setupTestGetVariable(); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn("5A5A5A5A"); -// Mockito.when(ceciTerminalMock.tab()).thenThrow(new FieldNotFoundException()); -// String expectedMessage = "Unable to get binary variable from page"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.getVariableHexFromPage(4, 1); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testMoveToVariable() throws Exception { -// setupMoveToVariable(); -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(TEXT_VARIABLE_NAME + " "); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%-10s", "X")).thenReturn(String.format("%-10s", TEXT_VARIABLE_NAME)); -// -// Assert.assertEquals("Error in moveToVariable() method", ceciTerminalMock, ceciSpy.moveToVariable(TEXT_VARIABLE_NAME)); -// } -// -// @Test -// public void testMoveToVariableException1() throws Exception { -// setupMoveToVariable(); -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(" "); -// String expectedMessage = "Unable to find variable " + TEXT_VARIABLE_NAME; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.moveToVariable(TEXT_VARIABLE_NAME); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testMoveToVariableException2() throws Exception { -// setupMoveToVariable(); -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(TEXT_VARIABLE_NAME + " "); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn("PF"); -// String expectedMessage = "Unable to find variable " + TEXT_VARIABLE_NAME; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.moveToVariable(TEXT_VARIABLE_NAME); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testMoveToVariableException3() throws Exception { -// setupMoveToVariable(); -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(TEXT_VARIABLE_NAME + " "); -// Mockito.when(ceciTerminalMock.newLine()).thenThrow(new FieldNotFoundException()); -// String expectedMessage = "Problem serching for variable " + TEXT_VARIABLE_NAME; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.moveToVariable(TEXT_VARIABLE_NAME); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// private void setupMoveToVariable() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "hexOff"); -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "multipleTab", Mockito.anyInt()); -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "variableScreen"); -// } -// -// @Test -// public void testIsHexOn() throws CeciException { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(" EIBTIME = X'00"); -// -// Assert.assertTrue("Error in isHexOn() method", ceciSpy.isHexOn()); -// } -// -// @Test -// public void testIsHexOnException1() throws CeciException, TimeoutException, KeyboardLockedException, TerminalInterruptedException { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(" EIBTIME = X'00"); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); -// String expectedMessage = "Unable to determine if CECI is in HEX mode"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.isHexOn(); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testIsHexOnException2() throws CeciException, TimeoutException, KeyboardLockedException, TerminalInterruptedException { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(" EIBTIME = X'00"); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); -// String expectedMessage = "Unable to determine if CECI is in HEX mode"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.isHexOn(); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testHexOn() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// PowerMockito.doReturn(true).when(ceciSpy, "isHexOn"); -// -// Assert.assertEquals("Error in hexOn() method", ceciTerminalMock, ceciSpy.hexOn()); -// -// PowerMockito.doReturn(false).when(ceciSpy, "isHexOn"); -// Assert.assertEquals("Error in hexOn() method", ceciTerminalMock, ceciSpy.hexOn()); -// } -// -// @Test -// public void testHexOnException1() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// PowerMockito.doReturn(false).when(ceciSpy, "isHexOn"); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); -// String expectedMessage = "Unable to set CECI HEX ON"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.hexOn(); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testHexOnException2() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// PowerMockito.doReturn(false).when(ceciSpy, "isHexOn"); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); -// String expectedMessage = "Unable to set CECI HEX ON"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.hexOn(); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testHexOff() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// PowerMockito.doReturn(true).when(ceciSpy, "isHexOn"); -// -// Assert.assertEquals("Error in hexOff() method", ceciTerminalMock, ceciSpy.hexOff()); -// -// PowerMockito.doReturn(false).when(ceciSpy, "isHexOn"); -// Assert.assertEquals("Error in hexOff() method", ceciTerminalMock, ceciSpy.hexOff()); -// } -// -// @Test -// public void testHexOffException1() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// PowerMockito.doReturn(true).when(ceciSpy, "isHexOn"); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); -// String expectedMessage = "Unable to set CECI HEX OFF"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.hexOff(); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testHexOffException2() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// PowerMockito.doReturn(true).when(ceciSpy, "isHexOn"); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); -// String expectedMessage = "Unable to set CECI HEX OFF"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.hexOff(); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testNewCeciResponse() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(" RESPONSE: FILENOTFOUND EIBRESP=+0000000012 EIBRESP2=+0000000001 "); -// PowerMockito.doReturn(new LinkedHashMap<>()).when(ceciSpy, "parseResponseOutput"); -// -// ICeciResponse ceciResponse = ceciSpy.newCeciResponse(false); -// -// ceciSpy.newCeciResponse(true); -// Assert.assertEquals("Error in newCeciResponse() method", "FILENOTFOUND", ceciResponse.getResponse()); -// Assert.assertEquals("Error in newCeciResponse() method", 12, ceciResponse.getEIBRESP()); -// Assert.assertEquals("Error in newCeciResponse() method", 1, ceciResponse.getEIBRESP2()); -// } -// -// @Test -// public void testParseResponseOutput() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "multipleTab", Mockito.anyInt()); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn("OPTION1").thenReturn("OPTION2"); -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn("OPTION= OPTION1 LENGTH= +00008 ").thenReturn("OPTION= OPTION2 LENGTH= +00008 "); -// PowerMockito.doReturn(new ResponseOutputValueImpl("XXXXXXXX")).when(ceciSpy, "getOptionValue", Mockito.any()); -// -// Assert.assertTrue("Error in parseResponseOutput() method", ceciSpy.parseResponseOutput().containsKey("OPTION1")); -// -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn("OPTION3").thenReturn("OPTION4").thenReturn("PF"); -// Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn("OPTION= OPTION3 LENGTH= +00008 ").thenReturn("OPTION= OPTION4 LENGTH= +00008 "); -// Assert.assertTrue("Error in parseResponseOutput() method", ceciSpy.parseResponseOutput().containsKey("OPTION4")); -// } -// -// @Test -// public void testParseResponseOutputException1() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "multipleTab", Mockito.anyInt()); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn("OPTION1"); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); -// String expectedMessage = "Unable to parse command output"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.parseResponseOutput(); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testParseResponseOutputException2() throws Exception { -// Whitebox.setInternalState(ceciSpy, "terminal", ceciTerminalMock); -// PowerMockito.doReturn(ceciTerminalMock).when(ceciSpy, "multipleTab", Mockito.anyInt()); -// Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn("OPTION1"); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); -// String expectedMessage = "Unable to parse command output"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.parseResponseOutput(); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testGetOptionValue() throws Exception { -// setupTestGetVariable(); -// String value = "000000"; -// PowerMockito.doReturn(value).when(ceciSpy, "getVariableFromPage", Mockito.anyInt(), Mockito.anyInt()); -// String screen = "OPTION= LENGTH LENGTH= H "; -// -// Assert.assertEquals("Error in getOptionValue() method", value, ceciSpy.getOptionValue(screen).getTextValue()); -// -// PowerMockito.doReturn("000").when(ceciSpy, "getVariableFromPage", Mockito.anyInt(), Mockito.anyInt()); -// Assert.assertEquals("Error in getOptionValue() method", value, ceciSpy.getOptionValue(screen).getTextValue()); -// -// screen = "OPTION= FROM LENGTH= +00001 "; -// PowerMockito.doReturn("F1").when(ceciSpy, "getOptionValueInHex", Mockito.anyInt(), Mockito.anyInt()); -// Assert.assertTrue("Error in getOptionValue() method", Arrays.equals(new char[] {'F', '1'}, ceciSpy.getOptionValue(screen).getHexValue())); -// } -// -// @Test -// public void testGetOptionValueException1() throws Exception { -// setupTestGetVariable(); -// PowerMockito.doReturn("000").when(ceciSpy, "getVariableFromPage", Mockito.anyInt(), Mockito.anyInt()); -// String screen = "OPTION= LENGTH LENGTH= H "; -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); -// String expectedMessage = "Unable to parse command output option value"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.getOptionValue(screen); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testGetOptionValueException2() throws Exception { -// setupTestGetVariable(); -// PowerMockito.doReturn("000").when(ceciSpy, "getVariableFromPage", Mockito.anyInt(), Mockito.anyInt()); -// String screen = "OPTION= LENGTH LENGTH= H "; -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); -// String expectedMessage = "Unable to parse command output option value"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.getOptionValue(screen); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testGetOptionValueInHex() throws Exception { -// setupTestGetVariable(); -// String value = "F1F1"; -// PowerMockito.doReturn(value).when(ceciSpy, "getVariableHexFromPage", Mockito.anyInt(), Mockito.anyInt()); -// -// Assert.assertEquals("Error in getOptionValue() method", value, ceciSpy.getOptionValueInHex(1, 0)); -// -// Assert.assertEquals("Error in getOptionValue() method", value, ceciSpy.getOptionValueInHex(1, 1)); -// -// Assert.assertEquals("Error in getOptionValue() method", value, ceciSpy.getOptionValueInHex(2, 0)); -// -// Assert.assertEquals("Error in getOptionValue() method", value + value, ceciSpy.getOptionValueInHex(5, 0)); -// } -// -// @Test -// public void testGetOptionValueInHexException1() throws Exception { -// setupTestGetVariable(); -// PowerMockito.doReturn("F1").when(ceciSpy, "getVariableHexFromPage", Mockito.anyInt(), Mockito.anyInt()); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); -// String expectedMessage = "Unable to parse command output binary option value"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.getOptionValueInHex(1, 0); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } -// -// @Test -// public void testGetOptionValueInHexException2() throws Exception { -// setupTestGetVariable(); -// PowerMockito.doReturn("F1").when(ceciSpy, "getVariableHexFromPage", Mockito.anyInt(), Mockito.anyInt()); -// Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); -// String expectedMessage = "Unable to parse command output binary option value"; -// CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ -// ceciSpy.getOptionValueInHex(1, 0); -// }); -// Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); -// } + private CeciImpl ceci; + + private CeciImpl ceciSpy; + + // Static fields in CeciImpl + private static final String INITIAL_SCREEN_ID = "STATUS: ENTER ONE OF THE FOLLOWING"; + private static final String VAR_SCREEN_ID = "VARIABLES LENGTH DATA"; + private static final String COMMAND_EXECUTION_COMPLETE = "STATUS: COMMAND EXECUTION COMPLETE"; + private static final String MESSAGE_DFHAC2206 = "DFHAC2206"; + private static final String NO_SYNTAX_MESSAGES = "THERE ARE NO MESSAGES"; + private static final String WRONG_CICS_REGION = "Provided terminal does not belong to the correct CICS TS Region"; + + private static final String COMMAND_VALUE = "COMMAND"; + private static final String TEXT_VARIABLE_NAME = "&VARIABLE"; + private static final String TEXT_VARIABLE_VALUE = "VARIABLE"; + private static final String PROGRAM_NAME = "MYPROG"; + private static final String CHANNEL_NAME = "CHANNEL"; + private static final String CONTAINER_NAME = "CONTAINER"; + private static final String SPACES = " "; + + @Mock + private ICicsTerminal ceciTerminalMock; + + @Mock + private ICicsTerminal wrongCeciTerminalMock; + + @Mock + private ICicsRegion cicsRegionMock; + + @Mock + private ICicsRegion wrongCicsRegionMock; + + @Mock + private ICeciResponse ceciResponseMock; + + @Before + public void setup() throws FieldNotFoundException, KeyboardLockedException, NetworkException, TerminalInterruptedException, TimeoutException { + ceci = new CeciImpl(null, cicsRegionMock); + ceciSpy = Mockito.spy(ceci); + + // Mock all terminal function + Mockito.when(ceciTerminalMock.type(Mockito.any())).thenReturn(ceciTerminalMock); + Mockito.when(ceciTerminalMock.enter()).thenReturn(ceciTerminalMock); + Mockito.when(ceciTerminalMock.pf2()).thenReturn(ceciTerminalMock); + Mockito.when(ceciTerminalMock.pf3()).thenReturn(ceciTerminalMock); + Mockito.when(ceciTerminalMock.pf4()).thenReturn(ceciTerminalMock); + Mockito.when(ceciTerminalMock.pf5()).thenReturn(ceciTerminalMock); + Mockito.when(ceciTerminalMock.pf9()).thenReturn(ceciTerminalMock); + Mockito.when(ceciTerminalMock.pf10()).thenReturn(ceciTerminalMock); + Mockito.when(ceciTerminalMock.pf11()).thenReturn(ceciTerminalMock); + Mockito.when(ceciTerminalMock.tab()).thenReturn(ceciTerminalMock); + Mockito.when(ceciTerminalMock.home()).thenReturn(ceciTerminalMock); + Mockito.when(ceciTerminalMock.newLine()).thenReturn(ceciTerminalMock); + Mockito.when(ceciTerminalMock.eraseEof()).thenReturn(ceciTerminalMock); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenReturn(ceciTerminalMock); + Mockito.when(ceciTerminalMock.reportScreenWithCursor()).thenReturn(ceciTerminalMock); + Mockito.when(ceciTerminalMock.getCicsRegion()).thenReturn(cicsRegionMock); + Mockito.when(wrongCeciTerminalMock.getCicsRegion()).thenReturn(wrongCicsRegionMock); + } + + @Test + public void teststartCECISession() throws Exception { + setupTestIssueCommand(); + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(INITIAL_SCREEN_ID); + Mockito.when(ceciTerminalMock.isClearScreen()).thenReturn(true); + ceciSpy.startCECISession(ceciTerminalMock); + + Mockito.when(ceciTerminalMock.isClearScreen()).thenReturn(false); + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn("NOT_INITIAL_SCREEN_ID"); + String expectedMessage = "Not on CECI initial screen"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.startCECISession(ceciTerminalMock); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + + Mockito.when(ceciTerminalMock.resetAndClear()).thenThrow(new CicstsManagerException()); + expectedMessage = "Problem starting CECI session"; + expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.startCECISession(ceciTerminalMock); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + + expectedMessage = WRONG_CICS_REGION; + expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.startCECISession(wrongCeciTerminalMock); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testIssueCommand() throws Exception { + setupTestIssueCommand(); + + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(COMMAND_EXECUTION_COMPLETE); + Assert.assertEquals("Error in issueCommand() method", ceciResponseMock, ceciSpy.issueCommand(ceciTerminalMock, COMMAND_VALUE)); + + Mockito.doReturn(COMMAND_VALUE).when(ceciSpy).retrieveVariableText(Mockito.any(),Mockito.any()); + Assert.assertEquals("Error in issueCommand() method", ceciResponseMock, ceciSpy.issueCommand(ceciTerminalMock, TEXT_VARIABLE_NAME)); + + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn("USER SCREEN").thenReturn("USER SCREEN").thenReturn(COMMAND_EXECUTION_COMPLETE); + Assert.assertEquals("Error in issueCommand() method", ceciResponseMock, ceciSpy.issueCommand(ceciTerminalMock, COMMAND_VALUE)); + + Assert.assertEquals("Error in issueCommand() method", ceciResponseMock, ceciSpy.issueCommand(ceciTerminalMock, COMMAND_VALUE, null)); + + HashMap options = new HashMap<>(); + Assert.assertEquals("Error in issueCommand() method", ceciResponseMock, ceciSpy.issueCommand(ceciTerminalMock, COMMAND_VALUE, options)); + + options.put("KEY1", null); + options.put("KEY2", ""); + options.put("KEY3", "VALUE"); + Assert.assertEquals("Error in issueCommand() method", ceciResponseMock, ceciSpy.issueCommand(ceciTerminalMock, COMMAND_VALUE, options)); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.issueCommand(wrongCeciTerminalMock, COMMAND_VALUE, true); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testIssueCommandException1() throws Exception { + setupTestIssueCommand(); + + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(MESSAGE_DFHAC2206); + String expectedMessage = "Command abended - see previous screen"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.issueCommand(ceciTerminalMock, COMMAND_VALUE); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testIssueCommandException2() throws Exception { + setupTestIssueCommand(); + + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn("USER SCREEN").thenReturn("USER SCREEN").thenReturn("USER SCREEN"); + String expectedMessage = "Command failed - see previous screen"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.issueCommand(ceciTerminalMock, COMMAND_VALUE); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + + } + + @Test + public void testIssueCommandException3() throws Exception { + setupTestIssueCommand(); + + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); + String expectedMessage = "Error issuing CECI command"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.issueCommand(ceciTerminalMock, COMMAND_VALUE); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + + } + + @Test + public void testIssueCommandException4() throws Exception { + setupTestIssueCommand(); + + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); + String expectedMessage = "Error issuing CECI command"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.issueCommand(ceciTerminalMock, COMMAND_VALUE); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + + } + + private void setupTestIssueCommand() throws Exception { + Mockito.doReturn(0).when(ceciSpy).defineVariableText(Mockito.any(),Mockito.any(),Mockito.any()); + Mockito.doReturn(ceciTerminalMock).when(ceciSpy).initialScreen(); + Mockito.doNothing().when(ceciSpy).checkForSyntaxMessages(); + Mockito.doReturn(ceciResponseMock).when(ceciSpy).newCeciResponse(Mockito.anyBoolean()); + } + + @Test + public void testDefineVariableText() throws Exception { + Mockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy).validateVariable(Mockito.any(),Mockito.any(),Mockito.any()); + Mockito.doReturn(TEXT_VARIABLE_VALUE.length()).when(ceciSpy).setVariable(Mockito.any(),Mockito.any(),Mockito.any()); + Assert.assertEquals("Error in defineVariableText() method", TEXT_VARIABLE_VALUE.length(), ceciSpy.defineVariableText(ceciTerminalMock, TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE)); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.defineVariableText(wrongCeciTerminalMock, TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testDefineVariableBinary() throws Exception { + Mockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy).validateVariable(Mockito.any(),Mockito.any(),Mockito.any()); + Mockito.doReturn(TEXT_VARIABLE_VALUE.length()).when(ceciSpy).setVariableHex(Mockito.any(),Mockito.any()); + Assert.assertEquals("Error in defineVariableBinary() method", TEXT_VARIABLE_VALUE.length(), ceciSpy.defineVariableBinary(ceciTerminalMock, TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.toCharArray())); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.defineVariableBinary(wrongCeciTerminalMock, TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.toCharArray()); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testDefineVariableDoubleWord() throws Exception { + Mockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy).validateVariable(Mockito.any(),Mockito.any(),Mockito.any()); + Mockito.doReturn(99).when(ceciSpy).setVariable(Mockito.any(),Mockito.any(),Mockito.any()); + Assert.assertEquals("Error in defineVariableDoubleWord() method", 99, ceciSpy.defineVariableDoubleWord(ceciTerminalMock, TEXT_VARIABLE_NAME, 0)); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.defineVariableDoubleWord(wrongCeciTerminalMock, TEXT_VARIABLE_NAME, 0); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testDefineVariableFullWord() throws Exception { + Mockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy).validateVariable(Mockito.any(),Mockito.any(),Mockito.any()); + Mockito.doReturn(99).when(ceciSpy).setVariable(Mockito.any(),Mockito.any(),Mockito.any()); + Assert.assertEquals("Error in defineVariableFullWord() method", 99, ceciSpy.defineVariableFullWord(ceciTerminalMock, TEXT_VARIABLE_NAME, 0)); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.defineVariableFullWord(wrongCeciTerminalMock, TEXT_VARIABLE_NAME, 0); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testDefineVariableHalfWord() throws Exception { + Mockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy).validateVariable(Mockito.any(),Mockito.any(),Mockito.any()); + Mockito.doReturn(99).when(ceciSpy).setVariable(Mockito.any(),Mockito.any(),Mockito.any()); + Assert.assertEquals("Error in defineVariableHalfWord() method", 99, ceciSpy.defineVariableHalfWord(ceciTerminalMock, TEXT_VARIABLE_NAME, 0)); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.defineVariableHalfWord(wrongCeciTerminalMock, TEXT_VARIABLE_NAME, 0); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testDefineVariable4BytePacked() throws Exception { + Mockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy).validateVariable(Mockito.any(),Mockito.any(),Mockito.any()); + Mockito.doReturn(99).when(ceciSpy).setVariable(Mockito.any(),Mockito.any(),Mockito.any()); + Assert.assertEquals("Error in defineVariablePacked() method", 99, ceciSpy.defineVariable4BytePacked(ceciTerminalMock, TEXT_VARIABLE_NAME, 0)); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.defineVariable4BytePacked(wrongCeciTerminalMock, TEXT_VARIABLE_NAME, 0); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testDefineVariable8BytePacked() throws Exception { + Mockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy).validateVariable(Mockito.any(),Mockito.any(),Mockito.any()); + Mockito.doReturn(99).when(ceciSpy).setVariable(Mockito.any(),Mockito.any(),Mockito.any()); + Assert.assertEquals("Error in defineVariablePacked() method", 99, ceciSpy.defineVariable8BytePacked(ceciTerminalMock, TEXT_VARIABLE_NAME, 0)); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.defineVariable8BytePacked(wrongCeciTerminalMock, TEXT_VARIABLE_NAME, 0); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testRetrieveVariableText() throws Exception { + Mockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy).validateVariable(Mockito.any(),Mockito.any(),Mockito.any()); + Mockito.doReturn(TEXT_VARIABLE_VALUE).when(ceciSpy).getVariable(Mockito.any(),Mockito.any()); + Assert.assertEquals("Error in retrieveVariableText() method", TEXT_VARIABLE_VALUE, ceciSpy.retrieveVariableText(ceciTerminalMock, TEXT_VARIABLE_NAME)); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.retrieveVariableText(wrongCeciTerminalMock, TEXT_VARIABLE_NAME); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testRetrieveVariableBinary() throws Exception { + Mockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy).validateVariable(Mockito.any(),Mockito.any(),Mockito.any()); + Mockito.doReturn(TEXT_VARIABLE_VALUE.toCharArray()).when(ceciSpy).getVariableHex(Mockito.any()); + Assert.assertTrue("Error in retrieveVariableBinary() method", Arrays.equals(TEXT_VARIABLE_VALUE.toCharArray(), ceciSpy.retrieveVariableBinary(ceciTerminalMock, TEXT_VARIABLE_NAME))); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.retrieveVariableBinary(wrongCeciTerminalMock, TEXT_VARIABLE_NAME); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testRetrieveVariableDoubleWord() throws Exception { + Mockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy).validateVariable(Mockito.any(),Mockito.any(),Mockito.any()); + Mockito.doReturn("99").when(ceciSpy).getVariable(Mockito.any(),Mockito.any()); + Assert.assertEquals("Error in retrieveVariableDoubleWord() method", 99L, ceciSpy.retrieveVariableDoubleWord(ceciTerminalMock, TEXT_VARIABLE_NAME)); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.retrieveVariableDoubleWord(wrongCeciTerminalMock, TEXT_VARIABLE_NAME); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testRetrieveVariableFullWord() throws Exception { + Mockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy).validateVariable(Mockito.any(),Mockito.any(),Mockito.any()); + Mockito.doReturn("99").when(ceciSpy).getVariable(Mockito.any(),Mockito.any()); + Assert.assertEquals("Error in retrieveVariableFullWord() method", 99, ceciSpy.retrieveVariableFullWord(ceciTerminalMock, TEXT_VARIABLE_NAME)); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.retrieveVariableFullWord(wrongCeciTerminalMock, TEXT_VARIABLE_NAME); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testRetrieveVariableHalfWord() throws Exception { + Mockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy).validateVariable(Mockito.any(),Mockito.any(),Mockito.any()); + Mockito.doReturn("99").when(ceciSpy).getVariable(Mockito.any(),Mockito.any()); + Assert.assertEquals("Error in retrieveVariableHalfWord() method", 99, ceciSpy.retrieveVariableHalfWord(ceciTerminalMock, TEXT_VARIABLE_NAME)); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.retrieveVariableHalfWord(wrongCeciTerminalMock, TEXT_VARIABLE_NAME); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testRetrieveVariable4BytePacked() throws Exception { + Mockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy).validateVariable(Mockito.any(),Mockito.any(),Mockito.any()); + Mockito.doReturn("99").when(ceciSpy).getVariable(Mockito.any(),Mockito.any()); + Assert.assertEquals("Error in retrieveVariablePacked() method", 99, ceciSpy.retrieveVariable4BytePacked(ceciTerminalMock, TEXT_VARIABLE_NAME)); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.retrieveVariable4BytePacked(wrongCeciTerminalMock, TEXT_VARIABLE_NAME); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testRetrieveVariable8BytePacked() throws Exception { + Mockito.doReturn(TEXT_VARIABLE_NAME).when(ceciSpy).validateVariable(Mockito.any(),Mockito.any(),Mockito.any()); + Mockito.doReturn("99").when(ceciSpy).getVariable(Mockito.any(),Mockito.any()); + Assert.assertEquals("Error in retrieveVariablePacked() method", 99, ceciSpy.retrieveVariable8BytePacked(ceciTerminalMock, TEXT_VARIABLE_NAME)); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.retrieveVariable8BytePacked(wrongCeciTerminalMock, TEXT_VARIABLE_NAME); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testDeleteVariable() throws Exception { + setupTestDeleteVariable(); + + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(SPACES); + ceciSpy.deleteVariable(ceciTerminalMock, TEXT_VARIABLE_NAME); + Mockito.verify(ceciTerminalMock,Mockito.times(1)).retrieveScreen(); + + Mockito.clearInvocations(ceciTerminalMock); + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(String.format(" %-10s %+06d %s", TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.length(), TEXT_VARIABLE_VALUE)) + .thenReturn(SPACES); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%-10s", TEXT_VARIABLE_NAME)); + ceciSpy.deleteVariable(ceciTerminalMock, TEXT_VARIABLE_NAME); + Mockito.verify(ceciTerminalMock,Mockito.times(2)).retrieveScreen(); + + Mockito.clearInvocations(ceciTerminalMock); + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(String.format(" %-10s %+06d %s", TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.length(), TEXT_VARIABLE_VALUE)) + .thenReturn(SPACES); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%-10s", "XXXX")) + .thenReturn(String.format("%-10s", TEXT_VARIABLE_NAME)); + ceciSpy.deleteVariable(ceciTerminalMock, TEXT_VARIABLE_NAME); + Mockito.verify(ceciTerminalMock,Mockito.times(2)).retrieveScreen(); + + ceciSpy.deleteVariable(ceciTerminalMock, TEXT_VARIABLE_NAME.substring(1)); + Mockito.verify(ceciTerminalMock,Mockito.times(3)).retrieveScreen(); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.deleteVariable(wrongCeciTerminalMock, TEXT_VARIABLE_NAME); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testDeleteVariableException1() throws Exception { + setupTestDeleteVariable(); + + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(String.format(" %-10s %+06d %s", TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.length(), TEXT_VARIABLE_VALUE)); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%-10s", "XXXX")) + .thenReturn("PF"); + String expectedMessage = "Unable to find variable to delete"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.deleteVariable(ceciTerminalMock, TEXT_VARIABLE_NAME); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testDeleteVariableException2() throws Exception { + setupTestDeleteVariable(); + + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(String.format(" %-10s %+06d %s", TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.length(), TEXT_VARIABLE_VALUE)); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%-10s", "XXXX")) + .thenReturn(String.format("%-10s", TEXT_VARIABLE_NAME)); + String expectedMessage = "Delete variable failed"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.deleteVariable(ceciTerminalMock, TEXT_VARIABLE_NAME); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testDeleteVariableException3() throws Exception { + setupTestDeleteVariable(); + + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(String.format(" %-10s %+06d %s", TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.length(), TEXT_VARIABLE_VALUE)); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%-10s", TEXT_VARIABLE_NAME)); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); + String expectedMessage = "Unable to delete variable"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.deleteVariable(ceciTerminalMock, TEXT_VARIABLE_NAME); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testDeleteVariableException4() throws Exception { + setupTestDeleteVariable(); + + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(String.format(" %-10s %+06d %s", TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.length(), TEXT_VARIABLE_VALUE)); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%-10s", TEXT_VARIABLE_NAME)); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); + String expectedMessage = "Unable to delete variable"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.deleteVariable(ceciTerminalMock, TEXT_VARIABLE_NAME); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testDeleteAllVariables() throws Exception { + setupTestDeleteVariable(); + + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(""); + ceciSpy.deleteAllVariables(ceciTerminalMock); + Mockito.verify(ceciTerminalMock,Mockito.times(55)).tab(); + + Mockito.clearInvocations(ceciTerminalMock); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn("PF"); + ceciSpy.deleteAllVariables(ceciTerminalMock); + Mockito.verify(ceciTerminalMock,Mockito.times(1)).tab(); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.deleteAllVariables(wrongCeciTerminalMock); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testDeleteAllVariablesException1() throws Exception { + setupTestDeleteVariable(); + + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(""); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); + String expectedMessage = "Unable to delete all variables"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.deleteAllVariables(ceciTerminalMock); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testDeleteAllVariablesException2() throws Exception { + setupTestDeleteVariable(); + + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(""); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); + String expectedMessage = "Unable to delete all variables"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.deleteAllVariables(ceciTerminalMock); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + private void setupTestDeleteVariable() throws Exception { + Mockito.doReturn(ceciTerminalMock).when(ceciSpy).hexOff(); + Mockito.doReturn(ceciTerminalMock).when(ceciSpy).variableScreen(); + } + + @Test + public void testGetEIB() throws Exception { + setupTestGetEIB(); + Assert.assertTrue("Error in getEIB() method", ceciSpy.getEIB(ceciTerminalMock) instanceof CeciExecInterfaceBlockImpl); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.getEIB(wrongCeciTerminalMock); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testGetEIBException1() throws Exception { + setupTestGetEIB(); + + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); + String expectedMessage = "Unable to navigate to EIB screen"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.getEIB(ceciTerminalMock); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testGetEIBException2() throws Exception { + setupTestGetEIB(); + + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); + String expectedMessage = "Unable to navigate to EIB screen"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.getEIB(ceciTerminalMock); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + private void setupTestGetEIB() throws Exception { + Mockito.doReturn(ceciTerminalMock).when(ceciSpy).hexOff(); + Mockito.doReturn(ceciTerminalMock).when(ceciSpy).hexOn(); + } + + @Test + public void testLinkProgram() throws Exception { + Mockito.doReturn(ceciResponseMock).when(ceciSpy).issueCommand(Mockito.any(),Mockito.any()); + + Assert.assertEquals("Error in linkProgram() method", ceciResponseMock, ceciSpy.linkProgram(ceciTerminalMock, PROGRAM_NAME, null, null, null, false)); + + Assert.assertEquals("Error in linkProgram() method", ceciResponseMock, ceciSpy.linkProgram(ceciTerminalMock, PROGRAM_NAME, TEXT_VARIABLE_NAME, "SYSID", null, false)); + + Assert.assertEquals("Error in linkProgram() method", ceciResponseMock, ceciSpy.linkProgram(ceciTerminalMock, PROGRAM_NAME, TEXT_VARIABLE_NAME, null, "TRAN", false)); + + Assert.assertEquals("Error in linkProgram() method", ceciResponseMock, ceciSpy.linkProgram(ceciTerminalMock, PROGRAM_NAME, TEXT_VARIABLE_NAME, null, null, true)); + + Mockito.doReturn(0).when(ceciSpy).defineVariableText(Mockito.any(),Mockito.any(),Mockito.any()); + Assert.assertEquals("Error in linkProgram() method", ceciResponseMock, ceciSpy.linkProgram(ceciTerminalMock, PROGRAM_NAME, "COMMAREA", null, null, false)); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.linkProgram(wrongCeciTerminalMock, PROGRAM_NAME, null, null, null, false); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testLinkProgramWithChannel() throws Exception { + Mockito.doReturn(ceciResponseMock).when(ceciSpy).issueCommand(Mockito.any(),Mockito.any()); + + Assert.assertEquals("Error in linkProgramWithChannel() method", ceciResponseMock, ceciSpy.linkProgramWithChannel(ceciTerminalMock, PROGRAM_NAME, null, null, null, false)); + + Assert.assertEquals("Error in linkProgramWithChannel() method", ceciResponseMock, ceciSpy.linkProgramWithChannel(ceciTerminalMock, PROGRAM_NAME, CHANNEL_NAME, "SYSID", null, false)); + + Assert.assertEquals("Error in linkProgramWithChannel() method", ceciResponseMock, ceciSpy.linkProgramWithChannel(ceciTerminalMock, PROGRAM_NAME, CHANNEL_NAME, null, "TRAN", false)); + + Assert.assertEquals("Error in linkProgramWithChannel() method", ceciResponseMock, ceciSpy.linkProgramWithChannel(ceciTerminalMock, PROGRAM_NAME, CHANNEL_NAME, null, null, true)); + + Assert.assertEquals("Error in linkProgramWithChannel() method", ceciResponseMock, ceciSpy.linkProgramWithChannel(ceciTerminalMock, PROGRAM_NAME, "CHANNEL_NAME", null, null, false)); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.linkProgramWithChannel(wrongCeciTerminalMock, PROGRAM_NAME, null, null, null, false); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testPutContainer() throws Exception { + Mockito.doReturn(ceciResponseMock).when(ceciSpy).issueCommand(Mockito.any(),Mockito.any()); + Mockito.doReturn(TEXT_VARIABLE_VALUE.length()).when(ceciSpy).setVariable(Mockito.any(),Mockito.any(),Mockito.any()); + + Assert.assertEquals("Error in putContainer() method", ceciResponseMock, ceciSpy.putContainer(ceciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_VALUE, null, null, null)); + + Assert.assertEquals("Error in putContainer() method", ceciResponseMock, ceciSpy.putContainer(ceciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_NAME, null, null, null)); + + Assert.assertEquals("Error in putContainer() method", ceciResponseMock, ceciSpy.putContainer(ceciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_NAME, "CHAR", null, null)); + + Assert.assertEquals("Error in putContainer() method", ceciResponseMock, ceciSpy.putContainer(ceciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_NAME, null, "CCID", null)); + + Assert.assertEquals("Error in putContainer() method", ceciResponseMock, ceciSpy.putContainer(ceciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_NAME, null, null, "CODEPAGE")); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.putContainer(wrongCeciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_VALUE, null, null, null); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testGetContainer() throws Exception { + Mockito.doReturn(ceciResponseMock).when(ceciSpy).issueCommand(Mockito.any(),Mockito.any()); + + Assert.assertEquals("Error in getContainer() method", ceciResponseMock, ceciSpy.getContainer(ceciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_NAME, null, null)); + Assert.assertEquals("Error in getContainer() method", ceciResponseMock, ceciSpy.getContainer(ceciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_NAME, "CCID", null)); + Assert.assertEquals("Error in getContainer() method", ceciResponseMock, ceciSpy.getContainer(ceciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_NAME, null, "CODEPAGE")); + Assert.assertEquals("Error in getContainer() method", ceciResponseMock, ceciSpy.getContainer(ceciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_NAME.substring(1), null, null)); + + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.getContainer(wrongCeciTerminalMock, CHANNEL_NAME, CONTAINER_NAME, TEXT_VARIABLE_NAME, null, null); + }); + Assert.assertEquals("exception should contain expected cause", WRONG_CICS_REGION, expectedException.getMessage()); + } + + @Test + public void testInitialScreen() throws Exception { + setupTestInitialScreen(); + + Mockito.doReturn(true).when(ceciSpy).isCeciScreen(); + Mockito.doReturn(false).when(ceciSpy).isHelpScreen(Mockito.any()); + Assert.assertEquals("Error in initialScreen() method", ceciTerminalMock, ceciSpy.initialScreen()); + + Mockito.doReturn(true).when(ceciSpy).isHelpScreen(Mockito.any()); + Assert.assertEquals("Error in initialScreen() method", ceciTerminalMock, ceciSpy.initialScreen()); + + Mockito.when(ceciSpy.isCeciScreen()).thenReturn(false).thenReturn(true); + Assert.assertEquals("Error in initialScreen() method", ceciTerminalMock, ceciSpy.initialScreen()); + + Mockito.doReturn(false).when(ceciSpy).isInitialScreen(Mockito.any()); + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.initialScreen(); + }); + Assert.assertEquals("exception should contain expected cause", "Unable to navigate to CECI initial screen", expectedException.getMessage()); + } + + @Test + public void testInitialScreenException1() throws Exception { + setupTestInitialScreen(); + + Mockito.doReturn(false).when(ceciSpy).isCeciScreen(); + String expectedMessage = "Cannot identify terminal as CECI session"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.initialScreen(); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testInitialScreenException2() throws Exception { + setupTestInitialScreen(); + + Mockito.doReturn(false).when(ceciSpy).isCeciScreen(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); + String expectedMessage = "Unable to navigate to CECI initial screen"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.initialScreen(); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testInitialScreenException3() throws Exception { + setupTestInitialScreen(); + + Mockito.doReturn(false).when(ceciSpy).isCeciScreen(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); + String expectedMessage = "Unable to navigate to CECI initial screen"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.initialScreen(); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + private void setupTestInitialScreen() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(INITIAL_SCREEN_ID); + } + + @Test + public void testVariableScreen() throws Exception { + Mockito.doReturn(ceciTerminalMock).when(ceciSpy).initialScreen(); + setTerminalMockOnCeciSpy(); + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn("").thenReturn(VAR_SCREEN_ID); + Assert.assertEquals("Error in variableScreen() method", ceciTerminalMock, ceciSpy.variableScreen()); + + Mockito.doReturn(false).when(ceciSpy).isVariablesScreen(Mockito.any()); + String expectedMessage = "Unable to navigate to CECI variables screen"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.variableScreen(); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage , expectedException.getMessage()); + } + + @Test + public void testVariableScreenException1() throws Exception { + Mockito.doReturn(ceciTerminalMock).when(ceciSpy).initialScreen(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); + String expectedMessage = "Unable to navigate to CECI variables screen"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.variableScreen(); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testVariableScreenException2() throws Exception { + Mockito.doReturn(ceciTerminalMock).when(ceciSpy).initialScreen(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); + String expectedMessage = "Unable to navigate to CECI variables screen"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.variableScreen(); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testisCeciScreen() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.doReturn(true).when(ceciSpy).isInitialScreen(Mockito.any()); + Mockito.doReturn(true).when(ceciSpy).isHelpScreen(Mockito.any()); + Mockito.doReturn(true).when(ceciSpy).isCommandBeforeScreen(Mockito.any()); + Mockito.doReturn(true).when(ceciSpy).isCommandAfterScreen(Mockito.any()); + Mockito.doReturn(true).when(ceciSpy).isEibScreen(Mockito.any()); + Mockito.doReturn(true).when(ceciSpy).isVariablesScreen(Mockito.any()); + Mockito.doReturn(true).when(ceciSpy).isVariablesExpansionScreen(Mockito.any()); + Mockito.doReturn(true).when(ceciSpy).isMsgScreen(Mockito.any()); + Assert.assertTrue("Error in isCeciScreen() method", ceciSpy.isCeciScreen()); + + Mockito.doReturn(false).when(ceciSpy).isInitialScreen(Mockito.any()); + Assert.assertTrue("Error in isCeciScreen() method", ceciSpy.isCeciScreen()); + + Mockito.doReturn(false).when(ceciSpy).isHelpScreen(Mockito.any()); + Assert.assertTrue("Error in isCeciScreen() method", ceciSpy.isCeciScreen()); + + Mockito.doReturn(false).when(ceciSpy).isCommandBeforeScreen(Mockito.any()); + Assert.assertTrue("Error in isCeciScreen() method", ceciSpy.isCeciScreen()); + + Mockito.doReturn(false).when(ceciSpy).isCommandAfterScreen(Mockito.any()); + Assert.assertTrue("Error in isCeciScreen() method", ceciSpy.isCeciScreen()); + + Mockito.doReturn(false).when(ceciSpy).isEibScreen(Mockito.any()); + Assert.assertTrue("Error in isCeciScreen() method", ceciSpy.isCeciScreen()); + + Mockito.doReturn(false).when(ceciSpy).isVariablesScreen(Mockito.any()); + Assert.assertTrue("Error in isCeciScreen() method", ceciSpy.isCeciScreen()); + + Mockito.doReturn(false).when(ceciSpy).isVariablesExpansionScreen(Mockito.any()); + Assert.assertTrue("Error in isCeciScreen() method", ceciSpy.isCeciScreen()); + + Mockito.doReturn(false).when(ceciSpy).isMsgScreen(Mockito.any()); + Assert.assertFalse("Error in isCeciScreen() method", ceciSpy.isCeciScreen()); + } + + @Test + public void testIsInitialScreen() throws Exception { + setTerminalMockOnCeciSpy(); + Assert.assertFalse("Error in isInitialScreen() method", ceciSpy.isInitialScreen(SPACES)); + } + + @Test + public void testIsCommandBeforeScreen() throws Exception { + setTerminalMockOnCeciSpy(); + Assert.assertFalse("Error in isCommandBeforeScreen() method", ceciSpy.isCommandBeforeScreen(SPACES)); + } + + @Test + public void testIsCommandAfterScreen() throws Exception { + setTerminalMockOnCeciSpy(); + Assert.assertFalse("Error in isCommandAfterScreen() method", ceciSpy.isCommandAfterScreen(SPACES)); + } + + @Test + public void testIsHelpScreen() throws Exception { + setTerminalMockOnCeciSpy(); + Assert.assertFalse("Error in isHelpScreen() method", ceciSpy.isHelpScreen(SPACES)); + } + + @Test + public void testIsEibScreen() throws Exception { + setTerminalMockOnCeciSpy(); + Assert.assertFalse("Error in isEibScreen() method", ceciSpy.isEibScreen(SPACES)); + } + + @Test + public void testIsVariablesScreen() throws Exception { + setTerminalMockOnCeciSpy(); + Assert.assertFalse("Error in isVariablesScreen() method", ceciSpy.isVariablesScreen(SPACES)); + } + + @Test + public void testIsMsgScreen() throws Exception { + setTerminalMockOnCeciSpy(); + Assert.assertFalse("Error in isMsgScreen() method", ceciSpy.isMsgScreen(SPACES)); + } + + @Test + public void testIsVariablesExpansionScreen() throws Exception { + setTerminalMockOnCeciSpy(); + Assert.assertFalse("Error in isVariablesExpansionScreen() method", ceciSpy.isVariablesExpansionScreen(SPACES)); + } + + @Test + public void testMultipleTab() throws Exception { + setTerminalMockOnCeciSpy(); + Assert.assertEquals("Error in multipleTab() method", ceciTerminalMock, ceciSpy.multipleTab(1)); + } + + @Test + public void testCheckForSyntaxMessages() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(NO_SYNTAX_MESSAGES); + + ceciSpy.checkForSyntaxMessages(); + Mockito.verify(ceciTerminalMock,Mockito.times(1)).enter(); + } + + @Test + public void testCheckForSyntaxMessagesException1() throws Exception { + setTerminalMockOnCeciSpy(); + Field f1 = ceciSpy.getClass().getSuperclass().getDeclaredField("command"); + f1.setAccessible(true); + f1.set(ceciSpy,COMMAND_VALUE); + + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(SPACES); + String expectedMessage = "Command failed syntax check. \nCommand:\n " + COMMAND_VALUE + "\nSyntax Error Screen:\n" + SPACES; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.checkForSyntaxMessages(); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testCheckForSyntaxMessagesException2() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); + String expectedMessage = "Unable to check for syntax messages"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.checkForSyntaxMessages(); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testCheckForSyntaxMessagesException3() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); + String expectedMessage = "Unable to check for syntax messages"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.checkForSyntaxMessages(); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testValidateVariable() throws Exception { + Assert.assertEquals("Error in validateVariable() method", TEXT_VARIABLE_NAME, ceciSpy.validateVariable(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.toCharArray(), null)); + Assert.assertEquals("Error in validateVariable() method", TEXT_VARIABLE_NAME, ceciSpy.validateVariable(TEXT_VARIABLE_NAME.substring(1), TEXT_VARIABLE_VALUE.toCharArray(), Integer.toString(TEXT_VARIABLE_VALUE.length()))); + Assert.assertEquals("Error in validateVariable() method", TEXT_VARIABLE_NAME, ceciSpy.validateVariable(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.toCharArray(), null)); + Assert.assertEquals("Error in validateVariable() method", TEXT_VARIABLE_NAME, ceciSpy.validateVariable(TEXT_VARIABLE_NAME, null, null)); + + String name = "&234567890"; + Assert.assertEquals("Error in validateVariable() method", name, ceciSpy.validateVariable(name, TEXT_VARIABLE_VALUE.toCharArray(), null)); + + name = "&azAZ09@#"; + Assert.assertEquals("Error in validateVariable() method", name, ceciSpy.validateVariable(name, TEXT_VARIABLE_VALUE.toCharArray(), null)); + } + + @Test + public void testValidateVariableException1() throws Exception { + String name = "&2345678901"; + String expectedMessage = "CECI variable name \"" + name + "\" greater than maximum length of 10 characters including the leading \"&\""; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.validateVariable(name, TEXT_VARIABLE_VALUE.toCharArray(), null); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testValidateVariableException2() throws Exception { + String name = "&?"; + String expectedMessage = "CECI variable name \"" + name + "\" invalid must. Must start with \"&\" and can contain one of more [a-zA-Z0-9@#]"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.validateVariable(name, TEXT_VARIABLE_VALUE.toCharArray(), null); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testValidateVariableException3() throws Exception { + String value = "123456789"; + String type = "H"; + int maxLength = 6; + String expectedMessage = "CECI variable value length " + value.length() + " greater than maximum of " + maxLength + " for type \"" + type + "\"" ; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.validateVariable(TEXT_VARIABLE_NAME, value.toCharArray(), type); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testValidateVariableException4() throws Exception { + String value = new String(new char[32768]).replace("\0", "X"); + String expectedMessage = "CECI variable value length " + value.length() + " greater than maximum 32767"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.validateVariable(TEXT_VARIABLE_NAME, value.toCharArray(), null); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testSetVariable() throws Exception { + setupTestVariable(); + Mockito.doReturn(TEXT_VARIABLE_VALUE.length()).when(ceciSpy).setVariableOnPage(Mockito.any(),Mockito.anyInt(),Mockito.anyInt()); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%-10s", "X")).thenReturn(String.format("%-10s", " ")); + Assert.assertEquals("Error in setVariable() method", TEXT_VARIABLE_VALUE.length(), ceciSpy.setVariable(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE, null)); + + Assert.assertEquals("Error in setVariable() method", TEXT_VARIABLE_VALUE.length(), ceciSpy.setVariable(TEXT_VARIABLE_NAME + "X", TEXT_VARIABLE_VALUE, null)); + + Assert.assertEquals("Error in setVariable() method", TEXT_VARIABLE_VALUE.length(), ceciSpy.setVariable(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE, "H")); + + int length = 1281; + Mockito.when(ceciSpy.setVariableOnPage(Mockito.any(), Mockito.anyInt(), Mockito.anyInt())).thenReturn(20).thenReturn(21); + Assert.assertEquals("Error in setVariable() method", length, ceciSpy.setVariable(TEXT_VARIABLE_NAME, new String(new char[length]).replace("\0", "X"), null)); + } + + @Test + public void testSetVariableException1() throws Exception { + setupTestVariable(); + Mockito.doReturn("PF").when(ceciTerminalMock).retrieveFieldAtCursor(); + String expectedMessage = "No space on CECI variable screen for new variables"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.setVariable(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE, null); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testSetVariableException2() throws Exception { + setupTestVariable(); + Mockito.doReturn(String.format("%-10s", " ")).when(ceciTerminalMock).retrieveFieldAtCursor(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); + String expectedMessage = "Unable to set CECI variable"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.setVariable(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE, null); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testSetVariableException3() throws Exception { + setupTestVariable(); + Mockito.doReturn(String.format("%-10s", " ")).when(ceciTerminalMock).retrieveFieldAtCursor(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); + String expectedMessage = "Unable to set CECI variable"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.setVariable(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE, null); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + private void setupTestVariable() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.doNothing().when(ceciSpy).deleteVariable(Mockito.any(),Mockito.any()); + Mockito.doReturn(ceciTerminalMock).when(ceciSpy).hexOff(); + Mockito.doReturn(ceciTerminalMock).when(ceciSpy).variableScreen(); + Mockito.doReturn(ceciTerminalMock).when(ceciSpy).moveToVariable(Mockito.any()); + } + + private void setTerminalMockOnCeciSpy() throws Exception{ + Field f1 = ceciSpy.getClass().getSuperclass().getDeclaredField("terminal"); + f1.setAccessible(true); + f1.set(ceciSpy,ceciTerminalMock); + } + + @Test + public void testSetVariableOnPage() throws Exception { + setTerminalMockOnCeciSpy(); + + String[] chunks = new String[] {TEXT_VARIABLE_VALUE, TEXT_VARIABLE_VALUE}; + int start = 0; + int numberOfLines = 1; + Assert.assertEquals("Error in setVariableOnPage() method", numberOfLines, ceciSpy.setVariableOnPage(chunks, start, numberOfLines)); + + numberOfLines = 2; + Assert.assertEquals("Error in setVariableOnPage() method", numberOfLines, ceciSpy.setVariableOnPage(chunks, start, numberOfLines)); + + chunks = new String[] {String.format("%-65s", "X"), TEXT_VARIABLE_VALUE}; + Assert.assertEquals("Error in setVariableOnPage() method", numberOfLines, ceciSpy.setVariableOnPage(chunks, start, numberOfLines)); + } + + @Test + public void testSetVariableOnPageException() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.when(ceciTerminalMock.type(Mockito.any())).thenThrow(new FieldNotFoundException()); + String expectedMessage = "Unable enter variable data"; + + String[] chunks = new String[] {TEXT_VARIABLE_VALUE, TEXT_VARIABLE_VALUE}; + int start = 0; + int numberOfLines = 1; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.setVariableOnPage(chunks, start, numberOfLines); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testSetVariableHex() throws Exception { + setupTestVariable(); + Mockito.doReturn(TEXT_VARIABLE_NAME.length()).when(ceciSpy).setVariableHexOnPage(Mockito.any(),Mockito.anyInt(),Mockito.anyInt()); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%-10s", "X")).thenReturn(String.format("%-10s", " ")); + Assert.assertEquals("Error in setVariableHex() method", TEXT_VARIABLE_VALUE.length(), ceciSpy.setVariableHex(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.toCharArray())); + + Assert.assertEquals("Error in setVariableHex() method", TEXT_VARIABLE_VALUE.length(), ceciSpy.setVariableHex(TEXT_VARIABLE_NAME + "X", TEXT_VARIABLE_VALUE.toCharArray())); + + int length = 21; + char[] value = new String(new char[length]).replace("\0", "X").toCharArray(); + Mockito.when(ceciSpy.setVariableHexOnPage(Mockito.any(), Mockito.anyInt(), Mockito.anyInt())).thenReturn(20).thenReturn(21); + Assert.assertEquals("Error in setVariableHex() method", length, ceciSpy.setVariableHex(TEXT_VARIABLE_NAME, value)); + } + + @Test + public void testSetVariableHexException1() throws Exception { + setupTestVariable(); + Mockito.doReturn("PF").when(ceciTerminalMock).retrieveFieldAtCursor(); + String expectedMessage = "No space on CECI variable screen for new variables"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.setVariableHex(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.toCharArray()); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testSetVariableHexException2() throws Exception { + setupTestVariable(); + Mockito.doReturn(String.format("%-10s", " ")).when(ceciTerminalMock).retrieveFieldAtCursor(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); + String expectedMessage = "Unable to set CECI binary variable"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.setVariableHex(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.toCharArray()); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testSetVariableHexException3() throws Exception { + setupTestVariable(); + Mockito.doReturn(String.format("%-10s", " ")).when(ceciTerminalMock).retrieveFieldAtCursor(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); + String expectedMessage = "Unable to set CECI binary variable"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.setVariableHex(TEXT_VARIABLE_NAME, TEXT_VARIABLE_VALUE.toCharArray()); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testSetVariableHexOnPage() throws Exception { + setTerminalMockOnCeciSpy(); + + char[] value = TEXT_VARIABLE_VALUE.toCharArray(); + int start = 0; + int numberOfLines = 1; + Assert.assertEquals("Error in setVariableHexOnPage() method", value.length, ceciSpy.setVariableHexOnPage(value, start, numberOfLines)); + + value = new String(new char[32]).replace("\0", "X").toCharArray(); + numberOfLines = 2; + Assert.assertEquals("Error in setVariableHexOnPage() method", value.length, ceciSpy.setVariableHexOnPage(value, start, numberOfLines)); + + numberOfLines = -1; + Assert.assertEquals("Error in setVariableHexOnPage() method", 0, ceciSpy.setVariableHexOnPage(value, start, numberOfLines)); + + value = new char[0]; + numberOfLines = -1; + Assert.assertEquals("Error in setVariableHexOnPage() method", value.length, ceciSpy.setVariableHexOnPage(value, start, numberOfLines)); + } + + @Test + public void testSetVariableHexOnPageException() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.when(ceciTerminalMock.type(Mockito.any())).thenThrow(new FieldNotFoundException()); + String expectedMessage = "Unable enter variable data"; + + char[] value = TEXT_VARIABLE_VALUE.toCharArray(); + int start = 0; + int numberOfLines = 1; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.setVariableHexOnPage(value, start, numberOfLines); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testGetVariable() throws Exception { + setupTestGetVariable(); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%+06d", TEXT_VARIABLE_VALUE.length())); + Mockito.doReturn(TEXT_VARIABLE_VALUE).when(ceciSpy).getVariableFromPage(Mockito.anyInt(),Mockito.anyInt()); + + Assert.assertEquals("Error in getVariable() method", TEXT_VARIABLE_VALUE, ceciSpy.getVariable(TEXT_VARIABLE_NAME, null)); + + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%+06d", TEXT_VARIABLE_VALUE.length()*2)); + Assert.assertEquals("Error in getVariable() method", TEXT_VARIABLE_VALUE + TEXT_VARIABLE_VALUE, ceciSpy.getVariable(TEXT_VARIABLE_NAME, null)); + + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn("H"); + String value = String.format("%012d", 0); + Mockito.doReturn(value).when(ceciSpy).getVariableFromPage(Mockito.anyInt(),Mockito.anyInt()); + Assert.assertEquals("Error in getVariable() method", value, ceciSpy.getVariable(TEXT_VARIABLE_NAME, "H")); + } + + @Test + public void testGetVariableException1() throws Exception { + setupTestGetVariable(); + String lengthString = "XXXX"; + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(lengthString); + String expectedMessage = "Unexpected variable type \"" + lengthString + "\" for \"" + TEXT_VARIABLE_NAME + "\""; + String type = "H"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.getVariable(TEXT_VARIABLE_NAME, type); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testGetVariableException2() throws Exception { + setupTestGetVariable(); + String lengthString = "XXXX"; + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(lengthString); + String expectedMessage = "Unable to determine variable field length"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.getVariable(TEXT_VARIABLE_NAME, null); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testGetVariableException3() throws Exception { + setupTestGetVariable(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); + String expectedMessage = "Unable to get CECI variable"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.getVariable(TEXT_VARIABLE_NAME, null); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testGetVariableException4() throws Exception { + setupTestGetVariable(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); + String expectedMessage = "Unable to get CECI variable"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.getVariable(TEXT_VARIABLE_NAME, null); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + private void setupTestGetVariable() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.doReturn(ceciTerminalMock).when(ceciSpy).moveToVariable(Mockito.any()); + } + + @Test + public void getVariableFromPage() throws Exception { + setupTestGetVariable(); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(TEXT_VARIABLE_VALUE); + + Assert.assertEquals("Error in getVariableFromPage() method", TEXT_VARIABLE_VALUE, ceciSpy.getVariableFromPage(TEXT_VARIABLE_VALUE.length(), 1)); + Assert.assertEquals("Error in getVariableFromPage() method", TEXT_VARIABLE_VALUE, ceciSpy.getVariableFromPage(TEXT_VARIABLE_VALUE.length()*2, 1)); + + } + + @Test + public void getVariableFromPageException1() throws Exception { + setupTestGetVariable(); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(TEXT_VARIABLE_VALUE); + Mockito.when(ceciTerminalMock.tab()).thenThrow(new FieldNotFoundException()); + String expectedMessage = "Unable to get variable from page"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.getVariableFromPage(1, 1); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + + } + + @Test + public void testGetVariableHex() throws Exception { + setupTestGetVariable(); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%+06d", TEXT_VARIABLE_VALUE.length())).thenReturn(TEXT_VARIABLE_VALUE); + Mockito.doReturn(TEXT_VARIABLE_VALUE).when(ceciSpy).getVariableHexFromPage(Mockito.anyInt(),Mockito.anyInt()); + + Assert.assertTrue("Error in getVariableHex() method", Arrays.equals(TEXT_VARIABLE_VALUE.toCharArray(), ceciSpy.getVariableHex(TEXT_VARIABLE_VALUE))); + + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%+06d", TEXT_VARIABLE_VALUE.length()*2)).thenReturn(TEXT_VARIABLE_VALUE); + Assert.assertTrue("Error in getVariableHex() method", Arrays.equals((TEXT_VARIABLE_VALUE + TEXT_VARIABLE_VALUE).toCharArray(), ceciSpy.getVariableHex(TEXT_VARIABLE_VALUE))); + } + + @Test + public void testGetVariableHexException1() throws Exception { + setupTestGetVariable(); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn("XXXX"); + String expectedMessage = "Unable to determine variable field length"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.getVariableHex(TEXT_VARIABLE_VALUE); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testGetVariableHexException2() throws Exception { + setupTestGetVariable(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); + String expectedMessage = "Unable to get CECI binary variable"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.getVariableHex(TEXT_VARIABLE_VALUE); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testGetVariableHexException3() throws Exception { + setupTestGetVariable(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); + String expectedMessage = "Unable to get CECI binary variable"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.getVariableHex(TEXT_VARIABLE_VALUE); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testGetVariableHexPage() throws Exception { + setupTestGetVariable(); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn("5A5A5A5A"); + + Assert.assertEquals("Error in getVariableHexFromPage() method", "ZZZZ", ceciSpy.getVariableHexFromPage(4, 1)); + Assert.assertEquals("Error in getVariableHexFromPage() method", "ZZZZZZZZZZZZZZZZ", ceciSpy.getVariableHexFromPage(20, 1)); + } + + @Test + public void testGetVariableHexPageException1() throws Exception { + setupTestGetVariable(); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn("5A5A5A5A"); + Mockito.when(ceciTerminalMock.tab()).thenThrow(new FieldNotFoundException()); + String expectedMessage = "Unable to get binary variable from page"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.getVariableHexFromPage(4, 1); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testMoveToVariable() throws Exception { + setupMoveToVariable(); + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(TEXT_VARIABLE_NAME + " "); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn(String.format("%-10s", "X")).thenReturn(String.format("%-10s", TEXT_VARIABLE_NAME)); + + Assert.assertEquals("Error in moveToVariable() method", ceciTerminalMock, ceciSpy.moveToVariable(TEXT_VARIABLE_NAME)); + } + + @Test + public void testMoveToVariableException1() throws Exception { + setupMoveToVariable(); + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(" "); + String expectedMessage = "Unable to find variable " + TEXT_VARIABLE_NAME; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.moveToVariable(TEXT_VARIABLE_NAME); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testMoveToVariableException2() throws Exception { + setupMoveToVariable(); + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(TEXT_VARIABLE_NAME + " "); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn("PF"); + String expectedMessage = "Unable to find variable " + TEXT_VARIABLE_NAME; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.moveToVariable(TEXT_VARIABLE_NAME); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testMoveToVariableException3() throws Exception { + setupMoveToVariable(); + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(TEXT_VARIABLE_NAME + " "); + Mockito.when(ceciTerminalMock.newLine()).thenThrow(new FieldNotFoundException()); + String expectedMessage = "Problem serching for variable " + TEXT_VARIABLE_NAME; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.moveToVariable(TEXT_VARIABLE_NAME); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + private void setupMoveToVariable() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.doReturn(ceciTerminalMock).when(ceciSpy).hexOff(); + Mockito.doReturn(ceciTerminalMock).when(ceciSpy).variableScreen(); + } + + @Test + public void testIsHexOn() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(" EIBTIME = X'00"); + Assert.assertTrue("Error in isHexOn() method", ceciSpy.isHexOn()); + } + + @Test + public void testIsHexOnException1() throws Exception, CeciException, TimeoutException, KeyboardLockedException, TerminalInterruptedException { + setTerminalMockOnCeciSpy(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); + String expectedMessage = "Unable to determine if CECI is in HEX mode"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.isHexOn(); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testIsHexOnException2() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); + String expectedMessage = "Unable to determine if CECI is in HEX mode"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.isHexOn(); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testHexOn() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.doReturn(true).when(ceciSpy).isHexOn(); + + Assert.assertEquals("Error in hexOn() method", ceciTerminalMock, ceciSpy.hexOn()); + + Mockito.doReturn(false).when(ceciSpy).isHexOn(); + Assert.assertEquals("Error in hexOn() method", ceciTerminalMock, ceciSpy.hexOn()); + } + + @Test + public void testHexOnException1() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.doReturn(false).when(ceciSpy).isHexOn(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); + String expectedMessage = "Unable to set CECI HEX ON"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.hexOn(); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testHexOnException2() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.doReturn(false).when(ceciSpy).isHexOn(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); + String expectedMessage = "Unable to set CECI HEX ON"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.hexOn(); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testHexOff() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.doReturn(true).when(ceciSpy).isHexOn(); + + Assert.assertEquals("Error in hexOff() method", ceciTerminalMock, ceciSpy.hexOff()); + + Mockito.doReturn(false).when(ceciSpy).isHexOn(); + Assert.assertEquals("Error in hexOff() method", ceciTerminalMock, ceciSpy.hexOff()); + } + + @Test + public void testHexOffException1() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.doReturn(true).when(ceciSpy).isHexOn(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); + String expectedMessage = "Unable to set CECI HEX OFF"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.hexOff(); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testHexOffException2() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.doReturn(true).when(ceciSpy).isHexOn(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); + String expectedMessage = "Unable to set CECI HEX OFF"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.hexOff(); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testNewCeciResponse() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn(" RESPONSE: FILENOTFOUND EIBRESP=+0000000012 EIBRESP2=+0000000001 "); + Mockito.doReturn(new LinkedHashMap<>()).when(ceciSpy).parseResponseOutput(); + + ICeciResponse ceciResponse = ceciSpy.newCeciResponse(false); + + ceciSpy.newCeciResponse(true); + Assert.assertEquals("Error in newCeciResponse() method", "FILENOTFOUND", ceciResponse.getResponse()); + Assert.assertEquals("Error in newCeciResponse() method", 12, ceciResponse.getEIBRESP()); + Assert.assertEquals("Error in newCeciResponse() method", 1, ceciResponse.getEIBRESP2()); + } + + @Test + public void testParseResponseOutput() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.doReturn(ceciTerminalMock).when(ceciSpy).multipleTab(Mockito.anyInt()); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn("OPTION1").thenReturn("OPTION2"); + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn("OPTION= OPTION1 LENGTH= +00008 ").thenReturn("OPTION= OPTION2 LENGTH= +00008 "); + Mockito.doReturn(new ResponseOutputValueImpl("XXXXXXXX")).when(ceciSpy).getOptionValue(Mockito.any()); + + Assert.assertTrue("Error in parseResponseOutput() method", ceciSpy.parseResponseOutput().containsKey("OPTION1")); + + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn("OPTION3").thenReturn("OPTION4").thenReturn("PF"); + Mockito.when(ceciTerminalMock.retrieveScreen()).thenReturn("OPTION= OPTION3 LENGTH= +00008 ").thenReturn("OPTION= OPTION4 LENGTH= +00008 "); + Assert.assertTrue("Error in parseResponseOutput() method", ceciSpy.parseResponseOutput().containsKey("OPTION4")); + } + + @Test + public void testParseResponseOutputException1() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn("OPTION1"); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); + String expectedMessage = "Unable to parse command output"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.parseResponseOutput(); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testParseResponseOutputException2() throws Exception { + setTerminalMockOnCeciSpy(); + Mockito.when(ceciTerminalMock.retrieveFieldAtCursor()).thenReturn("OPTION1"); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); + String expectedMessage = "Unable to parse command output"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.parseResponseOutput(); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testGetOptionValue() throws Exception { + setupTestGetVariable(); + String value = "000000"; + Mockito.doReturn(value).when(ceciSpy).getVariableFromPage(Mockito.anyInt(),Mockito.anyInt()); + String screen = "OPTION= LENGTH LENGTH= H "; + Assert.assertEquals("Error in getOptionValue() method", value, ceciSpy.getOptionValue(screen).getTextValue()); + + Mockito.doReturn("000").when(ceciSpy).getVariableFromPage(Mockito.anyInt(),Mockito.anyInt()); + Assert.assertEquals("Error in getOptionValue() method", value, ceciSpy.getOptionValue(screen).getTextValue()); + + screen = "OPTION= FROM LENGTH= +00001 "; + Mockito.doReturn("F1").when(ceciSpy).getOptionValueInHex(Mockito.anyInt(),Mockito.anyInt()); + Assert.assertTrue("Error in getOptionValue() method", Arrays.equals(new char[] {'F', '1'}, ceciSpy.getOptionValue(screen).getHexValue())); + } + + @Test + public void testGetOptionValueException1() throws Exception { + setupTestGetVariable(); + Mockito.doReturn("000").when(ceciSpy).getVariableFromPage(Mockito.anyInt(),Mockito.anyInt()); + String screen = "OPTION= LENGTH LENGTH= H "; + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); + String expectedMessage = "Unable to parse command output option value"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.getOptionValue(screen); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testGetOptionValueException2() throws Exception { + setupTestGetVariable(); + Mockito.doReturn("000").when(ceciSpy).getVariableFromPage(Mockito.anyInt(),Mockito.anyInt()); + String screen = "OPTION= LENGTH LENGTH= H "; + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); + String expectedMessage = "Unable to parse command output option value"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.getOptionValue(screen); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testGetOptionValueInHex() throws Exception { + setupTestGetVariable(); + String value = "F1F1"; + Mockito.doReturn(value).when(ceciSpy).getVariableHexFromPage(Mockito.anyInt(),Mockito.anyInt()); + + Assert.assertEquals("Error in getOptionValue() method", value, ceciSpy.getOptionValueInHex(1, 0)); + + Assert.assertEquals("Error in getOptionValue() method", value, ceciSpy.getOptionValueInHex(1, 1)); + + Assert.assertEquals("Error in getOptionValue() method", value, ceciSpy.getOptionValueInHex(2, 0)); + + Assert.assertEquals("Error in getOptionValue() method", value + value, ceciSpy.getOptionValueInHex(5, 0)); + } + + @Test + public void testGetOptionValueInHexException1() throws Exception { + setupTestGetVariable(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TerminalInterruptedException()); + String expectedMessage = "Unable to parse command output binary option value"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.getOptionValueInHex(1, 0); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } + + @Test + public void testGetOptionValueInHexException2() throws Exception { + setupTestGetVariable(); + Mockito.when(ceciTerminalMock.waitForKeyboard()).thenThrow(new TimeoutException()); + String expectedMessage = "Unable to parse command output binary option value"; + CeciException expectedException = Assert.assertThrows("expected exception should be thrown", CeciException.class, ()->{ + ceciSpy.getOptionValueInHex(1, 0); + }); + Assert.assertEquals("exception should contain expected cause", expectedMessage, expectedException.getMessage()); + } } From 08930cb8ef57af32cfce74e4ea27488bf56ed8b9 Mon Sep 17 00:00:00 2001 From: Will Yates Date: Wed, 7 Dec 2022 14:41:57 +0000 Subject: [PATCH 038/263] Iss1091 (#833) * bump level of okhttp Signed-off-by: Will Yates * bump levels of okhttp - post test Signed-off-by: Will Yates Signed-off-by: Will Yates --- .../dev.galasa.selenium.manager/bnd.bnd | 5 +++-- .../dev.galasa.selenium.manager/build.gradle | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/bnd.bnd index 67add6b33..a941c8c5d 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/bnd.bnd @@ -51,8 +51,9 @@ Embed-Dependency: *;scope=compile guava-30.1.1-jre.jar; lib:=true,\ j2objc-annotations-1.3.jar; lib:=true,\ jsr305-3.0.2.jar; lib:=true,\ - okhttp-3.11.0.jar; lib:=true,\ - okio-1.14.0.jar; lib:=true,\ + okhttp-4.10.0.jar; lib:=true,\ + okio-jvm-3.0.0.jar; lib:=true,\ + kotlin-osgi-bundle-1.7.22.jar; lib:=true,\ selenium-api-3.141.59.jar; lib:=true,\ selenium-chrome-driver-3.141.59.jar; lib:=true,\ selenium-edge-driver-3.141.59.jar; lib:=true,\ diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle index 9ff7adc70..54414af1f 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle @@ -22,10 +22,12 @@ dependencies { api 'org.seleniumhq.selenium:selenium-firefox-driver:3.141.59' api 'org.seleniumhq.selenium:selenium-remote-driver:3.141.59' implementation 'com.google.guava:guava:30.1.1-jre' - implementation 'com.squareup.okhttp3:okhttp:3.11.0' - implementation 'com.squareup.okio:okio:1.14.0' + implementation 'com.squareup.okhttp3:okhttp:4.10.0' + implementation 'com.squareup.okio:okio-jvm:3.0.0' + implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle:1.7.22' implementation 'net.bytebuddy:byte-buddy:1.8.15' implementation 'org.apache.commons:commons-exec:1.3' implementation 'commons-io:commons-io:2.6' implementation 'com.google.code.gson:gson:2.8.9' } + From b39d0afe597c231cfe653067eff69de2b15c5501 Mon Sep 17 00:00:00 2001 From: Will Yates Date: Thu, 8 Dec 2022 09:13:27 +0000 Subject: [PATCH 039/263] Iss1288 (#834) * Increase tracing and keyboard waits Signed-off-by: Will Yates * add extra informational logging Signed-off-by: Will Yates Signed-off-by: Will Yates --- .../vtp/manager/internal/VtpManagerImpl.java | 2 ++ .../manager/internal/VtpTxnRecorderImpl.java | 31 +++++++++++++++---- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpManagerImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpManagerImpl.java index 98d9005cc..1cb6d20d8 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpManagerImpl.java @@ -89,8 +89,10 @@ public void provisionGenerate() throws ManagerException, ResourceUnavailableExce boolean useAPI = VtpAPI.get(); if(useAPI) { + logger.info("VTP Manager will use the VTP API for recordings"); this.recorder = new VtpApiRecorderImp(recordingRegions, this.dumpDataSetHLQ, logger, this); }else { + logger.info("VTP Manager will use the VTP txns for recordings"); this.recorder = new VtpTxnRecorderImpl(recordingRegions, this.dumpDataSetHLQ, logger, this); } } diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpTxnRecorderImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpTxnRecorderImpl.java index 17cc19b2c..f3fb088da 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpTxnRecorderImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpTxnRecorderImpl.java @@ -24,7 +24,7 @@ public VtpTxnRecorderImpl(HashMap recordingRegions, void startRecording() { for(ICicsRegion region : recordingRegions.keySet()) { ICicsTerminal terminal = recordingRegions.get(region).getRecordingTerminal(); - logger.info("Starting VTP Recording"); + logger.info("Starting VTP Recording for region: " + region.getApplid()); try { startRecordingUsingTxn(region, terminal); }catch(VtpManagerException e) { @@ -38,8 +38,13 @@ private void startRecordingUsingTxn(ICicsRegion region, ICicsTerminal terminal) String command = "BZUT " + transaction; String expectedResponse = "RECORDING STARTED FOR TRANSACTION " + transaction; try { + logger.trace("Waiting for keyboard to be ready"); + terminal.waitForKeyboard(); + logger.trace("Entering command to start recording: " + command); terminal.type(command).enter(); + logger.trace("Waiting for response: " + expectedResponse); terminal.waitForTextInField(expectedResponse); + logger.trace("Resetting terminal"); terminal.clear().wfk(); } catch (Zos3270Exception e) { throw new VtpManagerException("Error when starting recording for region: " + region.getApplid(), e); @@ -61,9 +66,16 @@ void endRecording() { } private void stopRecordingUsingTxn(ICicsRegion region, ICicsTerminal terminal) throws VtpManagerException{ + String command = "BZUE"; + String expectedResponse = "RECORDING STOPPED"; try { - terminal.type("BZUE").enter(); - terminal.waitForTextInField("RECORDING STOPPED"); + logger.trace("Waiting for keyboard to be ready"); + terminal.waitForKeyboard(); + logger.trace("Entering command to start recording: " + command); + terminal.type(command).enter(); + logger.trace("Waiting for response: " + expectedResponse); + terminal.waitForTextInField(expectedResponse); + logger.trace("Resetting terminal"); terminal.clear().wfk(); } catch (Zos3270Exception e) { throw new VtpManagerException(e); @@ -74,7 +86,7 @@ private void stopRecordingUsingTxn(ICicsRegion region, ICicsTerminal terminal) t void writeRecording() { for(ICicsRegion region : recordingRegions.keySet()) { ICicsTerminal terminal = recordingRegions.get(region).getRecordingTerminal(); - logger.info("Writing VTP Recording"); + logger.info("Writing VTP Recording for region: " + region.getApplid()); try { writeRecordingUsingTxn(region, terminal); } catch (VtpManagerException e) { @@ -84,9 +96,16 @@ void writeRecording() { } private void writeRecordingUsingTxn(ICicsRegion region, ICicsTerminal terminal) throws VtpManagerException{ + String command = "BZUW"; + String expectedResponse = "RECORDS WRITTEN"; try { - terminal.type("BZUW").enter(); - terminal.waitForTextInField("RECORDS WRITTEN"); + logger.trace("Waiting for keyboard to be ready"); + terminal.waitForKeyboard(); + logger.trace("Entering command to start recording: " + command); + terminal.type(command).enter(); + logger.trace("Waiting for response: " + expectedResponse); + terminal.waitForTextInField(expectedResponse); + logger.trace("Resetting terminal"); terminal.clear().wfk(); } catch (Zos3270Exception e) { From 89cc61b5074ef88f06345ed43d8de1135abdbd34 Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Tue, 13 Dec 2022 17:19:42 +0000 Subject: [PATCH 040/263] Issue 1247 changes Signed-off-by: Savvas Kyriacou --- .../dev.galasa.common/.gitignore | 4 ++ .../dev.galasa.common/bnd.bnd | 8 ++++ .../dev.galasa.common/build.gradle | 9 ++++ .../dev.galasa.common/settings.gradle | 1 + .../common/SSLTLSContextNameSelector.java | 31 ++++++++++++ .../common/SSLTLSContextNameSelectorTest.java | 47 +++++++++++++++++++ .../dev.galasa.http.manager/build.gradle | 1 + .../galasa/http/internal/HttpClientImpl.java | 31 ++++-------- .../dev.galasa.zos3270.manager/build.gradle | 2 +- .../zos3270/internal/comms/Network.java | 26 ++++------ 10 files changed, 121 insertions(+), 39 deletions(-) create mode 100644 galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/.gitignore create mode 100644 galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/bnd.bnd create mode 100644 galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/build.gradle create mode 100644 galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/settings.gradle create mode 100644 galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/src/main/java/dev/galasa/common/SSLTLSContextNameSelector.java create mode 100644 galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/src/test/java/dev/galasa/common/SSLTLSContextNameSelectorTest.java diff --git a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/.gitignore b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/.gitignore new file mode 100644 index 000000000..29df26c1a --- /dev/null +++ b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/.gitignore @@ -0,0 +1,4 @@ +/.apt_generated/ +/.apt_generated_tests/ +/target/ +bin/ diff --git a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/bnd.bnd b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/bnd.bnd new file mode 100644 index 000000000..a76c2c889 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/bnd.bnd @@ -0,0 +1,8 @@ +-snapshot: ${tstamp} +Bundle-Name: Manager Common +Export-Package: dev.galasa.common +Import-Package: dev.galasa,\ + dev.galasa.framework.spi,\ + dev.galasa.framework.spi.language, + + diff --git a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/build.gradle b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/build.gradle new file mode 100644 index 000000000..4803ddc29 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/build.gradle @@ -0,0 +1,9 @@ +plugins { + id 'galasa.manager' +} + +description = 'Manager Common' + +version = '0.25.0' + + diff --git a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/settings.gradle b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/settings.gradle new file mode 100644 index 000000000..a2a1c419a --- /dev/null +++ b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'dev.galasa.common' \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/src/main/java/dev/galasa/common/SSLTLSContextNameSelector.java b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/src/main/java/dev/galasa/common/SSLTLSContextNameSelector.java new file mode 100644 index 000000000..5d1258454 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/src/main/java/dev/galasa/common/SSLTLSContextNameSelector.java @@ -0,0 +1,31 @@ +/* + * Copyright contributors to the Galasa project + */ +package dev.galasa.common; + +import java.util.Properties; + +public class SSLTLSContextNameSelector { + + public static final String JAVA_VENDOR_PROPERTY = "java.vendor"; + public static final String JAVA_VERSION_PROPERTY = "java.version"; + + public String getSelectedSSLContextName() { + return getSelectedSSLContextName(System.getProperties()); + } + public String getSelectedSSLContextName( Properties props ) { + boolean ibmJdk = props.getProperty(JAVA_VENDOR_PROPERTY).contains("IBM"); + String name ; + if (ibmJdk) { + if (props.getProperty(JAVA_VERSION_PROPERTY).startsWith("8.")) { + name="SSL_TLSv2"; + }else { + name ="TLSv1.2"; + } + } else { + name = "TLSv1.2"; + } + return name ; + } + +} diff --git a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/src/test/java/dev/galasa/common/SSLTLSContextNameSelectorTest.java b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/src/test/java/dev/galasa/common/SSLTLSContextNameSelectorTest.java new file mode 100644 index 000000000..b683c84a7 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/src/test/java/dev/galasa/common/SSLTLSContextNameSelectorTest.java @@ -0,0 +1,47 @@ +/* + * Copyright contributors to the Galasa project + */ +package dev.galasa.common; + +import org.junit.Test; + +import static org.junit.Assert.* ; +import java.util.Properties; + +public class SSLTLSContextNameSelectorTest { + @Test + public void testNonIBMJVMGivesTLS12Context() throws Exception { + Properties testProps = new Properties(); + testProps.setProperty(SSLTLSContextNameSelector.JAVA_VENDOR_PROPERTY,"FakeJavaRuntimeVendorName" ); + // When... + String contextName = new SSLTLSContextNameSelector().getSelectedSSLContextName(testProps); + // Then... + String expected = "TLSv1.2"; + assertEquals(expected,contextName); + } + @Test + public void testIBMJVM8GivesSSL_TLSv2Context() throws Exception { + // Given... + Properties testProps = new Properties(); + testProps.setProperty(SSLTLSContextNameSelector.JAVA_VENDOR_PROPERTY,"IBMJavaRuntimeVendorName" ); + testProps.setProperty(SSLTLSContextNameSelector.JAVA_VERSION_PROPERTY, "8.0.16"); + // When... + String contextName = new SSLTLSContextNameSelector().getSelectedSSLContextName(testProps); + // Then... + String expected = "SSL_TLSv2"; + assertEquals(expected,contextName); + } + + @Test + public void testIBMJVM11GivesTLSv12Context() throws Exception { + // Given... + Properties testProps = new Properties(); + testProps.setProperty(SSLTLSContextNameSelector.JAVA_VENDOR_PROPERTY,"IBMJavaRuntimeVendorName" ); + testProps.setProperty(SSLTLSContextNameSelector.JAVA_VERSION_PROPERTY, "11.0.16.1+1"); + // When... + String contextName = new SSLTLSContextNameSelector().getSelectedSSLContextName(testProps); + // Then... + String expected = "TLSv1.2"; + assertEquals(expected,contextName); + } +} \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle index 45d12eccb..5e61f16e4 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle @@ -18,4 +18,5 @@ dependencies { strictly "[1.15]" } } + implementation project (':galasa-managers-common-parent:dev.galasa.common') } diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientImpl.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientImpl.java index c3227d4c8..06914da8b 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientImpl.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientImpl.java @@ -68,6 +68,7 @@ import com.google.gson.JsonObject; +import dev.galasa.common.SSLTLSContextNameSelector; import dev.galasa.http.ContentType; import dev.galasa.http.HttpClientException; import dev.galasa.http.HttpClientResponse; @@ -78,7 +79,7 @@ public class HttpClientImpl implements IHttpClient { - private static final String JAVA_VENDOR_PROPERTY = "java.vendor"; + private CloseableHttpClient httpClient; protected URI host = null; @@ -96,6 +97,8 @@ public class HttpClientImpl implements IHttpClient { private Log logger; + private SSLTLSContextNameSelector nameSelector = new SSLTLSContextNameSelector(); + public HttpClientImpl(int timeout, Log log) { this.timeout = timeout; this.logger = log; @@ -356,26 +359,21 @@ public void addOkResponseCode(int responseCode) { * @throws HttpClientException */ public IHttpClient setTrustingSSLContext() throws HttpClientException { - try { - boolean ibmJdk = System.getProperty(JAVA_VENDOR_PROPERTY).contains("IBM"); - SSLContext sslContext; - if (ibmJdk) - sslContext = SSLContext.getInstance("SSL_TLSv2"); // NOSONAR - else - sslContext = SSLContext.getInstance("TLSv1.2"); + String contextName = nameSelector.getSelectedSSLContextName(); + SSLContext sslContext = SSLContext.getInstance(contextName); sslContext.init(null, new TrustManager[] { new VeryTrustingTrustManager() }, new SecureRandom()); setSSLContext(sslContext); } catch (GeneralSecurityException e) { throw new HttpClientException("Error attempting to create SSL context", e); } - return this; } + /** * Set up Client Authentication SSL Context and install - * + * * @param clientKeyStore * @param serverKeyStore * @param alias @@ -385,29 +383,20 @@ public IHttpClient setTrustingSSLContext() throws HttpClientException { */ public IHttpClient setupClientAuth(KeyStore clientKeyStore, KeyStore serverKeyStore, String alias, String password) throws HttpClientException { - try { // Create the Key Manager Factory KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()); kmf.init(clientKeyStore, password.toCharArray()); - // Create the Trust Managers TrustManager[] trustManagers = { new ClientAuthTrustManager(serverKeyStore, alias) }; - // Create the SSL Context - boolean ibmJdk = System.getProperty(JAVA_VENDOR_PROPERTY).contains("IBM"); - SSLContext sslContext; - if (ibmJdk) - sslContext = SSLContext.getInstance("SSL_TLSv2"); // NOSONAR - else - sslContext = SSLContext.getInstance("TLSv1.2"); + String contextName = nameSelector.getSelectedSSLContextName(); + SSLContext sslContext = SSLContext.getInstance(contextName); sslContext.init(kmf.getKeyManagers(), trustManagers, null); - setSSLContext(sslContext); } catch (GeneralSecurityException e) { throw new HttpClientException("Error attempting to create SSL context", e); } - return this; } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle index 63e174481..9e84c6e0a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle @@ -13,5 +13,5 @@ dependencies { implementation 'com.google.code.gson:gson:2.8.9' implementation 'commons-codec:commons-codec:1.15' implementation 'commons-io:commons-io:2.9.0' - + implementation project (':galasa-managers-common-parent:dev.galasa.common') } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/Network.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/Network.java index a52573ed8..f6eb544bd 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/Network.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/Network.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.internal.comms; @@ -21,6 +19,8 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; +import dev.galasa.common.SSLTLSContextNameSelector; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -48,6 +48,8 @@ public class Network { private boolean basicTelnet = false; + private SSLTLSContextNameSelector nameSelector = new SSLTLSContextNameSelector(); + public Network(String host, int port, String terminalId) { this(host, port, false, terminalId); } @@ -113,13 +115,8 @@ public Socket createSocket() throws IOException, NoSuchAlgorithmException, KeyMa if (!ssl) { newSocket = new Socket(this.host, this.port); } else { - boolean ibmJdk = System.getProperty("java.vendor").contains("IBM"); - SSLContext sslContext; - if (ibmJdk) { - sslContext = SSLContext.getInstance("SSL_TLSv2"); - } else { - sslContext = SSLContext.getInstance("TLSv1.2"); - } + String contextName = nameSelector.getSelectedSSLContextName(); + SSLContext sslContext = SSLContext.getInstance(contextName); sslContext.init(null, new TrustManager[] { new TrustAllCerts() }, new java.security.SecureRandom()); newSocket = sslContext.getSocketFactory().createSocket(this.host, this.port); ((SSLSocket) newSocket).startHandshake(); @@ -153,13 +150,8 @@ public InputStream getInputStream() { public Socket startTls() throws NetworkException { try { - boolean ibmJdk = System.getProperty("java.vendor").contains("IBM"); - SSLContext sslContext; - if (ibmJdk) { - sslContext = SSLContext.getInstance("SSL_TLSv2"); - } else { - sslContext = SSLContext.getInstance("TLSv1.2"); - } + String contextName = nameSelector.getSelectedSSLContextName(); + SSLContext sslContext = SSLContext.getInstance(contextName); sslContext.init(null, new TrustManager[] { new TrustAllCerts() }, new java.security.SecureRandom()); Socket tlsSocket = sslContext.getSocketFactory().createSocket(socket, this.host, this.port, false); ((SSLSocket) tlsSocket).startHandshake(); From d62dc4eab6cbe1c983362e253037e6912c013121 Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Tue, 13 Dec 2022 17:22:35 +0000 Subject: [PATCH 041/263] Corrected settings.gradle Signed-off-by: Savvas Kyriacou --- galasa-managers-parent/settings.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/galasa-managers-parent/settings.gradle b/galasa-managers-parent/settings.gradle index e965bcbf8..988c9d372 100644 --- a/galasa-managers-parent/settings.gradle +++ b/galasa-managers-parent/settings.gradle @@ -13,6 +13,8 @@ pluginManagement { rootProject.name = 'galasa-managers-parent' +// galasa-managers-common-parent +include 'galasa-managers-common-parent:dev.galasa.common' // galasa-managers-core-parent include 'galasa-managers-core-parent:dev.galasa.core.manager' include 'galasa-managers-core-parent:dev.galasa.artifact.manager' From 850d99fda104a7233512b4d368f040ee5ecb49d0 Mon Sep 17 00:00:00 2001 From: Will Yates Date: Thu, 22 Dec 2022 09:37:33 +0000 Subject: [PATCH 042/263] bump cicstsmanager (#840) --- .../dev.galasa.cicsts.manager/build.gradle | 2 +- .../dev.galasa.galasaecosystem.manager/build.gradle | 2 +- release.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle index 072701f27..265477375 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa CICS/TS Manager' -version = '0.24.0' +version = '0.25.0' dependencies { api project (':galasa-managers-zos-parent:dev.galasa.zos.manager') diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle index 67b270b8f..85a88dea3 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle @@ -17,6 +17,6 @@ dependencies { api project(':galasa-managers-unix-parent:dev.galasa.linux.manager') api project(':galasa-managers-windows-parent:dev.galasa.windows.manager') api project(':galasa-managers-zos-parent:dev.galasa.zos.manager') - implementation 'org.yaml:snakeyaml:1.30' + implementation 'org.yaml:snakeyaml:1.31' implementation 'com.google.code.gson:gson:2.8.9' } diff --git a/release.yaml b/release.yaml index 2f72efc09..28bdef7ea 100644 --- a/release.yaml +++ b/release.yaml @@ -29,7 +29,7 @@ managers: isolated: true - artifact: dev.galasa.cicsts.manager - version: 0.24.0 + version: 0.25.0 obr: true mvp: true javadoc: true From a7b1eee24c365e187261f7057fe76757a25dc3c6 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Fri, 23 Dec 2022 09:25:48 +0000 Subject: [PATCH 043/263] Bump client-java to 17.0.0 (#841) * Bump client-java to 17.0.0 Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> * Fix gson osgi error Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../dev.galasa.kubernetes.manager/bnd.bnd | 45 +++++++++---------- .../build.gradle | 31 ++++++------- 2 files changed, 34 insertions(+), 42 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd index 09d7f1e2c..8e99129c7 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd @@ -1,10 +1,7 @@ -snapshot: ${tstamp} Bundle-Name: Galasa Kubernetes Manager Export-Package: dev.galasa.kubernetes,dev.galasa.kubernetes.spi -Import-Package: com.google.gson,\ - com.google.gson.reflect,\ - com.google.gson.stream,\ - dev.galasa,\ +Import-Package: dev.galasa,\ dev.galasa.framework,\ dev.galasa.framework.spi,\ dev.galasa.framework.spi.cps,\ @@ -24,29 +21,29 @@ Import-Package: com.google.gson,\ org.xml.sax.helpers Embed-Transitive: true Embed-Dependency: *;scope=compile --includeresource: bcpkix-jdk15on-1.69.jar; lib:=true,\ - bcprov-ext-jdk15on-1.69.jar; lib:=true,\ - bcprov-jdk15on-1.69.jar; lib:=true,\ - client-java-16.0.2.jar; lib:=true,\ - client-java-api-16.0.2.jar; lib:=true,\ - client-java-proto-16.0.2.jar; lib:=true,\ +-includeresource: bcpkix-jdk18on-1.72.jar; lib:=true,\ + bcprov-jdk18on-1.72.jar; lib:=true,\ + bcutil-jdk18on-1.72.jar; lib:=true,\ + client-java-17.0.0.jar; lib:=true,\ + client-java-api-17.0.0.jar; lib:=true,\ + client-java-proto-17.0.0.jar; lib:=true,\ commons-codec-1.15.jar; lib:=true,\ commons-collections4-4.4.jar; lib:=true,\ - commons-lang3-3.1.jar; lib:=true,\ - error_prone_annotations-2.5.1.jar; lib:=true,\ - gson-2.8.9.jar; lib:=true,\ + commons-lang3-3.12.0.jar; lib:=true,\ + commons-compress-1.22.jar; lib:=true,\ + gson-2.10.jar; lib:=true,\ gson-fire-1.8.5.jar; lib:=true,\ - guava-30.1.1-jre.jar; lib:=true,\ - j2objc-annotations-1.3.jar; lib:=true,\ javax.annotation-api-1.3.2.jar; lib:=true,\ jsr305-3.0.2.jar; lib:=true,\ - kotlin-stdlib-1.4.10.jar; lib:=true,\ - kotlin-stdlib-common-1.4.10.jar; lib:=true,\ - logging-interceptor-4.9.2.jar; lib:=true,\ - okhttp-4.9.2.jar; lib:=true,\ - okio-jvm-2.8.0.jar; lib:=true,\ - protobuf-java-3.21.2.jar; lib:=true,\ - slf4j-api-1.7.36.jar; lib:=true,\ - snakeyaml-1.29.jar; lib:=true,\ - swagger-annotations-1.6.6.jar; lib:=true + kotlin-osgi-bundle-1.7.22.jar; lib:=true,\ + logging-interceptor-4.10.0.jar; lib:=true,\ + okhttp-4.10.0.jar; lib:=true,\ + okio-jvm-3.0.0.jar; lib:=true,\ + protobuf-java-3.21.10.jar; lib:=true,\ + slf4j-api-2.0.5.jar; lib:=true,\ + jose4j-0.9.2.jar; lib:=true,\ + simpleclient-0.15.0.jar; lib:=true,\ + simpleclient_httpserver-0.15.0.jar; lib:=true,\ + snakeyaml-1.33.jar; lib:=true,\ + swagger-annotations-1.6.9.jar; lib:=true -fixupmessages "Classes found in the wrong directory"; restrict:=error; is:=warning diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle index 1225fdfca..7e585b2aa 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle @@ -10,19 +10,9 @@ dependencies { api project(':galasa-managers-cloud-parent:dev.galasa.cloud.manager') - implementation ('org.bouncycastle:bcpkix-jdk15on') { + implementation ('org.bouncycastle:bcpkix-jdk18on') { version { - strictly '1.69' - } - } - implementation ('org.bouncycastle:bcprov-ext-jdk15on') { - version { - strictly '1.69' - } - } - implementation ('com.google.guava:guava') { - version { - strictly '30.1.1-jre' + strictly '1.72' } } implementation ('com.google.code.findbugs:jsr305') { @@ -32,12 +22,12 @@ dependencies { } implementation ('com.google.code.gson:gson'){ version { - strictly '2.8.9' + strictly '2.10' } } implementation ('org.apache.commons:commons-lang3'){ version { - strictly '3.1' + strictly '3.12.0' } } implementation ('commons-codec:commons-codec'){ @@ -47,14 +37,19 @@ dependencies { } implementation ('org.yaml:snakeyaml'){ version { - strictly '1.29' + strictly '1.33' } } implementation ('org.apache.commons:commons-compress') { version { - strictly '1.21' + strictly '1.22' } } - implementation 'io.kubernetes:client-java:16.0.2' - implementation 'commons-io:commons-io:2.9.0' + implementation 'io.prometheus:simpleclient:0.15.0' + implementation 'io.prometheus:simpleclient_httpserver:0.15.0' + implementation 'com.squareup.okhttp3:okhttp:4.10.0' + implementation 'com.squareup.okio:okio-jvm:3.0.0' + implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle:1.7.22' + implementation 'io.kubernetes:client-java:17.0.0' + implementation 'commons-io:commons-io:2.11.0' } From 713bfa008d3a1f10fe09b5f52a5aa1b4b8960cba Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 4 Jan 2023 16:33:17 +0000 Subject: [PATCH 044/263] Add dev.galasa.common to release.yaml Signed-off-by: Jade Carino --- release.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/release.yaml b/release.yaml index 2f72efc09..22196640a 100644 --- a/release.yaml +++ b/release.yaml @@ -107,6 +107,13 @@ managers: mvp: true isolated: true codecoverage: true + + - artifact: dev.galasa.common + version: 0.25.0 + obr: true + bom: true + mvp: true + isolated: true - artifact: dev.galasa.core.manager version: 0.25.0 From a6c793a51933ac072364c7debce6aba538093d66 Mon Sep 17 00:00:00 2001 From: Will Yates Date: Wed, 4 Jan 2023 17:51:16 +0000 Subject: [PATCH 045/263] Iss1300 bump snakeyaml (#843) * bump level of snake yaml Signed-off-by: Will Yates * bump snake yaml Signed-off-by: Will Yates Signed-off-by: Will Yates --- .../dev.galasa.galasaecosystem.manager/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle index 85a88dea3..aa3f476f1 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle @@ -17,6 +17,6 @@ dependencies { api project(':galasa-managers-unix-parent:dev.galasa.linux.manager') api project(':galasa-managers-windows-parent:dev.galasa.windows.manager') api project(':galasa-managers-zos-parent:dev.galasa.zos.manager') - implementation 'org.yaml:snakeyaml:1.31' + implementation 'org.yaml:snakeyaml:1.33' implementation 'com.google.code.gson:gson:2.8.9' } From 794391b964da243ea2073f0c9936ec5d1d753ffc Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Thu, 5 Jan 2023 15:56:58 +0000 Subject: [PATCH 046/263] Add dev.galasa.common to bnd (#844) Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../galasa-managers-comms-parent/dev.galasa.http.manager/bnd.bnd | 1 + 1 file changed, 1 insertion(+) diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/bnd.bnd index f194b003e..4b88b50e1 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/bnd.bnd @@ -6,6 +6,7 @@ Import-Package: com.google.gson,\ dev.galasa.framework.spi,\ dev.galasa.framework.spi.language,\ dev.galasa.http.spi,\ + dev.galasa.common,\ javax.net.ssl,\ javax.validation.constraints;resolution:=optional,\ jakarta.xml.bind,\ From b54953fd7f647823c5364954ad30b899993c946c Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Mon, 9 Jan 2023 13:51:57 +0000 Subject: [PATCH 047/263] EIB Date calculation didn't account for first 9 days of year Signed-off-by: Jade Carino --- .../java/dev/galasa/cicsts/ceci/manager/ivt/CECIManagerIVT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/src/main/java/dev/galasa/cicsts/ceci/manager/ivt/CECIManagerIVT.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/src/main/java/dev/galasa/cicsts/ceci/manager/ivt/CECIManagerIVT.java index 4e9de8fc1..bea1b901d 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/src/main/java/dev/galasa/cicsts/ceci/manager/ivt/CECIManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/src/main/java/dev/galasa/cicsts/ceci/manager/ivt/CECIManagerIVT.java @@ -550,7 +550,7 @@ private int getExpectedEIBDate() throws TimeoutException, KeyboardLockedExceptio // EIBDATE is in packed decimal format String expectedEIBDate = (date.getYear() <= 1999 ? "0" : "1") + Integer.toString(date.getYear()).substring(2) - + (date.getDayOfYear() <= 99 ? "0" + date.getDayOfYear() : date.getDayOfYear()); + + (date.getDayOfYear() <= 99 ? date.getDayOfYear() <= 9 ? "00" + date.getDayOfYear() : "0" + date.getDayOfYear() : date.getDayOfYear()); return Integer.parseInt(expectedEIBDate); } From 464c3dee8496907b5037f45f58122dbcf834d4b7 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Mon, 9 Jan 2023 14:30:21 +0000 Subject: [PATCH 048/263] Bump CECI IVT version up Signed-off-by: Jade Carino --- .../dev.galasa.cicsts.ceci.manager.ivt/build.gradle | 2 +- release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/build.gradle index b02180935..89e635f3e 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa CECI Manager IVTs' -version = '0.23.0' +version = '0.25.0' dependencies { implementation project (':galasa-managers-cicsts-parent:dev.galasa.cicsts.ceci.manager') diff --git a/release.yaml b/release.yaml index 8a1a0702c..81c70c580 100644 --- a/release.yaml +++ b/release.yaml @@ -54,7 +54,7 @@ managers: codecoverage: true - artifact: dev.galasa.cicsts.ceci.manager.ivt - version: 0.23.0 + version: 0.25.0 obr: true mvp: true bom: true From f37f4a462682bf601d1774f1176578ba1323c03a Mon Sep 17 00:00:00 2001 From: Will Yates Date: Tue, 17 Jan 2023 10:23:57 +0000 Subject: [PATCH 049/263] Updates for the SSCP_LU_DATA (#848) Signed-off-by: Will Yates Signed-off-by: Will Yates --- .../zos3270/internal/comms/NetworkThread.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/NetworkThread.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/NetworkThread.java index 6ea2bc4a6..abf2f3276 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/NetworkThread.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/NetworkThread.java @@ -195,10 +195,20 @@ public void processMessage(InputStream messageStream) throws IOException, Networ if (tn3270eHeader == DT_BIND_IMAGE) { logger.trace("BIND_IMAGE received"); return; - } else if (tn3270eHeader == DT_UNBIND) { + } + if (tn3270eHeader == DT_UNBIND) { logger.trace("UNBIND_IMAGE received"); return; - } else if (tn3270eHeader != 0) { + } + + if (tn3270eHeader == DT_SSCP_LU_DATA) { + logger.trace("SSCP_LU_DATA received"); + logger.trace("Received message header: " + reportCommandSoFar()); + logger.trace("Received message buffer: " + Hex.encodeHexString(buffer)); + return; + } + + if (tn3270eHeader != DT_3270_DATA) { throw new NetworkException("Was expecting a TN3270E datastream header of zeros - " + reportCommandSoFar()); } @@ -206,7 +216,6 @@ public void processMessage(InputStream messageStream) throws IOException, Networ Inbound3270Message inbound3270Message = process3270Data(buffer); this.screen.processInboundMessage(inbound3270Message); - return; } } From de0c682dafcff21ab745a0d2acf7a7f4ce48b6a0 Mon Sep 17 00:00:00 2001 From: Will Yates Date: Wed, 18 Jan 2023 14:12:16 +0000 Subject: [PATCH 050/263] vtp manager got missed when updating artifact manager (#849) Signed-off-by: Will Yates Signed-off-by: Will Yates --- .../java/dev/galasa/vtp/manager/internal/VtpManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpManagerImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpManagerImpl.java index 1cb6d20d8..656f4cad6 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpManagerImpl.java @@ -275,7 +275,7 @@ public void startOfTestClass() throws ManagerException { public void copyDumpedPlaybackFile(IZosImage image, HashMap attrs) throws VtpManagerException { try { - String jcl = artifactManager.getBundleResources(this.getClass()).retrieveSkeletonFileAsString("resources/jcl/dumpJCL", attrs).trim(); + String jcl = artifactManager.getBundleResources(this.getClass()).retrieveSkeletonFileAsString("/jcl/dumpJCL", attrs).trim(); IZosBatchJob job = batchManager.getZosBatch(image).submitJob(jcl, null); int rc = job.waitForJob(); if(rc > 4) { From f287457edd154b1de7923854bc1f4be38746d079 Mon Sep 17 00:00:00 2001 From: Will Yates Date: Sat, 4 Feb 2023 15:28:37 +0000 Subject: [PATCH 051/263] Zos batch (#850) * allow zosBatch Manager to group ras entries by JOBNAME Signed-off-by: Will Yates * update rse manager and don't include jobname in artifact Signed-off-by: Will Yates * get sem batch jobs to store in RAS correctly Signed-off-by: Will Yates * add copyright and remove logging Signed-off-by: Will Yates * release bumps Signed-off-by: Will Yates * correction to release.yaml Signed-off-by: Will Yates * roll final changes to rse batch manager Signed-off-by: Will Yates --------- Signed-off-by: Will Yates --- .../galasa/sem/internal/SemManagerImpl.java | 4 ++-- .../dev.galasa.zos.manager/build.gradle | 2 +- .../zosbatch/IZosBatchJobOutputSpoolFile.java | 11 +++++++--- .../internal/ZosBatchJobOutputImpl.java | 12 ++++++++--- .../ZosBatchJobOutputSpoolFileImpl.java | 21 +++++++++++-------- .../build.gradle | 2 +- .../internal/RseapiZosBatchJobImpl.java | 8 +++---- .../build.gradle | 2 +- .../internal/ZosmfZosBatchJobImpl.java | 13 ++++++------ release.yaml | 6 +++--- 10 files changed, 46 insertions(+), 35 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemManagerImpl.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemManagerImpl.java index 51f6df868..d27a29b7b 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemManagerImpl.java @@ -639,10 +639,10 @@ public void cicsProvisionBuild() throws ManagerException, ResourceUnavailableExc - private void retrieveOutput(String string, List jobs) { + private void retrieveOutput(String path, List jobs) { for(IZosBatchJob job : jobs) { try { - job.saveOutputToResultsArchive("sem/provision"); + job.saveOutputToResultsArchive(path); } catch (ZosBatchException e) { logger.error("Failed to archive output from " + job); } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle index 719f1f347..0db512431 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS Manager' -version = '0.25.0' +version = '0.26.0' dependencies { api project (':galasa-managers-comms-parent:dev.galasa.ipnetwork.manager') diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJobOutputSpoolFile.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJobOutputSpoolFile.java index 18f0bf816..8dd6a56ec 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJobOutputSpoolFile.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJobOutputSpoolFile.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019-2021. + * Copyright contributors to the Galasa project */ package dev.galasa.zosbatch; @@ -66,6 +64,13 @@ public interface IZosBatchJobOutputSpoolFile { * @return the zOS batch job spool file content */ public String getRecords(); + + /** + * Set the records for this spool file, size is automatically updated + * with the size of the records + * @param records The records that make up this spool record + */ + public void setRecords(String records); /** * Save this zOS batch job spool file to the Results Archive Store. Will only store records retrieved since the {@link IZosBatchJobOutputSpoolFile} diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputImpl.java index 51e104512..312990fe7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputImpl.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. + * Copyright contributors to the Galasa project */ package dev.galasa.zosbatch.internal; @@ -41,6 +39,14 @@ public void addJcl(String jcl) { @Override public void addSpoolFile(String stepname, String procstep, String ddname, String id, String records) { + //the outline of the spool may already exist. BUT the content might not - if it exists then update it + for(IZosBatchJobOutputSpoolFile spool : spoolFiles){ + if(ddname.equals(spool.getDdname())){ + spool.setRecords(records); + return; + } + } + //if we get here then the spool doesn't already exist so add it spoolFiles.add(new ZosBatchJobOutputSpoolFileImpl(batchJob, this.jobname, this.jobid, Objects.toString(stepname, ""), Objects.toString(procstep, ""), ddname, id, records)); } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputSpoolFileImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputSpoolFileImpl.java index ae3bb14a3..15feb8a09 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputSpoolFileImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputSpoolFileImpl.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. + * Copyright contributors to the Galasa project */ package dev.galasa.zosbatch.internal; @@ -41,12 +39,7 @@ public ZosBatchJobOutputSpoolFileImpl(IZosBatchJob batchJob, String jobname, Str this.procstep = procstep; this.ddname = ddname; this.id = id; - this.records = records; - if (this.records != null) { - this.size = this.records.length(); - } else { - this.size = 0; - } + this.setRecords(records); } @Override @@ -97,6 +90,16 @@ public String toString() { return "JOB=" + jobname + " JOBID=" + jobid + " STEP=" + stepname + " PROCSTEP=" + procstep + " DDNAME=" + ddname; } + @Override + public void setRecords(String records) { + this.records = records; + if (this.records != null) { + this.size = this.records.length(); + } else { + this.size = 0; + } + } + @Override public long retrieve() throws ZosBatchException { this.records = this.batchJob.getSpoolFile(this.ddname).getRecords(); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle index e50f4a92d..dfcf24f99 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS Batch Manager - RSE API Implementation' -version = '0.25.0' +version = '0.26.0' dependencies { implementation project(':galasa-managers-zos-parent:dev.galasa.zosrseapi.manager') diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiZosBatchJobImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiZosBatchJobImpl.java index ef4c3742f..3cb3ae4ae 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiZosBatchJobImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiZosBatchJobImpl.java @@ -339,10 +339,10 @@ public IZosBatchJobOutputSpoolFile getSpoolFile(String ddname) throws ZosBatchEx @Override public void saveOutputToResultsArchive(String rasPath) throws ZosBatchException { - if (jobOutput().isEmpty()) { + if (!this.outputComplete) { retrieveOutput(); } - Path artifactPath = this.zosBatchManager.getArtifactsRoot().resolve(rasPath); + Path artifactPath = this.zosBatchManager.getArtifactsRoot().resolve(rasPath).resolve(jobOutput().getJobname()); logger.info("Archiving batch job " + this.toString() + " to " + artifactPath.toString()); Iterator iterator = jobOutput().iterator(); @@ -383,8 +383,6 @@ public void saveSpoolFileToResultsArchive(IZosBatchJobOutputSpoolFile spoolFile, protected void saveSpoolFile(IZosBatchJobOutputSpoolFile spoolFile, Path artifactPath) throws ZosBatchException { StringBuilder name = new StringBuilder(); - name.append(spoolFile.getJobname()); - name.append("_"); name.append(spoolFile.getJobid()); if (!spoolFile.getStepname().isEmpty()){ name.append("_"); @@ -457,7 +455,7 @@ protected void getOutput(boolean retrieveRecords) throws ZosBatchException { throw new ZosBatchException(displayMessage); } - if (this.jobComplete) { + if (this.jobComplete && retrieveRecords) { this.outputComplete = true; } } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle index 44f6ceb06..4cebd33d0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS Batch Manager - zOS/MF Implementation' -version = '0.25.0' +version = '0.26.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zosmf.manager') diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/main/java/dev/galasa/zosbatch/zosmf/manager/internal/ZosmfZosBatchJobImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/main/java/dev/galasa/zosbatch/zosmf/manager/internal/ZosmfZosBatchJobImpl.java index 279c29a37..4a5e5f41a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/main/java/dev/galasa/zosbatch/zosmf/manager/internal/ZosmfZosBatchJobImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/main/java/dev/galasa/zosbatch/zosmf/manager/internal/ZosmfZosBatchJobImpl.java @@ -338,10 +338,11 @@ public IZosBatchJobOutputSpoolFile getSpoolFile(String ddname) throws ZosBatchEx @Override public void saveOutputToResultsArchive(String rasPath) throws ZosBatchException { - if (jobOutput().isEmpty()) { + if(!this.outputComplete){ retrieveOutput(); } - Path artifactPath = this.zosBatchManager.getArtifactsRoot().resolve(rasPath); + + Path artifactPath = this.zosBatchManager.getArtifactsRoot().resolve(rasPath).resolve(jobOutput().getJobname()); logger.info("Archiving batch job " + this.toString() + " to " + artifactPath.toString()); Iterator iterator = jobOutput().iterator(); @@ -382,8 +383,6 @@ public void saveSpoolFileToResultsArchive(IZosBatchJobOutputSpoolFile spoolFile, protected void saveSpoolFile(IZosBatchJobOutputSpoolFile spoolFile, Path artifactPath) throws ZosBatchException { StringBuilder name = new StringBuilder(); - name.append(spoolFile.getJobname()); - name.append("_"); name.append(spoolFile.getJobid()); if (!spoolFile.getStepname().isEmpty()){ name.append("_"); @@ -404,7 +403,6 @@ protected void saveSpoolFile(IZosBatchJobOutputSpoolFile spoolFile, Path artifac } protected void getOutput(boolean retrieveRecords) throws ZosBatchException { - if (!submitted()) { throw new ZosBatchException(LOG_JOB_NOT_SUBMITTED); } @@ -453,6 +451,7 @@ protected void getOutput(boolean retrieveRecords) throws ZosBatchException { if(this.jobOutput == null) { this.jobOutput = this.zosBatchManager.getZosManager().newZosBatchJobOutput(this, this.jobname.getName(), this.jobid); } + ((IZosBatchJobOutputSpi) this.jobOutput).addSpoolFile(stepname, procstep, ddname, id, records); } } else if (response.getStatusCode() == HttpStatus.SC_NOT_FOUND && getStatus().equals(JobStatus.ACTIVE)) { @@ -469,7 +468,7 @@ protected void getOutput(boolean retrieveRecords) throws ZosBatchException { getSpoolFileContent("JCL", null, null, null); } - if (this.jobComplete) { + if (this.jobComplete && retrieveRecords) { this.outputComplete = true; } } @@ -632,7 +631,7 @@ protected void updateJobStatus() throws ZosBatchException { } protected String getSpoolFileContent(String id, String stepname, String procstep, String ddname) throws ZosBatchException { - + String path = this.jobFilesPath + "/" + id + "/records"; HashMap headers = new HashMap<>(); headers.put(ZosmfCustomHeaders.X_CSRF_ZOSMF_HEADER.toString(), ""); diff --git a/release.yaml b/release.yaml index 81c70c580..e56eb91af 100644 --- a/release.yaml +++ b/release.yaml @@ -354,7 +354,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosbatch.rseapi.manager - version: 0.25.0 + version: 0.26.0 obr: true bom: true mvp: true @@ -362,7 +362,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosbatch.zosmf.manager - version: 0.25.0 + version: 0.26.0 obr: true bom: true mvp: true @@ -419,7 +419,7 @@ managers: codecoverage: true - artifact: dev.galasa.zos.manager - version: 0.25.0 + version: 0.26.0 obr: true javadoc: true bom: true From fee60f28f4f3078d571b70f2b76fbfe5afffbec2 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Thu, 23 Feb 2023 16:38:26 +0000 Subject: [PATCH 052/263] Remove minor version from OpenStack API call Signed-off-by: Jade Carino --- .../galasa/openstack/manager/internal/OpenstackHttpClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java index 2bdbbff08..214d35c0a 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java @@ -542,7 +542,7 @@ protected String getImageId(@NotNull String image) throws OpenstackManagerExcept // *** Retrieve a list of the images - HttpGet get = new HttpGet(this.openstackImageUri + "/v2.5/images"); + HttpGet get = new HttpGet(this.openstackImageUri + "/v2/images"); get.addHeader(this.openstackToken.getHeader()); try (CloseableHttpResponse response = httpClient.execute(get)) { From 65b124541add01daa3e6360c0a46074a3dfbd931 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Thu, 23 Feb 2023 16:39:52 +0000 Subject: [PATCH 053/263] Copyright Signed-off-by: Jade Carino --- .../openstack/manager/internal/OpenstackHttpClient.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java index 214d35c0a..d7493eb92 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java @@ -1,8 +1,6 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2021. - */ +* Copyright contributors to the Galasa project +*/ package dev.galasa.openstack.manager.internal; import java.time.ZonedDateTime; From e7048a1c4f80e47256bd5294d0a4c12d030f846f Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Fri, 24 Feb 2023 15:13:45 +0000 Subject: [PATCH 054/263] Add initial image directory generation Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../zos3270/spi/Zos3270TerminalImpl.java | 79 ++++++++++--------- 1 file changed, 43 insertions(+), 36 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index c5e808a03..0183aa0f6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -3,6 +3,7 @@ */ package dev.galasa.zos3270.spi; +import java.io.IOException; import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.URL; @@ -61,6 +62,7 @@ public class Zos3270TerminalImpl extends Terminal implements IScreenUpdateListen private final ArrayList cachedImages = new ArrayList<>(); private final Path terminalRasDirectory; + private final Path terminalImagesDirectory; private int rasTerminalSequence; private URL liveTerminalUrl; private int liveTerminalSequence; @@ -88,7 +90,7 @@ public Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFrame Path storedArtifactsRoot = framework.getResultArchiveStore().getStoredArtifactsRoot(); terminalRasDirectory = storedArtifactsRoot.resolve("zos3270").resolve("terminals").resolve(this.terminalId); - + terminalImagesDirectory = storedArtifactsRoot.resolve("images").resolve("terminals").resolve(this.terminalId); URL propLiveTerminalUrl = LiveTerminalUrl.get(); if (propLiveTerminalUrl == null) { liveTerminalUrl = null; @@ -144,16 +146,13 @@ public synchronized void screenUpdated(Direction direction, AttentionIdentificat int cursorRow = cursorPosition / screenRows; int cursorCol = cursorPosition % screenCols; - TerminalSize terminalSize = new TerminalSize(screenCols, screenRows); // TODO - // sort - // out - // alt - // sizes + TerminalSize terminalSize = new TerminalSize(screenCols, screenRows); TerminalImage terminalImage = new TerminalImage(updateId, update, direction == Direction.RECEIVED, null, aidText, terminalSize, cursorCol, cursorRow); terminalImage.getFields().addAll(buildTerminalFields(getScreen())); cachedImages.add(terminalImage); if (cachedImages.size() >= 10) { + writeRasOutput(); flushTerminalCache(); } @@ -205,45 +204,53 @@ public synchronized void screenUpdated(Direction direction, AttentionIdentificat } } - public synchronized void flushTerminalCache() { - if (cachedImages.isEmpty()) { - return; - } - + public void writeRasOutput() { rasTerminalSequence++; try { - TerminalSize terminalSize = new TerminalSize(getScreen().getNoOfColumns(), getScreen().getNoOfRows()); // TODO - // sort - // out - // alt - // sizes - dev.galasa.zos3270.common.screens.Terminal rasTerminal = new dev.galasa.zos3270.common.screens.Terminal( - this.terminalId, this.runId, rasTerminalSequence, terminalSize); - rasTerminal.getImages().addAll(this.cachedImages); - - JsonObject intermediateJson = (JsonObject) gson.toJsonTree(rasTerminal); - stripFalseBooleans(intermediateJson); - String tempJson = gson.toJson(intermediateJson); - - if (applyCtf) { - tempJson = cts.removeConfidentialText(tempJson); - } - - String terminalFilename = this.terminalId + "-" + String.format("%05d", rasTerminalSequence) + ".gz"; - Path terminalPath = terminalRasDirectory.resolve(terminalFilename); - - try (GZIPOutputStream gos = new GZIPOutputStream(Files.newOutputStream(terminalPath, - new SetContentType(new ResultArchiveStoreContentType("application/zos3270terminal")), - StandardOpenOption.CREATE))) { - IOUtils.write(tempJson, gos, "utf-8"); - } + writeTerminalGzJson(); + writeTerminalImage(); } catch (Exception e) { logger.error("Unable to write terminal cache to the RAS", e); rasTerminalSequence--; return; } + } + public void writeTerminalImage() throws IOException { + String terminalFilename = this.terminalId + "-" + String.format("%05d", rasTerminalSequence) + ".png"; + Path terminalPath = terminalImagesDirectory.resolve(terminalFilename); + + OutputStream os = Files.newOutputStream(terminalPath, + new SetContentType(ResultArchiveStoreContentType.TEXT), + StandardOpenOption.CREATE); + IOUtils.write("", os, StandardCharsets.UTF_8); + } + + public void writeTerminalGzJson() throws IOException { + TerminalSize terminalSize = new TerminalSize(getScreen().getNoOfColumns(), getScreen().getNoOfRows()); + dev.galasa.zos3270.common.screens.Terminal rasTerminal = new dev.galasa.zos3270.common.screens.Terminal( + this.terminalId, this.runId, rasTerminalSequence, terminalSize); + rasTerminal.getImages().addAll(this.cachedImages); + + JsonObject intermediateJson = (JsonObject) gson.toJsonTree(rasTerminal); + stripFalseBooleans(intermediateJson); + String tempJson = gson.toJson(intermediateJson); + + if (applyCtf) { + tempJson = cts.removeConfidentialText(tempJson); + } + + String terminalFilename = this.terminalId + "-" + String.format("%05d", rasTerminalSequence) + ".gz"; + Path terminalPath = terminalRasDirectory.resolve(terminalFilename); + + GZIPOutputStream gos = new GZIPOutputStream(Files.newOutputStream(terminalPath, + new SetContentType(new ResultArchiveStoreContentType("application/zos3270terminal")), + StandardOpenOption.CREATE)); + IOUtils.write(tempJson, gos, "utf-8"); + } + + public synchronized void flushTerminalCache() { this.cachedImages.clear(); } From d388900f842261bada609d8dadcbcfb27f76dcd0 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Fri, 24 Feb 2023 15:29:53 +0000 Subject: [PATCH 055/263] I forgot to update the version numbers Signed-off-by: Jade Carino --- .../dev.galasa.openstack.manager/build.gradle | 2 +- release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle index c66392481..96d73e773 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Openstack Manager' -version = '0.25.0' +version = '0.26.0' dependencies { api project(':galasa-managers-comms-parent:dev.galasa.ipnetwork.manager') diff --git a/release.yaml b/release.yaml index e56eb91af..0394558f8 100644 --- a/release.yaml +++ b/release.yaml @@ -302,7 +302,7 @@ managers: isolated: true - artifact: dev.galasa.openstack.manager - version: 0.25.0 + version: 0.26.0 obr: true javadoc: true bom: true From 3afe8597b28dfe948287d5d7de85d0bb7867e188 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Fri, 24 Feb 2023 16:11:40 +0000 Subject: [PATCH 056/263] Update image directory generation Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../zos3270/spi/Zos3270TerminalImpl.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index 0183aa0f6..29bf661b7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -146,7 +146,11 @@ public synchronized void screenUpdated(Direction direction, AttentionIdentificat int cursorRow = cursorPosition / screenRows; int cursorCol = cursorPosition % screenCols; - TerminalSize terminalSize = new TerminalSize(screenCols, screenRows); + TerminalSize terminalSize = new TerminalSize(screenCols, screenRows); // TODO + // sort + // out + // alt + // sizes TerminalImage terminalImage = new TerminalImage(updateId, update, direction == Direction.RECEIVED, null, aidText, terminalSize, cursorCol, cursorRow); terminalImage.getFields().addAll(buildTerminalFields(getScreen())); @@ -204,7 +208,7 @@ public synchronized void screenUpdated(Direction direction, AttentionIdentificat } } - public void writeRasOutput() { + public synchronized void writeRasOutput() { rasTerminalSequence++; try { @@ -217,7 +221,7 @@ public void writeRasOutput() { } } - public void writeTerminalImage() throws IOException { + public synchronized void writeTerminalImage() throws IOException { String terminalFilename = this.terminalId + "-" + String.format("%05d", rasTerminalSequence) + ".png"; Path terminalPath = terminalImagesDirectory.resolve(terminalFilename); @@ -227,7 +231,7 @@ public void writeTerminalImage() throws IOException { IOUtils.write("", os, StandardCharsets.UTF_8); } - public void writeTerminalGzJson() throws IOException { + public synchronized void writeTerminalGzJson() throws IOException { TerminalSize terminalSize = new TerminalSize(getScreen().getNoOfColumns(), getScreen().getNoOfRows()); dev.galasa.zos3270.common.screens.Terminal rasTerminal = new dev.galasa.zos3270.common.screens.Terminal( this.terminalId, this.runId, rasTerminalSequence, terminalSize); @@ -244,10 +248,11 @@ public void writeTerminalGzJson() throws IOException { String terminalFilename = this.terminalId + "-" + String.format("%05d", rasTerminalSequence) + ".gz"; Path terminalPath = terminalRasDirectory.resolve(terminalFilename); - GZIPOutputStream gos = new GZIPOutputStream(Files.newOutputStream(terminalPath, + try (GZIPOutputStream gos = new GZIPOutputStream(Files.newOutputStream(terminalPath, new SetContentType(new ResultArchiveStoreContentType("application/zos3270terminal")), - StandardOpenOption.CREATE)); - IOUtils.write(tempJson, gos, "utf-8"); + StandardOpenOption.CREATE))) { + IOUtils.write(tempJson, gos, "utf-8"); + } } public synchronized void flushTerminalCache() { @@ -321,4 +326,4 @@ public static void stripFalseBooleans(JsonObject json) { } } -} +} \ No newline at end of file From 1be3a487d436abb3b2818e4a764d80c45f445a6f Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Fri, 24 Feb 2023 16:48:18 +0000 Subject: [PATCH 057/263] Update Zos3270 Manager version to 0.26.0 so changes are picked up Signed-off-by: Jade Carino --- .../dev.galasa.zos3270.manager/build.gradle | 2 +- release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle index 9e84c6e0a..12efdc146 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS 3270 Terminal Manager' -version = '0.25.0' +version = '0.26.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zos3270.common') diff --git a/release.yaml b/release.yaml index e56eb91af..f83665032 100644 --- a/release.yaml +++ b/release.yaml @@ -494,7 +494,7 @@ managers: codecoverage: true - artifact: dev.galasa.zos3270.manager - version: 0.25.0 + version: 0.26.0 obr: true javadoc: true bom: true From ef046ff1d86d5e7fe08eee8595864c616f64c9ce Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Sat, 25 Feb 2023 00:19:24 +0000 Subject: [PATCH 058/263] uplift dependency onto 0.26.0 of framework Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .gitignore | 1 + build-locally.sh | 23 ++++--------------- .../src/main/groovy/galasa.manager.gradle | 2 +- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 66d361d6e..5d352d6db 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ Snap*.trc **/.gradle **/gradle/wrapper local-builds/ +**/.idea diff --git a/build-locally.sh b/build-locally.sh index dad6c8aa5..f2f1ccc7e 100755 --- a/build-locally.sh +++ b/build-locally.sh @@ -160,27 +160,14 @@ else goals="build check publishToMavenLocal --parallel" fi -cat << EOF -Using command: - -gradle \ +cmd="gradle \ ${CONSOLE_FLAG} \ -Dorg.gradle.java.home=${JAVA_HOME} \ -PsourceMaven=${SOURCE_MAVEN} ${OPTIONAL_DEBUG_FLAG} \ -${goals} \ -2>&1 > ${log_file} - -EOF - - -gradle \ -${CONSOLE_FLAG} \ --Dorg.gradle.java.home=${JAVA_HOME} \ --PsourceMaven=${SOURCE_MAVEN} ${OPTIONAL_DEBUG_FLAG} \ -${goals} \ -2>&1 > ${log_file} - +${goals} +" +$cmd 2>&1 > ${log_file} -rc=$? ; if [[ "${rc}" != "0" ]]; then cat ${log_file} ; error "Failed to build ${project} see logs at ${log_file}" ; exit 1 ; fi +rc=$? ; if [[ "${rc}" != "0" ]]; then error "Failed to build ${project} see logs at ${log_file}" ; exit 1 ; fi success "Project ${project} built - OK - log is at ${log_file}" diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle index c92bf982a..896e41e89 100644 --- a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle +++ b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle @@ -6,7 +6,7 @@ plugins { dependencies { api 'dev.galasa:dev.galasa:0.21.0' - implementation 'dev.galasa:dev.galasa.framework:0.25.0' + implementation 'dev.galasa:dev.galasa.framework:0.26.0' implementation 'commons-logging:commons-logging:1.2' implementation 'org.osgi:org.osgi.core:6.0.0' implementation 'org.osgi:org.osgi.service.component.annotations:1.3.0' From 309363095916b20b95c0e64f437917151575642c Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Wed, 1 Mar 2023 10:16:03 +0000 Subject: [PATCH 059/263] Add missing terminal outputs Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../java/dev/galasa/cicsts/internal/CicstsManagerImpl.java | 3 ++- .../dev/galasa/zos3270/internal/Zos3270ManagerImpl.java | 1 + .../java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java index 2cf1a2f5c..4900adaf0 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java @@ -300,9 +300,10 @@ public void provisionStart() throws ManagerException, ResourceUnavailableExcepti public void provisionStop() { for (CicsTerminalImpl terminal : this.terminals) { try { + terminal.writeTerminalGzJson(); terminal.flushTerminalCache(); terminal.disconnect(); - } catch (TerminalInterruptedException e) { // NOSONAR - wish to hide disconnect errors + } catch (Exception e) { // NOSONAR - wish to hide disconnect errors } } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java index 4914c58b5..5d2a24c71 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java @@ -202,6 +202,7 @@ public void provisionStop() { logger.trace("Disconnecting terminals"); for (Zos3270TerminalImpl terminal : terminals) { try { + terminal.writeRasOutput(); terminal.flushTerminalCache(); terminal.disconnect(); } catch (TerminalInterruptedException e) { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index 29bf661b7..a50e770d0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -221,7 +221,7 @@ public synchronized void writeRasOutput() { } } - public synchronized void writeTerminalImage() throws IOException { + private synchronized void writeTerminalImage() throws IOException { String terminalFilename = this.terminalId + "-" + String.format("%05d", rasTerminalSequence) + ".png"; Path terminalPath = terminalImagesDirectory.resolve(terminalFilename); @@ -232,6 +232,10 @@ public synchronized void writeTerminalImage() throws IOException { } public synchronized void writeTerminalGzJson() throws IOException { + if (this.cachedImages.isEmpty()) { + return; + } + TerminalSize terminalSize = new TerminalSize(getScreen().getNoOfColumns(), getScreen().getNoOfRows()); dev.galasa.zos3270.common.screens.Terminal rasTerminal = new dev.galasa.zos3270.common.screens.Terminal( this.terminalId, this.runId, rasTerminalSequence, terminalSize); From f40b0e1a842a74a0d93106ffb7d4baa016a35717 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Wed, 1 Mar 2023 10:24:20 +0000 Subject: [PATCH 060/263] Bump CICS TS manager to 0.26.0 Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../dev.galasa.cicsts.manager/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle index 265477375..03b97ba1c 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa CICS/TS Manager' -version = '0.25.0' +version = '0.26.0' dependencies { api project (':galasa-managers-zos-parent:dev.galasa.zos.manager') From 619e4c6fed41df4ba486457903a32feaa5b98913 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Wed, 1 Mar 2023 10:40:51 +0000 Subject: [PATCH 061/263] Bump CICS TS manager to 0.26.0 Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.yaml b/release.yaml index 94730f9c8..f9c2777d9 100644 --- a/release.yaml +++ b/release.yaml @@ -29,7 +29,7 @@ managers: isolated: true - artifact: dev.galasa.cicsts.manager - version: 0.25.0 + version: 0.26.0 obr: true mvp: true javadoc: true From d9c12458bbe5709bfcd8aaae0da203777c291d16 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 1 Mar 2023 16:59:13 +0000 Subject: [PATCH 062/263] Trying to read in a byte array and write out as an image Signed-off-by: Jade Carino --- .../zos3270/spi/Zos3270TerminalImpl.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index 29bf661b7..61d85aeac 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -3,6 +3,10 @@ */ package dev.galasa.zos3270.spi; +import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; import java.io.IOException; import java.io.OutputStream; import java.net.HttpURLConnection; @@ -16,6 +20,8 @@ import java.util.Map.Entry; import java.util.zip.GZIPOutputStream; +import javax.imageio.ImageIO; + import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -221,14 +227,17 @@ public synchronized void writeRasOutput() { } } - public synchronized void writeTerminalImage() throws IOException { + private synchronized void writeTerminalImage() throws IOException { String terminalFilename = this.terminalId + "-" + String.format("%05d", rasTerminalSequence) + ".png"; Path terminalPath = terminalImagesDirectory.resolve(terminalFilename); - OutputStream os = Files.newOutputStream(terminalPath, - new SetContentType(ResultArchiveStoreContentType.TEXT), - StandardOpenOption.CREATE); - IOUtils.write("", os, StandardCharsets.UTF_8); + byte[] byteArray = {0xa,0x2,0xf}; + ByteArrayInputStream is = new ByteArrayInputStream(byteArray); + + BufferedImage newImage = ImageIO.read(is); + logger.info(terminalPath.toString()); + ImageIO.write(newImage, "png", new File(terminalPath.toString())); + } public synchronized void writeTerminalGzJson() throws IOException { From 92ddb3b12b7d6164fe4b03c09ae805143fc9965d Mon Sep 17 00:00:00 2001 From: Will Yates Date: Thu, 2 Mar 2023 15:38:26 +0000 Subject: [PATCH 063/263] bump snake yaml to v2 (#854) --- .../dev.galasa.kubernetes.manager/bnd.bnd | 2 +- .../dev.galasa.kubernetes.manager/build.gradle | 4 ++-- release.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd index 8e99129c7..696cbd7fe 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd @@ -44,6 +44,6 @@ Embed-Dependency: *;scope=compile jose4j-0.9.2.jar; lib:=true,\ simpleclient-0.15.0.jar; lib:=true,\ simpleclient_httpserver-0.15.0.jar; lib:=true,\ - snakeyaml-1.33.jar; lib:=true,\ + snakeyaml-2.0.jar; lib:=true,\ swagger-annotations-1.6.9.jar; lib:=true -fixupmessages "Classes found in the wrong directory"; restrict:=error; is:=warning diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle index 7e585b2aa..eb0e5b1f5 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Kubernetes Manager' -version = '0.25.0' +version = '0.26.0' dependencies { api project(':galasa-managers-cloud-parent:dev.galasa.cloud.manager') @@ -37,7 +37,7 @@ dependencies { } implementation ('org.yaml:snakeyaml'){ version { - strictly '1.33' + strictly '2.0' } } implementation ('org.apache.commons:commons-compress') { diff --git a/release.yaml b/release.yaml index 0394558f8..69ffb304b 100644 --- a/release.yaml +++ b/release.yaml @@ -252,7 +252,7 @@ managers: isolated: true - artifact: dev.galasa.kubernetes.manager - version: 0.25.0 + version: 0.26.0 obr: true javadoc: true bom: true From f23d7cc5371212756c06da359650771ca037f48c Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Fri, 3 Mar 2023 10:32:22 +0000 Subject: [PATCH 064/263] Add progress so far Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../zos3270/spi/Zos3270TerminalImpl.java | 121 +++++++++++++----- 1 file changed, 86 insertions(+), 35 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index f7fd0f67d..c90df340e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -3,9 +3,13 @@ */ package dev.galasa.zos3270.spi; +import java.awt.*; +import java.sql.Array; +import java.util.Scanner; + +import java.awt.Graphics2D; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.OutputStream; @@ -54,35 +58,37 @@ public class Zos3270TerminalImpl extends Terminal implements IScreenUpdateListener { - private Log logger = LogFactory.getLog(getClass()); + private Log logger = LogFactory.getLog(getClass()); - private final Gson gson = new GsonBuilder().setPrettyPrinting().create(); + private final Gson gson = new GsonBuilder().setPrettyPrinting().create(); - private final String terminalId; - private int updateId; - private final String runId; + private final String terminalId; + private int updateId; + private final String runId; private final IConfidentialTextService cts; - private final boolean applyCtf; + private final boolean applyCtf; private final ArrayList cachedImages = new ArrayList<>(); - private final Path terminalRasDirectory; - private final Path terminalImagesDirectory; - private int rasTerminalSequence; - private URL liveTerminalUrl; - private int liveTerminalSequence; - private boolean logConsoleTerminals; - private boolean autoConnect; + private final Path terminalRasDirectory; + private final Path terminalImagesDirectory; + private int rasTerminalSequence; + private URL liveTerminalUrl; + private int liveTerminalSequence; + private boolean logConsoleTerminals; + private boolean autoConnect; - public Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFramework framework, boolean autoConnect, IZosImage image, ITextScannerManagerSpi textScanner) + public Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFramework framework, boolean autoConnect, + IZosImage image, ITextScannerManagerSpi textScanner) throws Zos3270ManagerException, TerminalInterruptedException { this(id, host, port, tls, framework, autoConnect, image, 80, 24, 0, 0, textScanner); } - - - public Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFramework framework, boolean autoConnect, IZosImage image, - int primaryColumns, int primaryRows, int alternateColumns, int alternateRows, ITextScannerManagerSpi textScanner) + + public Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFramework framework, boolean autoConnect, + IZosImage image, + int primaryColumns, int primaryRows, int alternateColumns, int alternateRows, + ITextScannerManagerSpi textScanner) throws Zos3270ManagerException, TerminalInterruptedException { super(id, host, port, tls, primaryColumns, primaryRows, alternateColumns, alternateRows, textScanner); this.terminalId = id; @@ -96,7 +102,7 @@ public Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFrame Path storedArtifactsRoot = framework.getResultArchiveStore().getStoredArtifactsRoot(); terminalRasDirectory = storedArtifactsRoot.resolve("zos3270").resolve("terminals").resolve(this.terminalId); - terminalImagesDirectory = storedArtifactsRoot.resolve("images").resolve("terminals").resolve(this.terminalId); + terminalImagesDirectory = storedArtifactsRoot.resolve("zos3270").resolve("images").resolve(this.terminalId); URL propLiveTerminalUrl = LiveTerminalUrl.get(); if (propLiveTerminalUrl == null) { liveTerminalUrl = null; @@ -121,7 +127,7 @@ public Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFrame throw new Zos3270ManagerException("Unable to create the live terminal directory", e); } } - + setDeviceTypes(TerminalDeviceTypes.get(image)); logConsoleTerminals = LogConsoleTerminals.get(); @@ -231,20 +237,64 @@ private synchronized void writeTerminalImage() throws IOException { String terminalFilename = this.terminalId + "-" + String.format("%05d", rasTerminalSequence) + ".png"; Path terminalPath = terminalImagesDirectory.resolve(terminalFilename); - byte[] byteArray = {0xa,0x2,0xf}; - ByteArrayInputStream is = new ByteArrayInputStream(byteArray); - - BufferedImage newImage = ImageIO.read(is); - logger.info(terminalPath.toString()); - ImageIO.write(newImage, "png", new File(terminalPath.toString())); - + TerminalSize terminalSize = new TerminalSize(getScreen().getNoOfColumns(), getScreen().getNoOfRows()); + + dev.galasa.zos3270.common.screens.Terminal rasTerminal = new dev.galasa.zos3270.common.screens.Terminal( + this.terminalId, this.runId, rasTerminalSequence, terminalSize); + rasTerminal.getImages().addAll(this.cachedImages); + + // TODO - Figure out a way to multiply the width/height by the font width and height + int width = terminalSize.getColumns() * 20; + int height = terminalSize.getRows() * 20; + + BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); + Graphics2D graphics = image.createGraphics(); + + graphics.setPaint(Color.black); + graphics.fillRect(0, 0, width, height); + graphics.setPaint(Color.green); + + Font font = new Font(Font.MONOSPACED, Font.PLAIN, 10); + graphics.setFont(font); + FontMetrics fontMetrics = graphics.getFontMetrics(); + int fontHeight = fontMetrics.getHeight(); + int fontWidth = fontMetrics.getMaxAdvance(); + + // TODO - Make a png for each image + TerminalImage firstImage = rasTerminal.getImages().get(0); + List firstImageFields = firstImage.getFields(); + for (TerminalField field : firstImageFields) { + for (FieldContents contents : field.getContents()) { + int col = (field.getColumn() + 1); + int row = (field.getRow() + 1); + for (Character c : contents.getChars()) { + if (c != null) { + col++; + if (col > terminalSize.getColumns()) { + col = 1; + row++; + if (row > terminalSize.getRows()) { + row = 1; + } + } + graphics.drawString(Character.toString(c), col * fontWidth, row * fontHeight); + } + } + } + } + + OutputStream os = Files.newOutputStream(terminalPath, + new SetContentType(ResultArchiveStoreContentType.PNG), + StandardOpenOption.CREATE); + + ImageIO.write(image, "png", os); } public synchronized void writeTerminalGzJson() throws IOException { if (this.cachedImages.isEmpty()) { return; } - + TerminalSize terminalSize = new TerminalSize(getScreen().getNoOfColumns(), getScreen().getNoOfRows()); dev.galasa.zos3270.common.screens.Terminal rasTerminal = new dev.galasa.zos3270.common.screens.Terminal( this.terminalId, this.runId, rasTerminalSequence, terminalSize); @@ -279,15 +329,15 @@ private static List buildTerminalFields(Screen screen) { for (Field screenField : screenFields) { int row = screenField.getStart() / screen.getNoOfColumns(); int column = screenField.getStart() % screen.getNoOfColumns(); - + Character cForegroundColour = null; Character cBackgroundColour = null; - Character cHighlight = null; - + Character cHighlight = null; + Colour foregroundColour = screenField.getForegroundColour(); Colour backgroundColour = screenField.getBackgroundColour(); - Highlight highlight = screenField.getHighlight(); - + Highlight highlight = screenField.getHighlight(); + if (foregroundColour != null) { cForegroundColour = foregroundColour.getLetter(); } @@ -304,7 +354,8 @@ private static List buildTerminalFields(Screen screen) { cForegroundColour, cBackgroundColour, cHighlight); Character[] chars = screenField.getFieldCharsWithNulls(); - terminalField.getContents().add(new FieldContents(chars)); // TODO, needs modifying when we know how to support SetAttribute order + terminalField.getContents().add(new FieldContents(chars)); // TODO, needs modifying when we know how to + // support SetAttribute order terminalFields.add(terminalField); } From 02ce775e77ea8ad20dbdb7327498b959d8caba09 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Fri, 3 Mar 2023 13:40:49 +0000 Subject: [PATCH 065/263] Fix image formatting and hide confidential text Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../zos3270/spi/Zos3270TerminalImpl.java | 68 ++++++++++--------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index c90df340e..0b68b1701 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -3,14 +3,11 @@ */ package dev.galasa.zos3270.spi; -import java.awt.*; -import java.sql.Array; -import java.util.Scanner; - +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.Color; import java.awt.Graphics2D; import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; -import java.io.File; import java.io.IOException; import java.io.OutputStream; import java.net.HttpURLConnection; @@ -234,41 +231,46 @@ public synchronized void writeRasOutput() { } private synchronized void writeTerminalImage() throws IOException { - String terminalFilename = this.terminalId + "-" + String.format("%05d", rasTerminalSequence) + ".png"; - Path terminalPath = terminalImagesDirectory.resolve(terminalFilename); - TerminalSize terminalSize = new TerminalSize(getScreen().getNoOfColumns(), getScreen().getNoOfRows()); - dev.galasa.zos3270.common.screens.Terminal rasTerminal = new dev.galasa.zos3270.common.screens.Terminal( this.terminalId, this.runId, rasTerminalSequence, terminalSize); rasTerminal.getImages().addAll(this.cachedImages); - // TODO - Figure out a way to multiply the width/height by the font width and height - int width = terminalSize.getColumns() * 20; - int height = terminalSize.getRows() * 20; + int width = terminalSize.getColumns() * 7; + int height = terminalSize.getRows() * 13; BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); Graphics2D graphics = image.createGraphics(); - graphics.setPaint(Color.black); - graphics.fillRect(0, 0, width, height); - graphics.setPaint(Color.green); - Font font = new Font(Font.MONOSPACED, Font.PLAIN, 10); graphics.setFont(font); FontMetrics fontMetrics = graphics.getFontMetrics(); int fontHeight = fontMetrics.getHeight(); int fontWidth = fontMetrics.getMaxAdvance(); - // TODO - Make a png for each image - TerminalImage firstImage = rasTerminal.getImages().get(0); - List firstImageFields = firstImage.getFields(); - for (TerminalField field : firstImageFields) { - for (FieldContents contents : field.getContents()) { - int col = (field.getColumn() + 1); - int row = (field.getRow() + 1); - for (Character c : contents.getChars()) { - if (c != null) { + graphics.setPaint(Color.black); + graphics.fillRect(0, 0, width, height); + graphics.setPaint(Color.green); + + List terminalImages = rasTerminal.getImages(); + for (int i = 0; i < terminalImages.size(); i++) { + for (TerminalField field : terminalImages.get(i).getFields()) { + StringBuilder sb = new StringBuilder(); + for (FieldContents contents : field.getContents()) { + int col = (field.getColumn() + 1); + int row = (field.getRow() + 1); + + // Remove confidential information from the field's contents + for (Character c : contents.getChars()) { + if (c == null) { + sb.append(" "); + } else { + sb.append(c); + } + } + String fieldText = cts.removeConfidentialText(sb.toString()); + + for (Character c : fieldText.toCharArray()) { col++; if (col > terminalSize.getColumns()) { col = 1; @@ -281,13 +283,17 @@ private synchronized void writeTerminalImage() throws IOException { } } } - } - OutputStream os = Files.newOutputStream(terminalPath, - new SetContentType(ResultArchiveStoreContentType.PNG), - StandardOpenOption.CREATE); + String terminalFilename = this.terminalId + "-" + String.format("%05d", rasTerminalSequence) + "-" + (i + 1) + ".png"; + Path terminalPath = terminalImagesDirectory.resolve(terminalFilename); + + OutputStream os = Files.newOutputStream(terminalPath, + new SetContentType(ResultArchiveStoreContentType.PNG), + StandardOpenOption.CREATE); - ImageIO.write(image, "png", os); + ImageIO.write(image, "png", os); + graphics.clearRect(0, 0, width, height); + } } public synchronized void writeTerminalGzJson() throws IOException { From 3d3a5e550710fdf7840550a75af532c3106d3804 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Fri, 3 Mar 2023 14:12:16 +0000 Subject: [PATCH 066/263] Allow unhiding of confidential info in images Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index 0b68b1701..ba45132c9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -260,7 +260,6 @@ private synchronized void writeTerminalImage() throws IOException { int col = (field.getColumn() + 1); int row = (field.getRow() + 1); - // Remove confidential information from the field's contents for (Character c : contents.getChars()) { if (c == null) { sb.append(" "); @@ -268,7 +267,7 @@ private synchronized void writeTerminalImage() throws IOException { sb.append(c); } } - String fieldText = cts.removeConfidentialText(sb.toString()); + String fieldText = applyCtf ? cts.removeConfidentialText(sb.toString()) : sb.toString(); for (Character c : fieldText.toCharArray()) { col++; From fb469637c0884d9fa66643ac805ce1d7cdbd59de Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Fri, 3 Mar 2023 15:31:52 +0000 Subject: [PATCH 067/263] More progress Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../dev/galasa/cicsts/internal/CicstsManagerImpl.java | 2 +- .../galasa/zos3270/internal/Zos3270ManagerImpl.java | 2 +- .../dev/galasa/zos3270/spi/Zos3270TerminalImpl.java | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java index 4900adaf0..35bf865e4 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java @@ -300,7 +300,7 @@ public void provisionStart() throws ManagerException, ResourceUnavailableExcepti public void provisionStop() { for (CicsTerminalImpl terminal : this.terminals) { try { - terminal.writeTerminalGzJson(); + terminal.writeRasOutput(false); terminal.flushTerminalCache(); terminal.disconnect(); } catch (Exception e) { // NOSONAR - wish to hide disconnect errors diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java index 5d2a24c71..5ac4ddcb9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java @@ -202,7 +202,7 @@ public void provisionStop() { logger.trace("Disconnecting terminals"); for (Zos3270TerminalImpl terminal : terminals) { try { - terminal.writeRasOutput(); + terminal.writeRasOutput(true); terminal.flushTerminalCache(); terminal.disconnect(); } catch (TerminalInterruptedException e) { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index ba45132c9..e5d0e1e8d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -165,7 +165,7 @@ public synchronized void screenUpdated(Direction direction, AttentionIdentificat terminalImage.getFields().addAll(buildTerminalFields(getScreen())); cachedImages.add(terminalImage); if (cachedImages.size() >= 10) { - writeRasOutput(); + writeRasOutput(true); flushTerminalCache(); } @@ -217,12 +217,14 @@ public synchronized void screenUpdated(Direction direction, AttentionIdentificat } } - public synchronized void writeRasOutput() { + public synchronized void writeRasOutput(boolean writeImages) { rasTerminalSequence++; try { writeTerminalGzJson(); - writeTerminalImage(); + if (writeImages) { + writeTerminalImage(); + } } catch (Exception e) { logger.error("Unable to write terminal cache to the RAS", e); rasTerminalSequence--; @@ -295,7 +297,7 @@ private synchronized void writeTerminalImage() throws IOException { } } - public synchronized void writeTerminalGzJson() throws IOException { + private synchronized void writeTerminalGzJson() throws IOException { if (this.cachedImages.isEmpty()) { return; } From 687cc6d5f068e4d3d8ba436a79e2b5a81c4c9ae2 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Fri, 3 Mar 2023 15:44:33 +0000 Subject: [PATCH 068/263] Add string for bottom row Signed-off-by: Jade Carino --- .../zos3270/spi/Zos3270TerminalImpl.java | 35 +++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index e5d0e1e8d..4ba92518b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -239,7 +239,7 @@ private synchronized void writeTerminalImage() throws IOException { rasTerminal.getImages().addAll(this.cachedImages); int width = terminalSize.getColumns() * 7; - int height = terminalSize.getRows() * 13; + int height = (terminalSize.getRows() + 1)* 13; BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); Graphics2D graphics = image.createGraphics(); @@ -276,7 +276,7 @@ private synchronized void writeTerminalImage() throws IOException { if (col > terminalSize.getColumns()) { col = 1; row++; - if (row > terminalSize.getRows()) { + if (row > terminalSize.getRows() + 1) { row = 1; } } @@ -285,6 +285,8 @@ private synchronized void writeTerminalImage() throws IOException { } } + // writeBottomRow(terminalImages.get(i), ) + String terminalFilename = this.terminalId + "-" + String.format("%05d", rasTerminalSequence) + "-" + (i + 1) + ".png"; Path terminalPath = terminalImagesDirectory.resolve(terminalFilename); @@ -297,6 +299,35 @@ private synchronized void writeTerminalImage() throws IOException { } } + private String writeBottomRow(TerminalImage terminalImage, int pos, int size, int cols, int rows) { + + StringBuilder sb = new StringBuilder(); + sb.append("Screen "); + sb.append(Integer.toString(pos)); + sb.append("/"); + sb.append(Integer.toString(size)); + sb.append(" - "); + + if (terminalImage.getId() != null) { + sb.append(terminalImage.getId()); + sb.append(" - "); + } + + sb.append(Integer.toString(cols)); + sb.append("x"); + sb.append(Integer.toString(rows)); + sb.append(" - "); + + if (terminalImage.isInbound()) { + sb.append("Inbound "); + } else { + sb.append("Outbound - "); + sb.append(terminalImage.getAid()); + } + + return sb.toString(); + } + private synchronized void writeTerminalGzJson() throws IOException { if (this.cachedImages.isEmpty()) { return; From a9b1b52ac03e48e95f70bdc167b4f9e8f210f24f Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Fri, 3 Mar 2023 17:02:15 +0000 Subject: [PATCH 069/263] Added last tow for Inbound/Outbound terminal info and some comments Signed-off-by: Jade Carino --- .../zos3270/spi/Zos3270TerminalImpl.java | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index 4ba92518b..4aad2b657 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -232,14 +232,22 @@ public synchronized void writeRasOutput(boolean writeImages) { } } + /** + * This method creates png images to represent the Terminal screens and writes them to the RAS + * @throws IOException + */ private synchronized void writeTerminalImage() throws IOException { TerminalSize terminalSize = new TerminalSize(getScreen().getNoOfColumns(), getScreen().getNoOfRows()); dev.galasa.zos3270.common.screens.Terminal rasTerminal = new dev.galasa.zos3270.common.screens.Terminal( this.terminalId, this.runId, rasTerminalSequence, terminalSize); rasTerminal.getImages().addAll(this.cachedImages); - int width = terminalSize.getColumns() * 7; - int height = (terminalSize.getRows() + 1)* 13; + // 2 extra rows added for Inbound/Outbound info and extra space + int numRows = terminalSize.getRows() + 2; + int numCols = terminalSize.getColumns(); + + int width = numCols * 7; + int height = numRows * 13; BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); Graphics2D graphics = image.createGraphics(); @@ -262,6 +270,7 @@ private synchronized void writeTerminalImage() throws IOException { int col = (field.getColumn() + 1); int row = (field.getRow() + 1); + // Converting FieldContents to Strings and removing confidential text if required for (Character c : contents.getChars()) { if (c == null) { sb.append(" "); @@ -273,10 +282,10 @@ private synchronized void writeTerminalImage() throws IOException { for (Character c : fieldText.toCharArray()) { col++; - if (col > terminalSize.getColumns()) { + if (col > numCols) { col = 1; row++; - if (row > terminalSize.getRows() + 1) { + if (row > numRows) { row = 1; } } @@ -285,7 +294,8 @@ private synchronized void writeTerminalImage() throws IOException { } } - // writeBottomRow(terminalImages.get(i), ) + String terminalStatusRow = writeTerminalStatusRow(terminalImages.get(i), terminalSize.getColumns(), terminalSize.getRows()); + graphics.drawString(terminalStatusRow, 1 * fontWidth, (terminalSize.getRows() + 1) * fontHeight); String terminalFilename = this.terminalId + "-" + String.format("%05d", rasTerminalSequence) + "-" + (i + 1) + ".png"; Path terminalPath = terminalImagesDirectory.resolve(terminalFilename); @@ -299,14 +309,9 @@ private synchronized void writeTerminalImage() throws IOException { } } - private String writeBottomRow(TerminalImage terminalImage, int pos, int size, int cols, int rows) { + private String writeTerminalStatusRow(TerminalImage terminalImage, int cols, int rows) { StringBuilder sb = new StringBuilder(); - sb.append("Screen "); - sb.append(Integer.toString(pos)); - sb.append("/"); - sb.append(Integer.toString(size)); - sb.append(" - "); if (terminalImage.getId() != null) { sb.append(terminalImage.getId()); @@ -328,6 +333,10 @@ private String writeBottomRow(TerminalImage terminalImage, int pos, int size, in return sb.toString(); } + /** + * This method creates JSON representations of the Terminal screens and writes them to the RAS + * @throws IOException + */ private synchronized void writeTerminalGzJson() throws IOException { if (this.cachedImages.isEmpty()) { return; From b8e9e328cec3e0388227d9ed7a65e4ff29e524ae Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Mon, 6 Mar 2023 10:57:37 +0000 Subject: [PATCH 070/263] PR comments addressed Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../cicsts/internal/CicstsManagerImpl.java | 2 +- .../zos3270/spi/Zos3270TerminalImpl.java | 32 +++++++++++++------ 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java index 35bf865e4..985cefe8e 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java @@ -303,7 +303,7 @@ public void provisionStop() { terminal.writeRasOutput(false); terminal.flushTerminalCache(); terminal.disconnect(); - } catch (Exception e) { // NOSONAR - wish to hide disconnect errors + } catch (TerminalInterruptedException e) { // NOSONAR - wish to hide disconnect errors } } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index 4aad2b657..efc19ca5b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -68,8 +68,8 @@ public class Zos3270TerminalImpl extends Terminal implements IScreenUpdateListen private final ArrayList cachedImages = new ArrayList<>(); + private Path storedArtifactsRoot; private final Path terminalRasDirectory; - private final Path terminalImagesDirectory; private int rasTerminalSequence; private URL liveTerminalUrl; private int liveTerminalSequence; @@ -97,9 +97,8 @@ public Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFrame getScreen().registerScreenUpdateListener(this); - Path storedArtifactsRoot = framework.getResultArchiveStore().getStoredArtifactsRoot(); + storedArtifactsRoot = framework.getResultArchiveStore().getStoredArtifactsRoot(); terminalRasDirectory = storedArtifactsRoot.resolve("zos3270").resolve("terminals").resolve(this.terminalId); - terminalImagesDirectory = storedArtifactsRoot.resolve("zos3270").resolve("images").resolve(this.terminalId); URL propLiveTerminalUrl = LiveTerminalUrl.get(); if (propLiveTerminalUrl == null) { liveTerminalUrl = null; @@ -235,25 +234,35 @@ public synchronized void writeRasOutput(boolean writeImages) { /** * This method creates png images to represent the Terminal screens and writes them to the RAS * @throws IOException + * @throws Zos3270ManagerException */ - private synchronized void writeTerminalImage() throws IOException { + private synchronized void writeTerminalImage() throws IOException, Zos3270ManagerException { TerminalSize terminalSize = new TerminalSize(getScreen().getNoOfColumns(), getScreen().getNoOfRows()); - dev.galasa.zos3270.common.screens.Terminal rasTerminal = new dev.galasa.zos3270.common.screens.Terminal( - this.terminalId, this.runId, rasTerminalSequence, terminalSize); - rasTerminal.getImages().addAll(this.cachedImages); + Path terminalImagesDirectory = storedArtifactsRoot.resolve("zos3270").resolve("images").resolve(this.terminalId); + // 2 extra rows added for Inbound/Outbound info and extra space int numRows = terminalSize.getRows() + 2; int numCols = terminalSize.getColumns(); + // 7 and 13 represent the dimensions of the default monospaced font on MacOS + // Ideally, these values would be retrieved from the font metrics but that requires a + // Graphics object to be created, which in turn requires the image to be created - + // We plan to improve this in the future int width = numCols * 7; int height = numRows * 13; BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); Graphics2D graphics = image.createGraphics(); + // Ensures the font family is monospaced so that the images appear as expected + // If the font family is not monospaced, the font defaults to "Dialog", which skews images Font font = new Font(Font.MONOSPACED, Font.PLAIN, 10); + if (font.getFamily() != Font.MONOSPACED) { + throw new Zos3270ManagerException("Unable to set Monospaced font"); + } graphics.setFont(font); + FontMetrics fontMetrics = graphics.getFontMetrics(); int fontHeight = fontMetrics.getHeight(); int fontWidth = fontMetrics.getMaxAdvance(); @@ -262,7 +271,7 @@ private synchronized void writeTerminalImage() throws IOException { graphics.fillRect(0, 0, width, height); graphics.setPaint(Color.green); - List terminalImages = rasTerminal.getImages(); + List terminalImages = this.cachedImages; for (int i = 0; i < terminalImages.size(); i++) { for (TerminalField field : terminalImages.get(i).getFields()) { StringBuilder sb = new StringBuilder(); @@ -297,7 +306,12 @@ private synchronized void writeTerminalImage() throws IOException { String terminalStatusRow = writeTerminalStatusRow(terminalImages.get(i), terminalSize.getColumns(), terminalSize.getRows()); graphics.drawString(terminalStatusRow, 1 * fontWidth, (terminalSize.getRows() + 1) * fontHeight); - String terminalFilename = this.terminalId + "-" + String.format("%05d", rasTerminalSequence) + "-" + (i + 1) + ".png"; + // Prefixing images 1-9 with a 0 to ensure ordering is correct + String imageNum = Integer.toString(i + 1); + if ((i + 1) < 10) { + imageNum = "0" + (i + 1); + } + String terminalFilename = this.terminalId + "-" + String.format("%05d", rasTerminalSequence) + "-" + imageNum + ".png"; Path terminalPath = terminalImagesDirectory.resolve(terminalFilename); OutputStream os = Files.newOutputStream(terminalPath, From 0177493c4ee3307cdb4c1e4e8b5de85017e10dcb Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Mon, 6 Mar 2023 12:02:19 +0000 Subject: [PATCH 071/263] Fix defect where confidential text was being stored in Terminal Json Signed-off-by: Jade Carino --- .../zos3270/spi/Zos3270TerminalImpl.java | 44 ++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index efc19ca5b..f8003a4d1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -359,7 +359,49 @@ private synchronized void writeTerminalGzJson() throws IOException { TerminalSize terminalSize = new TerminalSize(getScreen().getNoOfColumns(), getScreen().getNoOfRows()); dev.galasa.zos3270.common.screens.Terminal rasTerminal = new dev.galasa.zos3270.common.screens.Terminal( this.terminalId, this.runId, rasTerminalSequence, terminalSize); - rasTerminal.getImages().addAll(this.cachedImages); + + for (TerminalImage terminalImage : this.cachedImages){ + + // Create a new TerminalImage based on the one we are iterating on + TerminalImage newTerminalImage = new TerminalImage(terminalImage.getSequence(), terminalImage.getId(), + terminalImage.isInbound(), terminalImage.getType(), terminalImage.getAid(),terminalImage.getImageSize(), + terminalImage.getCursorColumn(), terminalImage.getCursorRow()); + + for (TerminalField terminalField : terminalImage.getFields()){ + + // Create a new TerminalField based on the one we are iterating on + TerminalField newTerminalField = new TerminalField(terminalField.getRow(), terminalField.getColumn(), + terminalField.isUnformatted(), terminalField.isFieldProtected(), terminalField.isFieldNumeric(), + terminalField.isFieldDisplay(), terminalField.isFieldIntenseDisplay(), terminalField.isFieldSelectorPen(), + terminalField.isFieldModifed(), terminalField.getForegroundColour(), terminalField.getBackgroundColour(), terminalField.getHighlight()); + + StringBuilder sb = new StringBuilder(); + for (FieldContents contents : terminalField.getContents()) { + + // Converting FieldContents to Strings and removing confidential text if required + for (Character c : contents.getChars()) { + if (c == null) { + sb.append(" "); + } else { + sb.append(c); + } + } + String fieldText = applyCtf ? cts.removeConfidentialText(sb.toString()) : sb.toString(); + + char[] fieldTextCharArray = fieldText.toCharArray(); + Character[] newArray = new Character[fieldTextCharArray.length]; + for (int i = 0; i < fieldTextCharArray.length; i++){ + newArray[i] = Character.valueOf(fieldTextCharArray[i]); + } + + // Create new FieldContents with the new Character[] with confidential text removed + FieldContents newFieldContents = new FieldContents(newArray); + newTerminalField.getContents().add(newFieldContents); + } + newTerminalImage.getFields().add(newTerminalField); + } + rasTerminal.getImages().add(newTerminalImage); + } JsonObject intermediateJson = (JsonObject) gson.toJsonTree(rasTerminal); stripFalseBooleans(intermediateJson); From 41b5f8ca6aed3882b0169d0e1cd446b4afaba2f4 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Mon, 6 Mar 2023 13:22:35 +0000 Subject: [PATCH 072/263] Remove writeImages bool Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../cicsts/internal/CicstsManagerImpl.java | 2 +- .../zos3270/internal/Zos3270ManagerImpl.java | 2 +- .../zos3270/spi/Zos3270TerminalImpl.java | 18 +++++++----------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java index 985cefe8e..e522fc7ea 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java @@ -300,7 +300,7 @@ public void provisionStart() throws ManagerException, ResourceUnavailableExcepti public void provisionStop() { for (CicsTerminalImpl terminal : this.terminals) { try { - terminal.writeRasOutput(false); + terminal.writeRasOutput(); terminal.flushTerminalCache(); terminal.disconnect(); } catch (TerminalInterruptedException e) { // NOSONAR - wish to hide disconnect errors diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java index 5ac4ddcb9..5d2a24c71 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java @@ -202,7 +202,7 @@ public void provisionStop() { logger.trace("Disconnecting terminals"); for (Zos3270TerminalImpl terminal : terminals) { try { - terminal.writeRasOutput(true); + terminal.writeRasOutput(); terminal.flushTerminalCache(); terminal.disconnect(); } catch (TerminalInterruptedException e) { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index efc19ca5b..46c0f5c09 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -164,7 +164,7 @@ public synchronized void screenUpdated(Direction direction, AttentionIdentificat terminalImage.getFields().addAll(buildTerminalFields(getScreen())); cachedImages.add(terminalImage); if (cachedImages.size() >= 10) { - writeRasOutput(true); + writeRasOutput(); flushTerminalCache(); } @@ -216,14 +216,12 @@ public synchronized void screenUpdated(Direction direction, AttentionIdentificat } } - public synchronized void writeRasOutput(boolean writeImages) { + public synchronized void writeRasOutput() { rasTerminalSequence++; try { writeTerminalGzJson(); - if (writeImages) { - writeTerminalImage(); - } + writeTerminalImages(); } catch (Exception e) { logger.error("Unable to write terminal cache to the RAS", e); rasTerminalSequence--; @@ -236,7 +234,7 @@ public synchronized void writeRasOutput(boolean writeImages) { * @throws IOException * @throws Zos3270ManagerException */ - private synchronized void writeTerminalImage() throws IOException, Zos3270ManagerException { + private synchronized void writeTerminalImages() throws IOException, Zos3270ManagerException { TerminalSize terminalSize = new TerminalSize(getScreen().getNoOfColumns(), getScreen().getNoOfRows()); Path terminalImagesDirectory = storedArtifactsRoot.resolve("zos3270").resolve("images").resolve(this.terminalId); @@ -307,11 +305,9 @@ private synchronized void writeTerminalImage() throws IOException, Zos3270Manage graphics.drawString(terminalStatusRow, 1 * fontWidth, (terminalSize.getRows() + 1) * fontHeight); // Prefixing images 1-9 with a 0 to ensure ordering is correct - String imageNum = Integer.toString(i + 1); - if ((i + 1) < 10) { - imageNum = "0" + (i + 1); - } - String terminalFilename = this.terminalId + "-" + String.format("%05d", rasTerminalSequence) + "-" + imageNum + ".png"; + String imageSequence = String.format("%02d", i + 1); + + String terminalFilename = this.terminalId + "-" + String.format("%05d", rasTerminalSequence) + "-" + imageSequence + ".png"; Path terminalPath = terminalImagesDirectory.resolve(terminalFilename); OutputStream os = Files.newOutputStream(terminalPath, From f6e7b241a934bc3bcc02d92067bf0991453ef00a Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Mon, 6 Mar 2023 16:54:24 +0000 Subject: [PATCH 073/263] Also filtered confidential text from Live Terminal screens, put this logic into a method Signed-off-by: Jade Carino --- .../zos3270/spi/Zos3270TerminalImpl.java | 94 ++++++++++--------- 1 file changed, 51 insertions(+), 43 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index f8003a4d1..27ea6d1ff 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -173,16 +173,13 @@ public synchronized void screenUpdated(Direction direction, AttentionIdentificat liveTerminalSequence++; dev.galasa.zos3270.common.screens.Terminal liveTerminal = new dev.galasa.zos3270.common.screens.Terminal( this.terminalId, this.runId, liveTerminalSequence, terminalSize); - liveTerminal.getImages().add(terminalImage); + TerminalImage newTerminalImage = removeConfidentialTextFromTerminalImage(terminalImage); + liveTerminal.getImages().add(newTerminalImage); JsonObject intermediateJson = (JsonObject) gson.toJsonTree(liveTerminal); stripFalseBooleans(intermediateJson); String tempJson = gson.toJson(intermediateJson); - if (applyCtf) { - tempJson = cts.removeConfidentialText(tempJson); - } - HttpURLConnection connection = (HttpURLConnection) this.liveTerminalUrl.openConnection(); connection.setRequestMethod("PUT"); connection.addRequestProperty("Content-Type", "application/json"); @@ -362,44 +359,7 @@ private synchronized void writeTerminalGzJson() throws IOException { for (TerminalImage terminalImage : this.cachedImages){ - // Create a new TerminalImage based on the one we are iterating on - TerminalImage newTerminalImage = new TerminalImage(terminalImage.getSequence(), terminalImage.getId(), - terminalImage.isInbound(), terminalImage.getType(), terminalImage.getAid(),terminalImage.getImageSize(), - terminalImage.getCursorColumn(), terminalImage.getCursorRow()); - - for (TerminalField terminalField : terminalImage.getFields()){ - - // Create a new TerminalField based on the one we are iterating on - TerminalField newTerminalField = new TerminalField(terminalField.getRow(), terminalField.getColumn(), - terminalField.isUnformatted(), terminalField.isFieldProtected(), terminalField.isFieldNumeric(), - terminalField.isFieldDisplay(), terminalField.isFieldIntenseDisplay(), terminalField.isFieldSelectorPen(), - terminalField.isFieldModifed(), terminalField.getForegroundColour(), terminalField.getBackgroundColour(), terminalField.getHighlight()); - - StringBuilder sb = new StringBuilder(); - for (FieldContents contents : terminalField.getContents()) { - - // Converting FieldContents to Strings and removing confidential text if required - for (Character c : contents.getChars()) { - if (c == null) { - sb.append(" "); - } else { - sb.append(c); - } - } - String fieldText = applyCtf ? cts.removeConfidentialText(sb.toString()) : sb.toString(); - - char[] fieldTextCharArray = fieldText.toCharArray(); - Character[] newArray = new Character[fieldTextCharArray.length]; - for (int i = 0; i < fieldTextCharArray.length; i++){ - newArray[i] = Character.valueOf(fieldTextCharArray[i]); - } - - // Create new FieldContents with the new Character[] with confidential text removed - FieldContents newFieldContents = new FieldContents(newArray); - newTerminalField.getContents().add(newFieldContents); - } - newTerminalImage.getFields().add(newTerminalField); - } + TerminalImage newTerminalImage = removeConfidentialTextFromTerminalImage(terminalImage); rasTerminal.getImages().add(newTerminalImage); } @@ -421,6 +381,54 @@ private synchronized void writeTerminalGzJson() throws IOException { } } + /** + * Creates a copy of the original TerminalImage, iterates through it's TerminalFields and FieldContents, + * and creates a new TerminalImage with confidential text removed. + * @param terminalImage + * @return + */ + private TerminalImage removeConfidentialTextFromTerminalImage(TerminalImage terminalImage){ + // Create a new TerminalImage based on the one we are iterating on + TerminalImage newTerminalImage = new TerminalImage(terminalImage.getSequence(), terminalImage.getId(), + terminalImage.isInbound(), terminalImage.getType(), terminalImage.getAid(),terminalImage.getImageSize(), + terminalImage.getCursorColumn(), terminalImage.getCursorRow()); + + for (TerminalField terminalField : terminalImage.getFields()){ + + // Create a new TerminalField based on the one we are iterating on + TerminalField newTerminalField = new TerminalField(terminalField.getRow(), terminalField.getColumn(), + terminalField.isUnformatted(), terminalField.isFieldProtected(), terminalField.isFieldNumeric(), + terminalField.isFieldDisplay(), terminalField.isFieldIntenseDisplay(), terminalField.isFieldSelectorPen(), + terminalField.isFieldModifed(), terminalField.getForegroundColour(), terminalField.getBackgroundColour(), terminalField.getHighlight()); + + StringBuilder sb = new StringBuilder(); + for (FieldContents contents : terminalField.getContents()) { + + // Converting FieldContents to Strings and removing confidential text if required + for (Character c : contents.getChars()) { + if (c == null) { + sb.append(" "); + } else { + sb.append(c); + } + } + String fieldText = applyCtf ? cts.removeConfidentialText(sb.toString()) : sb.toString(); + + char[] fieldTextCharArray = fieldText.toCharArray(); + Character[] newArray = new Character[fieldTextCharArray.length]; + for (int i = 0; i < fieldTextCharArray.length; i++){ + newArray[i] = Character.valueOf(fieldTextCharArray[i]); + } + + // Create new FieldContents with the new Character[] with confidential text removed + FieldContents newFieldContents = new FieldContents(newArray); + newTerminalField.getContents().add(newFieldContents); + } + newTerminalImage.getFields().add(newTerminalField); + } + return newTerminalImage; + } + public synchronized void flushTerminalCache() { this.cachedImages.clear(); } From 7e0179bc6a192552c84697747ef2b29981f17ac4 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Wed, 8 Mar 2023 20:17:38 +0000 Subject: [PATCH 074/263] Add diagnostics code to elaborate IVT failure in trace. Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../internal/LocalEcosystemImpl.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalEcosystemImpl.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalEcosystemImpl.java index 146376c1a..cbf6bb4e3 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalEcosystemImpl.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalEcosystemImpl.java @@ -500,7 +500,26 @@ public void discard() { // bootstrap try { - Files.copy(this.bootstrapFile, saEcosystem.resolve(bootstrapFile.getFileName().toString())); + if (bootstrapFile == null) { + throw new Exception("Programming logic error: Bootstrap file is null."); + } + Path bootstrapFilePath = bootstrapFile.getFileName(); + if (bootstrapFilePath==null) { + throw new Exception("Programming logic error: Bootstrap file path is null."); + } + String pathString = bootstrapFilePath.toString(); + logger.debug("Bootstrap file path : "+pathString); + + if (saEcosystem == null) { + throw new Exception("Programming logic error: saEcosystem is null."); + } + Path ecosystemPath = saEcosystem.resolve(pathString); + if (ecosystemPath == null) { + throw new Exception("Programming logic error: ecosystemPath is null."); + } + logger.debug("ecosystemPath : "+pathString.toString()); + + Files.copy(this.bootstrapFile, ecosystemPath); } catch(Exception e) { logger.warn("Failed to save the local ecosystem bootstrap",e); } From 664d69bc537ee0bd3ce64c35c7485f9a729167c3 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Thu, 9 Mar 2023 16:32:34 +0000 Subject: [PATCH 075/263] Add logging to openstack manager, attempting to debug docker inttest failures Signed-off-by: Jade Carino --- .../manager/internal/OpenstackHttpClient.java | 8 ++++++-- .../manager/internal/OpenstackLinuxImageImpl.java | 6 +++++- .../manager/internal/OpenstackManagerImpl.java | 11 ++++++++++- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java index d7493eb92..271aef2ad 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java @@ -537,10 +537,12 @@ public String retrieveServerPassword(@NotNull Server server) throws OpenstackMan protected String getImageId(@NotNull String image) throws OpenstackManagerException { try { checkToken(); + logger.info("Openstack token is okay"); // *** Retrieve a list of the images - - HttpGet get = new HttpGet(this.openstackImageUri + "/v2/images"); + String uri = this.openstackImageUri + "/v2/images"; + logger.info("Attempting to get a list of the images from " + uri); + HttpGet get = new HttpGet(uri); get.addHeader(this.openstackToken.getHeader()); try (CloseableHttpResponse response = httpClient.execute(get)) { @@ -552,6 +554,7 @@ protected String getImageId(@NotNull String image) throws OpenstackManagerExcept } Images images = gson.fromJson(entity, Images.class); + logger.info(images); if (images != null && images.images != null) { for (Image i : images.images) { if (i.name != null) { @@ -562,6 +565,7 @@ protected String getImageId(@NotNull String image) throws OpenstackManagerExcept } } } + logger.info("No matching imageId found that matched " + image); return null; } catch (OpenstackManagerException e) { throw e; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackLinuxImageImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackLinuxImageImpl.java index 5e7ace757..4120af9b9 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackLinuxImageImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackLinuxImageImpl.java @@ -81,10 +81,14 @@ public void build() throws OpenstackManagerException, ConfigurationPropertyStore + this.tag); String flavor = LinuxFlavor.get(this.image); + logger.info("The Linux flavor is " + flavor); + + String imageName = LinuxName.get(this.image); + logger.info("The image name is " + imageName); Server server = new Server(); server.name = this.instanceName; - server.imageRef = getOpenstackHttpClient().getImageId(LinuxName.get(this.image)); + server.imageRef = getOpenstackHttpClient().getImageId(imageName); server.flavorRef = getOpenstackHttpClient().getFlavourId(flavor); server.availability_zone = LinuxAvailablityZone.get(this.image); server.metadata = new GalasaMetadata(); diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackManagerImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackManagerImpl.java index e2e7f94f1..f68b73bc0 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackManagerImpl.java @@ -157,16 +157,18 @@ public ILinuxProvisionedImage provisionLinux(String tag, OperatingSystem operati // check we are enabled if (!OpenStackEnabled.get()) { + logger.info("OpenStack not enabled"); return null; } // *** Check that we can connect to openstack before we attempt to provision, if // we can't end gracefully and give someone else a chance if (!openstackHttpClient.connectToOpenstack()) { + logger.info("Unable to connect to OpenStack"); return null; } - // *** Locate the possible images that are available for selection + logger.info("Locating possible images that are available for selection"); try { List possibleImages = LinuxImages.get(operatingSystem, null); @@ -174,21 +176,25 @@ public ILinuxProvisionedImage provisionLinux(String tag, OperatingSystem operati nextImage: while(possibleImagesIterator.hasNext()) { String image = possibleImagesIterator.next(); + logger.info("Checking if image " + image + " is correct for this test"); // First check to see the the tests MUST request a capability this server provides List availableCapabilities = LinuxImageCapabilities.get(image); if (!availableCapabilities.isEmpty()) { for(String availableCapability : availableCapabilities) { + logger.info(availableCapability + " is an available capability of this image"); if (availableCapability.startsWith("+")) { String actualAvailableCapability = availableCapability.substring(1); boolean requestedCapability = false; for(String choosenCapability : capabilities) { if (choosenCapability.equalsIgnoreCase(actualAvailableCapability)) { + logger.info("This image has an available capability " + actualAvailableCapability + " that matches a chosen capability " + choosenCapability); requestedCapability = true; break; } } if (!requestedCapability) { + logger.info("This image had no availabilie capabilities that were chosen for this test"); possibleImagesIterator.remove(); continue nextImage; } @@ -209,12 +215,14 @@ public ILinuxProvisionedImage provisionLinux(String tag, OperatingSystem operati availableCapability = availableCapability.substring(1); } if (availableCapability.equalsIgnoreCase(choosenCapability)) { + logger.info("This image has an available capability " + availableCapability + " that matches a required capability " + choosenCapability); found = true; break; } } if (!found) { + logger.info("This image had no available capabilities that we need so it is not possible to use"); possibleImagesIterator.remove(); continue nextImage; } @@ -231,6 +239,7 @@ public ILinuxProvisionedImage provisionLinux(String tag, OperatingSystem operati // *** Select the first image as they will be listed in preference order String selectedImage = possibleImages.get(0); + logger.info("The selected image for this test is " + selectedImage); // *** See if we have capacity for a new Instance on Openstack String instanceName = reserveInstance(); From 7b4244e88c62d99c2ddb9410276475e986a846f8 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Thu, 9 Mar 2023 19:41:27 +0000 Subject: [PATCH 076/263] More logging, needed to add toString or useless message Signed-off-by: Jade Carino --- .../openstack/manager/internal/OpenstackHttpClient.java | 2 +- .../openstack/manager/internal/OpenstackManagerImpl.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java index 271aef2ad..49e72e3be 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java @@ -554,8 +554,8 @@ protected String getImageId(@NotNull String image) throws OpenstackManagerExcept } Images images = gson.fromJson(entity, Images.class); - logger.info(images); if (images != null && images.images != null) { + logger.info(images.toString()); for (Image i : images.images) { if (i.name != null) { if (image.equals(i.name)) { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackManagerImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackManagerImpl.java index f68b73bc0..d45d86bf3 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackManagerImpl.java @@ -191,6 +191,8 @@ public ILinuxProvisionedImage provisionLinux(String tag, OperatingSystem operati logger.info("This image has an available capability " + actualAvailableCapability + " that matches a chosen capability " + choosenCapability); requestedCapability = true; break; + } else { + logger.info("This image's available capability " + availableCapability + " is not required"); } } if (!requestedCapability) { @@ -218,6 +220,8 @@ public ILinuxProvisionedImage provisionLinux(String tag, OperatingSystem operati logger.info("This image has an available capability " + availableCapability + " that matches a required capability " + choosenCapability); found = true; break; + } else { + logger.info("This image's available capability " + availableCapability + " is not required"); } } From 91dd0a6b233dbad1f8613b27e45462670dbb0f62 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Thu, 9 Mar 2023 21:48:00 +0000 Subject: [PATCH 077/263] Update logging in OpenStack Manager again Signed-off-by: Jade Carino --- .../openstack/manager/internal/OpenstackHttpClient.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java index 49e72e3be..fb46bd00e 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java @@ -555,14 +555,17 @@ protected String getImageId(@NotNull String image) throws OpenstackManagerExcept Images images = gson.fromJson(entity, Images.class); if (images != null && images.images != null) { - logger.info(images.toString()); for (Image i : images.images) { if (i.name != null) { + logger.info("Image name: " + i.name); + logger.info("Image ID: " + i.id); if (image.equals(i.name)) { return i.id; } } } + } else { + logger.info("No images returned from Openstack"); } } logger.info("No matching imageId found that matched " + image); From bc6ea2c4afe6a213248c5f2d1e912b2105ebe0f3 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 15 Mar 2023 13:24:48 +0000 Subject: [PATCH 078/263] Change extra logger messages to trace instead of info, and search for specific image in Openstack instead of all images Signed-off-by: Jade Carino --- .../manager/internal/OpenstackHttpClient.java | 28 ++++++++----------- .../internal/OpenstackLinuxImageImpl.java | 4 +-- .../internal/OpenstackManagerImpl.java | 24 ++++++++-------- 3 files changed, 26 insertions(+), 30 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java index fb46bd00e..d31e90463 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java @@ -537,11 +537,11 @@ public String retrieveServerPassword(@NotNull Server server) throws OpenstackMan protected String getImageId(@NotNull String image) throws OpenstackManagerException { try { checkToken(); - logger.info("Openstack token is okay"); + logger.trace("Openstack token is okay"); - // *** Retrieve a list of the images - String uri = this.openstackImageUri + "/v2/images"; - logger.info("Attempting to get a list of the images from " + uri); + // *** Attempt to retrieve the image we want from Openstack + String uri = this.openstackImageUri + "/v2/images?name=" + image; + logger.trace("Attempting to get the image " + image + " from " + uri); HttpGet get = new HttpGet(uri); get.addHeader(this.openstackToken.getHeader()); @@ -553,22 +553,18 @@ protected String getImageId(@NotNull String image) throws OpenstackManagerExcept throw new OpenstackManagerException("OpenStack list image failed - " + status); } - Images images = gson.fromJson(entity, Images.class); - if (images != null && images.images != null) { - for (Image i : images.images) { - if (i.name != null) { - logger.info("Image name: " + i.name); - logger.info("Image ID: " + i.id); - if (image.equals(i.name)) { - return i.id; - } + Image openStackImage = gson.fromJson(entity, Image.class); + if (openStackImage != null) { + if (openStackImage.name != null) { + logger.trace("Image name: " + openStackImage.name); + logger.trace("Image ID: " + openStackImage.id); + if (image.equals(openStackImage.name)) { + return openStackImage.id; } } - } else { - logger.info("No images returned from Openstack"); } } - logger.info("No matching imageId found that matched " + image); + logger.trace("Image " + image + " wasn't found in Openstack"); return null; } catch (OpenstackManagerException e) { throw e; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackLinuxImageImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackLinuxImageImpl.java index 4120af9b9..1c85bca75 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackLinuxImageImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackLinuxImageImpl.java @@ -81,10 +81,10 @@ public void build() throws OpenstackManagerException, ConfigurationPropertyStore + this.tag); String flavor = LinuxFlavor.get(this.image); - logger.info("The Linux flavor is " + flavor); + logger.trace("The Linux flavor is " + flavor); String imageName = LinuxName.get(this.image); - logger.info("The image name is " + imageName); + logger.trace("The image name is " + imageName); Server server = new Server(); server.name = this.instanceName; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackManagerImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackManagerImpl.java index d45d86bf3..378729c0f 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackManagerImpl.java @@ -157,18 +157,18 @@ public ILinuxProvisionedImage provisionLinux(String tag, OperatingSystem operati // check we are enabled if (!OpenStackEnabled.get()) { - logger.info("OpenStack not enabled"); + logger.trace("OpenStack not enabled"); return null; } // *** Check that we can connect to openstack before we attempt to provision, if // we can't end gracefully and give someone else a chance if (!openstackHttpClient.connectToOpenstack()) { - logger.info("Unable to connect to OpenStack"); + logger.trace("Unable to connect to OpenStack"); return null; } - logger.info("Locating possible images that are available for selection"); + logger.trace("Locating possible images that are available for selection"); try { List possibleImages = LinuxImages.get(operatingSystem, null); @@ -176,27 +176,27 @@ public ILinuxProvisionedImage provisionLinux(String tag, OperatingSystem operati nextImage: while(possibleImagesIterator.hasNext()) { String image = possibleImagesIterator.next(); - logger.info("Checking if image " + image + " is correct for this test"); + logger.trace("Checking if image " + image + " is correct for this test"); // First check to see the the tests MUST request a capability this server provides List availableCapabilities = LinuxImageCapabilities.get(image); if (!availableCapabilities.isEmpty()) { for(String availableCapability : availableCapabilities) { - logger.info(availableCapability + " is an available capability of this image"); + logger.trace(availableCapability + " is an available capability of this image"); if (availableCapability.startsWith("+")) { String actualAvailableCapability = availableCapability.substring(1); boolean requestedCapability = false; for(String choosenCapability : capabilities) { if (choosenCapability.equalsIgnoreCase(actualAvailableCapability)) { - logger.info("This image has an available capability " + actualAvailableCapability + " that matches a chosen capability " + choosenCapability); + logger.trace("This image has an available capability " + actualAvailableCapability + " that matches a chosen capability " + choosenCapability); requestedCapability = true; break; } else { - logger.info("This image's available capability " + availableCapability + " is not required"); + logger.trace("This image's available capability " + availableCapability + " is not required"); } } if (!requestedCapability) { - logger.info("This image had no availabilie capabilities that were chosen for this test"); + logger.trace("This image had no availabilie capabilities that were chosen for this test"); possibleImagesIterator.remove(); continue nextImage; } @@ -217,16 +217,16 @@ public ILinuxProvisionedImage provisionLinux(String tag, OperatingSystem operati availableCapability = availableCapability.substring(1); } if (availableCapability.equalsIgnoreCase(choosenCapability)) { - logger.info("This image has an available capability " + availableCapability + " that matches a required capability " + choosenCapability); + logger.trace("This image has an available capability " + availableCapability + " that matches a required capability " + choosenCapability); found = true; break; } else { - logger.info("This image's available capability " + availableCapability + " is not required"); + logger.trace("This image's available capability " + availableCapability + " is not required"); } } if (!found) { - logger.info("This image had no available capabilities that we need so it is not possible to use"); + logger.trace("This image had no available capabilities that we need so it is not possible to use"); possibleImagesIterator.remove(); continue nextImage; } @@ -243,7 +243,7 @@ public ILinuxProvisionedImage provisionLinux(String tag, OperatingSystem operati // *** Select the first image as they will be listed in preference order String selectedImage = possibleImages.get(0); - logger.info("The selected image for this test is " + selectedImage); + logger.trace("The selected image for this test is " + selectedImage); // *** See if we have capacity for a new Instance on Openstack String instanceName = reserveInstance(); From e5e0834db6d37075de40ce2c8032c9bb2d74ea49 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Thu, 16 Mar 2023 09:34:28 +0000 Subject: [PATCH 079/263] Adding more debugging and also searching for a non-snapshot image in Openstack as we still can't see the one we need Signed-off-by: Jade Carino --- .../openstack/manager/internal/OpenstackHttpClient.java | 5 +++++ .../manager/internal/OpenstackLinuxImageImpl.java | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java index d31e90463..61ac07c6e 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java @@ -553,6 +553,11 @@ protected String getImageId(@NotNull String image) throws OpenstackManagerExcept throw new OpenstackManagerException("OpenStack list image failed - " + status); } + logger.trace("Response code is " + status.getStatusCode()); + + logger.trace("Logging the entity in case the JSON deserialisation below is what fails"); + logger.trace(entity); + Image openStackImage = gson.fromJson(entity, Image.class); if (openStackImage != null) { if (openStackImage.name != null) { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackLinuxImageImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackLinuxImageImpl.java index 1c85bca75..72c25154d 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackLinuxImageImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackLinuxImageImpl.java @@ -89,6 +89,15 @@ public void build() throws OpenstackManagerException, ConfigurationPropertyStore Server server = new Server(); server.name = this.instanceName; server.imageRef = getOpenstackHttpClient().getImageId(imageName); + + /* REMOVE AFTER SEEING OUTPUT */ + logger.trace("For debugging purposes, attempting to list a non-Snapshot image in Openstack to check our visibility"); + String nonSnapshotImageImageRef = getOpenstackHttpClient().getImageId("lxc-ubuntu-16.04"); + if (nonSnapshotImageImageRef != null && nonSnapshotImageImageRef != ""){ + logger.trace("lxc-ubuntu-16.04 Image ID is: " + nonSnapshotImageImageRef); + } + + server.flavorRef = getOpenstackHttpClient().getFlavourId(flavor); server.availability_zone = LinuxAvailablityZone.get(this.image); server.metadata = new GalasaMetadata(); From f9498374c8da0cbc50b44be950090ef8303b5773 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Thu, 16 Mar 2023 12:09:27 +0000 Subject: [PATCH 080/263] Remove unneeded logging and deserialise JSON for a single image search properly Signed-off-by: Jade Carino --- .../manager/internal/OpenstackHttpClient.java | 26 ++++++++----------- .../internal/OpenstackLinuxImageImpl.java | 9 ------- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java index 61ac07c6e..bf3018754 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java @@ -537,9 +537,8 @@ public String retrieveServerPassword(@NotNull Server server) throws OpenstackMan protected String getImageId(@NotNull String image) throws OpenstackManagerException { try { checkToken(); - logger.trace("Openstack token is okay"); - // *** Attempt to retrieve the image we want from Openstack + /* Attempt to retrieve the image ID we want from Openstack using the image name */ String uri = this.openstackImageUri + "/v2/images?name=" + image; logger.trace("Attempting to get the image " + image + " from " + uri); HttpGet get = new HttpGet(uri); @@ -553,21 +552,18 @@ protected String getImageId(@NotNull String image) throws OpenstackManagerExcept throw new OpenstackManagerException("OpenStack list image failed - " + status); } - logger.trace("Response code is " + status.getStatusCode()); - - logger.trace("Logging the entity in case the JSON deserialisation below is what fails"); - logger.trace(entity); - - Image openStackImage = gson.fromJson(entity, Image.class); - if (openStackImage != null) { - if (openStackImage.name != null) { - logger.trace("Image name: " + openStackImage.name); - logger.trace("Image ID: " + openStackImage.id); - if (image.equals(openStackImage.name)) { - return openStackImage.id; + /* Even though we are searching by image name, the JSON returned is still an array of images */ + Images images = gson.fromJson(entity, Images.class); + if (images != null & images.images != null) { + for (Image i :images.images){ + if (i.name != null && i.name != ""){ + if (image.equals(i.name)) { + logger.trace("Image " + image + " found"); + return i.id; + } } } - } + } } logger.trace("Image " + image + " wasn't found in Openstack"); return null; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackLinuxImageImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackLinuxImageImpl.java index 72c25154d..1c85bca75 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackLinuxImageImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackLinuxImageImpl.java @@ -89,15 +89,6 @@ public void build() throws OpenstackManagerException, ConfigurationPropertyStore Server server = new Server(); server.name = this.instanceName; server.imageRef = getOpenstackHttpClient().getImageId(imageName); - - /* REMOVE AFTER SEEING OUTPUT */ - logger.trace("For debugging purposes, attempting to list a non-Snapshot image in Openstack to check our visibility"); - String nonSnapshotImageImageRef = getOpenstackHttpClient().getImageId("lxc-ubuntu-16.04"); - if (nonSnapshotImageImageRef != null && nonSnapshotImageImageRef != ""){ - logger.trace("lxc-ubuntu-16.04 Image ID is: " + nonSnapshotImageImageRef); - } - - server.flavorRef = getOpenstackHttpClient().getFlavourId(flavor); server.availability_zone = LinuxAvailablityZone.get(this.image); server.metadata = new GalasaMetadata(); From 6794f5fb6b3c7ee63e6cbd8d0d3e3ac79c7b5eb3 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Thu, 16 Mar 2023 15:32:36 +0000 Subject: [PATCH 081/263] Fix font comparison (#864) Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index ed5d51e69..9594c1396 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -253,7 +253,7 @@ private synchronized void writeTerminalImages() throws IOException, Zos3270Manag // Ensures the font family is monospaced so that the images appear as expected // If the font family is not monospaced, the font defaults to "Dialog", which skews images Font font = new Font(Font.MONOSPACED, Font.PLAIN, 10); - if (font.getFamily() != Font.MONOSPACED) { + if (!font.getFamily().equals(Font.MONOSPACED)) { throw new Zos3270ManagerException("Unable to set Monospaced font"); } graphics.setFont(font); From 994a79723520ffcd609bc51de81b9c92c3b308b7 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Fri, 17 Mar 2023 12:14:14 +0000 Subject: [PATCH 082/263] Add CPS property to select 3270 terminal outputs (#865) * Add CPS property to select 3270 terminal outputs Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> * Make CPS reference constant Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --------- Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../internal/properties/TerminalOutput.java | 30 +++++++++++++++++++ .../zos3270/spi/Zos3270TerminalImpl.java | 17 +++++++++-- 2 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/TerminalOutput.java diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/TerminalOutput.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/TerminalOutput.java new file mode 100644 index 000000000..fae4ef9d6 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/TerminalOutput.java @@ -0,0 +1,30 @@ +/* + * Copyright contributors to the Galasa project + */ +package dev.galasa.zos3270.internal.properties; + +import java.util.List; + +import dev.galasa.framework.spi.cps.CpsProperties; +import dev.galasa.zos3270.Zos3270ManagerException; + +/** + * The 3270 terminal outputs to store in the RAS. + *

      + *

      + * The property is:
      + *
      + * zos3270.terminal.output=json,png + *

      + *

      + * The default is json. + *

      + * + * + */ +public class TerminalOutput extends CpsProperties { + + public static List get() throws Zos3270ManagerException { + return getStringListWithDefault(Zos3270PropertiesSingleton.cps(), "json", "terminal", "output"); + } +} diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index 9594c1396..efa3f5846 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -52,6 +52,7 @@ import dev.galasa.zos3270.internal.properties.LiveTerminalUrl; import dev.galasa.zos3270.internal.properties.LogConsoleTerminals; import dev.galasa.zos3270.internal.properties.TerminalDeviceTypes; +import dev.galasa.zos3270.internal.properties.TerminalOutput; public class Zos3270TerminalImpl extends Terminal implements IScreenUpdateListener { @@ -65,6 +66,7 @@ public class Zos3270TerminalImpl extends Terminal implements IScreenUpdateListen private final IConfidentialTextService cts; private final boolean applyCtf; + private final List terminalOutput; private final ArrayList cachedImages = new ArrayList<>(); @@ -93,6 +95,7 @@ public Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFrame this.autoConnect = autoConnect; this.cts = framework.getConfidentialTextService(); this.applyCtf = ApplyConfidentialTextFiltering.get(); + this.terminalOutput = TerminalOutput.get(); this.textScan = textScanner; getScreen().registerScreenUpdateListener(this); @@ -217,8 +220,18 @@ public synchronized void writeRasOutput() { rasTerminalSequence++; try { - writeTerminalGzJson(); - writeTerminalImages(); + for (String outputFormat : terminalOutput) { + switch (outputFormat.toLowerCase()) { + case "json": + writeTerminalGzJson(); + break; + case "png": + writeTerminalImages(); + break; + default: + throw new Zos3270ManagerException("Unknown output format: " + outputFormat); + } + } } catch (Exception e) { logger.error("Unable to write terminal cache to the RAS", e); rasTerminalSequence--; From ab37f4c74940f743305ed6c93eb6b55a60739d98 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Fri, 17 Mar 2023 13:16:06 +0000 Subject: [PATCH 083/263] Close Outputstream after use Signed-off-by: Jade Carino --- .../main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index efa3f5846..a5baece13 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -325,6 +325,8 @@ private synchronized void writeTerminalImages() throws IOException, Zos3270Manag StandardOpenOption.CREATE); ImageIO.write(image, "png", os); + os.flush(); + os.close(); graphics.clearRect(0, 0, width, height); } } @@ -387,6 +389,8 @@ private synchronized void writeTerminalGzJson() throws IOException { new SetContentType(new ResultArchiveStoreContentType("application/zos3270terminal")), StandardOpenOption.CREATE))) { IOUtils.write(tempJson, gos, "utf-8"); + gos.flush(); + gos.close(); } } From 8f55b4a252b722b44aeca2f30e38c741f74eccc3 Mon Sep 17 00:00:00 2001 From: Will Yates Date: Tue, 28 Mar 2023 12:27:39 +0100 Subject: [PATCH 084/263] snake 2 (#867) Signed-off-by: Will Yates --- .../dev.galasa.galasaecosystem.manager/build.gradle | 4 ++-- release.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle index aa3f476f1..a9ae13ac7 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Ecosystem Manager' -version = '0.25.0' +version = '0.27.0' dependencies { implementation 'commons-io:commons-io:2.9.0' @@ -17,6 +17,6 @@ dependencies { api project(':galasa-managers-unix-parent:dev.galasa.linux.manager') api project(':galasa-managers-windows-parent:dev.galasa.windows.manager') api project(':galasa-managers-zos-parent:dev.galasa.zos.manager') - implementation 'org.yaml:snakeyaml:1.33' + implementation 'org.yaml:snakeyaml:2.0' implementation 'com.google.code.gson:gson:2.8.9' } diff --git a/release.yaml b/release.yaml index dc616bf49..cfa16c4fa 100644 --- a/release.yaml +++ b/release.yaml @@ -172,7 +172,7 @@ managers: isolated: true - artifact: dev.galasa.galasaecosystem.manager - version: 0.25.0 + version: 0.27.0 obr: true bom: true isolated: true From 5838f76e8606ebb981af519faebc5b0797c76d4a Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Mon, 3 Apr 2023 21:03:01 +0100 Subject: [PATCH 085/263] bump version of framework and galasa-boot Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../buildSrc/src/main/groovy/galasa.manager.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle index 896e41e89..bbef42903 100644 --- a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle +++ b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle @@ -6,7 +6,7 @@ plugins { dependencies { api 'dev.galasa:dev.galasa:0.21.0' - implementation 'dev.galasa:dev.galasa.framework:0.26.0' + implementation 'dev.galasa:dev.galasa.framework:0.27.0' implementation 'commons-logging:commons-logging:1.2' implementation 'org.osgi:org.osgi.core:6.0.0' implementation 'org.osgi:org.osgi.service.component.annotations:1.3.0' From 8dc2235e4b41f65e6fa400e73272b1277e98873f Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Thu, 13 Apr 2023 15:27:29 +0100 Subject: [PATCH 086/263] Delete old docker dir Signed-off-by: Jade Carino --- docker/.gitignore | 1 - docker/Dockerfile | 6 ------ 2 files changed, 7 deletions(-) delete mode 100644 docker/.gitignore delete mode 100644 docker/Dockerfile diff --git a/docker/.gitignore b/docker/.gitignore deleted file mode 100644 index 7d37f1a59..000000000 --- a/docker/.gitignore +++ /dev/null @@ -1 +0,0 @@ -repo/ diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 68cf25c62..000000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -ARG dockerRepository -ARG branch -FROM ${dockerRepository}/galasadev/galasa-maven-extensions:${branch} - -COPY repo/ /usr/local/apache2/htdocs/ -COPY managers.githash /usr/local/apache2/htdocs/managers.githash From c40c468cd9dd59ace80bb692925de410694caa85 Mon Sep 17 00:00:00 2001 From: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> Date: Wed, 17 May 2023 11:51:00 +0100 Subject: [PATCH 087/263] Add getCicsTerminals (#872) * added getCicsTerminals Signed-off-by: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> * bump cicsTSManager version Signed-off-by: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> --- .../dev.galasa.cicsts.manager/build.gradle | 2 +- .../java/dev/galasa/cicsts/internal/CicstsManagerImpl.java | 5 +++++ .../main/java/dev/galasa/cicsts/spi/ICicstsManagerSpi.java | 2 ++ release.yaml | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle index 03b97ba1c..e94804d98 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa CICS/TS Manager' -version = '0.26.0' +version = '0.28.0' dependencies { api project (':galasa-managers-zos-parent:dev.galasa.zos.manager') diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java index e522fc7ea..1ba0094cf 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java @@ -448,4 +448,9 @@ public Map getTaggedCicsRegions() { } return clonedTaggedCicsRegions; } + + @Override + public List getCicsTerminals() { + return new ArrayList<>(this.terminals); + } } diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicstsManagerSpi.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicstsManagerSpi.java index 42199f3c9..6f540c1c5 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicstsManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicstsManagerSpi.java @@ -97,4 +97,6 @@ public interface ICicstsManagerSpi { public Map getTaggedCicsRegions(); public ICicsRegion locateCicsRegion(String tag) throws CicstsManagerException; + + public List getCicsTerminals(); } diff --git a/release.yaml b/release.yaml index cfa16c4fa..a99ddb7b5 100644 --- a/release.yaml +++ b/release.yaml @@ -29,7 +29,7 @@ managers: isolated: true - artifact: dev.galasa.cicsts.manager - version: 0.26.0 + version: 0.28.0 obr: true mvp: true javadoc: true From e358269d5fe66746ff664eac410ab08ccb3c1b1b Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Wed, 24 May 2023 16:33:51 +0100 Subject: [PATCH 088/263] refactor to make discard() easier to read, and avoid null pointer exceptions Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../internal/LocalEcosystemImpl.java | 245 ++++++++++++------ 1 file changed, 169 insertions(+), 76 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalEcosystemImpl.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalEcosystemImpl.java index cbf6bb4e3..b82ca9e1c 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalEcosystemImpl.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalEcosystemImpl.java @@ -13,11 +13,13 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardOpenOption; +import java.text.MessageFormat; import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import java.util.Map.Entry; import java.util.Properties; import java.util.stream.Stream; @@ -462,136 +464,227 @@ protected void addLocalRun(@NotNull LocalRun localRun) { this.localRuns.add(localRun); } - public void discard() { - + + private void discardRunIdPrefix() { // Release runid prefix - try { this.runIdPrefix.discard(); } catch (GalasaEcosystemManagerException e) { logger.warn("Failed to discard runid prefix from dss", e); } + } - // save all data in the stored artifacts - - Path saRoot = getEcosystemManager().getFramework().getResultArchiveStore().getStoredArtifactsRoot(); - Path saEcosystem = saRoot.resolve("ecosystem"); - - // CPS + private void saveArtifactFile(Path ecosystemRootFolderPath , Path sourceFilePath , String artifactName ) { try { - Files.copy(this.cpsFile, saEcosystem.resolve(cpsFile.getFileName().toString())); + Files.copy(cpsFile, ecosystemRootFolderPath.resolve(sourceFilePath.getFileName().toString())); } catch(Exception e) { - logger.warn("Failed to save the local ecosystem CPS",e); + logger.warn("Failed to save the local ecosystem "+artifactName,e); } + } - // DSS - try { - Files.copy(this.dssFile, saEcosystem.resolve(dssFile.getFileName().toString())); - } catch(Exception e) { - logger.warn("Failed to save the local ecosystem DSS",e); - } + private void saveArtifactFile( + Path targetRunFolderPath , + String runName, + Path sourceRasRunFolderPath , + String artifactName ) { - // overrides try { - Files.copy(this.overridesFile, saEcosystem.resolve(overridesFile.getFileName().toString())); + Path sourceFile = sourceRasRunFolderPath.resolve(artifactName); + if (Files.exists(sourceFile)) { + Files.copy(sourceFile, targetRunFolderPath.resolve(sourceFile.getFileName().toString())); + } } catch(Exception e) { - logger.warn("Failed to save the local ecosystem overrides",e); + logger.warn("Failed to copy run:" + runName + " artifact: "+artifactName,e); } + } - // bootstrap + private void saveBootstrap(Path bootstrapFile, Path ecosystemRootFolderPath) { try { if (bootstrapFile == null) { throw new Exception("Programming logic error: Bootstrap file is null."); } + Path bootstrapFilePath = bootstrapFile.getFileName(); if (bootstrapFilePath==null) { throw new Exception("Programming logic error: Bootstrap file path is null."); } + String pathString = bootstrapFilePath.toString(); logger.debug("Bootstrap file path : "+pathString); - if (saEcosystem == null) { - throw new Exception("Programming logic error: saEcosystem is null."); - } - Path ecosystemPath = saEcosystem.resolve(pathString); + if (ecosystemRootFolderPath == null) { + throw new Exception("Programming logic error: ecosystemRootFolderPath is null."); + } + + Path ecosystemPath = ecosystemRootFolderPath.resolve(pathString); if (ecosystemPath == null) { throw new Exception("Programming logic error: ecosystemPath is null."); } logger.debug("ecosystemPath : "+pathString.toString()); - Files.copy(this.bootstrapFile, ecosystemPath); + Files.copy(bootstrapFile, ecosystemPath); + } catch(Exception e) { logger.warn("Failed to save the local ecosystem bootstrap",e); } + } - logger.info("Not saving credentials into stored artifacts for security reasons"); + public void discard() { + + discardRunIdPrefix(); - // copy all the run data - for(LocalRun run : this.localRuns) { - String runName = run.getRunName(); + // save all data in the stored artifacts - Path rasRun = this.rasDirectory.resolve(runName); - Path saRun = saEcosystem.resolve("runs").resolve(runName); + Path saRoot = getEcosystemManager().getFramework().getResultArchiveStore().getStoredArtifactsRoot(); + Path ecosystemRootFolder = saRoot.resolve("ecosystem"); - try { - Path runLog = rasRun.resolve("run.log"); - if (Files.exists(runLog)) { - Files.copy(runLog, saRun.resolve(runLog.getFileName().toString())); - } - } catch(Exception e) { - logger.warn("Failed to copy run " + runName + " run log",e); - } + if (ecosystemRootFolder == null) { + logger.warn("Failed to save the local ecosystem CPS,DSS,overrides: Programming logic error: ecosystemRootFolder is null."); + } else { + saveArtifactFile(cpsFile , ecosystemRootFolder, "CPS"); + saveArtifactFile(this.dssFile , ecosystemRootFolder, "DSS"); + saveArtifactFile(this.overridesFile , ecosystemRootFolder, "Overrides"); + + saveBootstrap(bootstrapFile, ecosystemRootFolder); - try { - Path structure = rasRun.resolve("structure.json"); - if (Files.exists(structure)) { - Files.copy(structure, saRun.resolve(structure.getFileName().toString())); - } - } catch(Exception e) { - logger.warn("Failed to copy run " + runName + " structure json",e); + logger.info("Not saving credentials into stored artifacts for security reasons"); + + saveRunsData( this.localRuns , this.rasDirectory, ecosystemRootFolder); + } + } + + /** + * A data bean class which represents an artifact. + * + * You can get these by reading an artifact metadata file. + */ + public static class ArtifactDescriptor { + private String path ; + private String contentType ; + + public ArtifactDescriptor(String path, String contentType) { + this.path = path ; + this.contentType = contentType; + } + + public String getPath() { + return this.path; + } + + public String getContentType() { + return this.contentType; + } + + @Override + public String toString() { + String template = "path: ''{0}'' contentType: ''{1}''"; + return MessageFormat.format(template,path,contentType); + } + } + + /** + * The artifacts are described by a metadata file. + * + * This is a properties file which has the form + * key=value + * + * Where key is the path into the RAS folder of the artifact. + * And value is the content type used to create the folder + * in the target RAS folder. + * + * Using this function to encapsulate the gathering of the artifact + * descriptor information from that file, in case the file format changes. + * eg: To a json file which has more information inside. + * + * Ideally, we would have an ArtifactMetadata object which housed the code which + * does saving, and loading of the data... + * + * @param sourceRasRunFolder + * @return A list of ArtifactDescriptor objects. + */ + private List getArtifacts(Path sourceRasRunFolder) throws IOException { + Path artifactsMetadataFile = sourceRasRunFolder.resolve("artifacts.properties"); + List artifacts = new ArrayList(); + Properties artifactProperties = new Properties(); + if (Files.exists(artifactsMetadataFile)) { + artifactProperties.load(Files.newInputStream(artifactsMetadataFile)); + + for(Entry entry : artifactProperties.entrySet()) { + + + String path = (String) entry.getKey(); + String pathNoLeadingSlash = path.substring(1); + + String contentType = (String) entry.getValue(); + ArtifactDescriptor artifact = new ArtifactDescriptor(pathNoLeadingSlash, contentType); + + artifacts.add(artifact); } + } + return artifacts ; + } + + private void saveRunsData( List localRuns , Path rasDirectory, Path ecosystemRootFolder ) { + + if (ecosystemRootFolder == null) { + logger.warn("Failed to save the local run log, structure, artifacts.properties, all other artifacts...etc : Programming logic error: saEcosystem is null."); + } else { + + // copy all the run data + for(LocalRun run : localRuns) { + String runName = run.getRunName(); + + Path rasRun = rasDirectory.resolve(runName); + + Path saRun = ecosystemRootFolder.resolve("runs").resolve(runName); + if (saRun==null) { + logger.warn("Failed to save artifacts for run "+runName+": Program logic error: saRun is null."); + } else { + // Save the framework files. + saveArtifactFile(saRun, runName, rasRun, "run.log"); + saveArtifactFile(saRun, runName, rasRun, "structure.json"); + saveArtifactFile(saRun, runName, rasRun, "artifacts.properties"); - try { - Path artifacts = rasRun.resolve("artifacts.properties"); - if (Files.exists(artifacts)) { - Files.copy(artifacts, saRun.resolve(artifacts.getFileName().toString())); + // Save the files that testcases/managers added. + saveTestCaseArtifactFiles(saRun, runName, rasRun); } - } catch(Exception e) { - logger.warn("Failed to copy run " + runName + " artifacts properties",e); } + } + } + private void saveTestCaseArtifactFiles(Path saRun, String runName, Path rasRun) { + try { + Path artifactsDirectory = rasRun.resolve("artifacts"); - try { - Properties artifacts = new Properties(); - Path artifactsFile = rasRun.resolve("artifacts.properties"); - Path artifactsDirectory = rasRun.resolve("artifacts"); - if (Files.exists(artifactsFile) && Files.exists(artifactsDirectory)) { - artifacts.load(Files.newInputStream(artifactsFile)); + // Don't bother going further if there is no artifacts folder + // where testcase-generated artifacts get stored. + if( Files.exists(artifactsDirectory) ) { - for(Entry entry : artifacts.entrySet()) { - String key = (String) entry.getKey(); - String value = (String) entry.getValue(); + List artifacts = getArtifacts(rasRun); + for( ArtifactDescriptor artifactDescriptor : artifacts ) { - try { - String artifactPath = key.substring(1); + try { + String artifactPath = artifactDescriptor.getPath(); + String contentType = artifactDescriptor.getContentType(); + + Path sourceArtifactPath = saRun.resolve(artifactPath); + Files.createDirectories(sourceArtifactPath.getParent()); - Path saArtifact = saRun.resolve(artifactPath); - Files.createDirectories(saArtifact.getParent()); - Path rasArtifact = artifactsDirectory.resolve(artifactPath); - ResultArchiveStoreContentType type = new ResultArchiveStoreContentType(value); + Path rasArtifact = artifactsDirectory.resolve(artifactPath); + ResultArchiveStoreContentType type = new ResultArchiveStoreContentType(contentType); - try (InputStream is = Files.newInputStream(rasArtifact); - OutputStream os = Files.newOutputStream(saArtifact, StandardOpenOption.CREATE_NEW, new SetContentType(type))) { - IOUtils.copy(is, os); - } - } catch(Exception e) { - logger.warn("Failed to copy run " + runName + " artifact " + key,e); + try (InputStream is = Files.newInputStream(rasArtifact); + OutputStream os = Files.newOutputStream(sourceArtifactPath, StandardOpenOption.CREATE_NEW, new SetContentType(type))) { + IOUtils.copy(is, os); } + + } catch(Exception e) { + logger.warn("Failed to copy run " + runName + " artifact " + artifactDescriptor,e); } } - } catch(Exception e) { - logger.warn("Failed to copy run " + runName + " artifacts",e); } + } catch(Exception e) { + logger.warn("Failed to copy run " + runName + " artifacts",e); } } From 6596f4602933ae639c28ecc61deacd6282c6cfff Mon Sep 17 00:00:00 2001 From: Will Yates Date: Fri, 26 May 2023 11:48:36 +0200 Subject: [PATCH 089/263] extra logging to assist when selecting a zosImage (#873) * extra logging to assist when selecting a zosImage Signed-off-by: Will Yates * bump zos manager Signed-off-by: Will Yates --------- Signed-off-by: Will Yates --- .../dev.galasa.zos.manager/build.gradle | 2 +- .../dev/galasa/zos/internal/ZosManagerImpl.java | 15 ++++++++++----- release.yaml | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle index 0db512431..05bbe85d6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS Manager' -version = '0.26.0' +version = '0.28.0' dependencies { api project (':galasa-managers-comms-parent:dev.galasa.ipnetwork.manager') diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosManagerImpl.java index f47e5f177..033e33c85 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosManagerImpl.java @@ -283,6 +283,7 @@ protected IZosImage generateZosImage(String tag) throws ZosManagerException { } //*** Check to see if we have a DSE for this tag + logger.info("Searching for a zos DSE Image configured for tag " + tag); String imageID = DseImageIdForTag.get(tag); if (imageID != null) { logger.info("zOS DSE Image " + imageID + LOG_SELECTED_FOR_ZOS_TAG + tag + "'"); @@ -293,15 +294,16 @@ protected IZosImage generateZosImage(String tag) throws ZosManagerException { taggedImages.put(tag, selectedImage); return selectedImage; } - + + logger.info("Searching for a zos DSE Cluster configured for tag " + tag); String clusterId = DseClusterIdForTag.get(tag); ZosDseImageImpl image = new ZosDseImageImpl(this, imageID, clusterId); images.put(image.getImageID(), image); taggedImages.put(tag, image); return image; } - - + + logger.info("No DSE Image found, searching for specific zos image for tag " + tag); //*** See if the we need to run on a specific image, not DSE imageID = ImageIdForTag.get(tag); if (imageID != null) { @@ -322,8 +324,8 @@ protected IZosImage generateZosImage(String tag) throws ZosManagerException { DssUtils.incrementMetric(dss, "metrics.slots.insufficent"); throw new ZosManagerException("Unable to provision zOS Image tagged " + tag + " on " + imageID + " as there is insufficient capacity"); } - } - + } + logger.info("No specific image found for tag" + tag + " selecting image"); return selectNewImage(tag); } @@ -370,13 +372,16 @@ public IIpPort generateIpPort(Field field, List annotations) throws protected ZosProvisionedImageImpl selectNewImage(String tag) throws ZosManagerException { //*** Need the cluster we can allocate an image from + logger.info("Searching for cluster ID for tag " + tag); String clusterId = ClusterIdForTag.get(tag); if (clusterId == null) { + logger.info("No cluster ID found for tag " + tag + " assuming DEFAULT"); clusterId = "DEFAULT"; } clusterId = clusterId.toUpperCase(); //*** Find a list of images + logger.info("Searching for list of images for cluster " + clusterId); for(String definedImage : ClusterImages.get(clusterId)) { ZosProvisionedImageImpl image = new ZosProvisionedImageImpl(this, definedImage, clusterId); definedImages.add(new ImageUsage(image)); diff --git a/release.yaml b/release.yaml index a99ddb7b5..ac4f061d2 100644 --- a/release.yaml +++ b/release.yaml @@ -419,7 +419,7 @@ managers: codecoverage: true - artifact: dev.galasa.zos.manager - version: 0.26.0 + version: 0.28.0 obr: true javadoc: true bom: true From 9910fd69e29d72e0b04ceb312d42ceee6936fc5e Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Fri, 2 Jun 2023 13:52:04 +0100 Subject: [PATCH 090/263] Refactored 3270 image generation and added unit tests. Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../images/TerminalImageException.java | 28 ++ .../images/TerminalImageTransform.java | 152 +++++++++ .../screens/json/TerminalJsonTransform.java | 42 +++ .../images/TerminalImageExceptionTest.java | 25 ++ .../images/TerminalImageTransformTest.java | 313 ++++++++++++++++++ .../screens/images/image-data/README.md | 8 + .../testConfientialTextIsRedacted.png | Bin 0 -> 5886 bytes ...erentColumnsAndRowsRendersInStatusArea.png | Bin 0 -> 3808 bytes .../testEmptyTerminalImageRendersOk.png | Bin 0 -> 4380 bytes ...tInboundTrueRendersInboundInStatusArea.png | Bin 0 -> 3823 bytes .../testOutboundRendersAidInStatusArea.png | Bin 0 -> 4168 bytes .../image-data/testTextFieldRendersOk.png | Bin 0 -> 4548 bytes .../json/TerminalJsonTransformTest.java} | 17 +- .../zos3270/spi/Zos3270TerminalImpl.java | 135 ++------ .../commandcodes/ReadModifiedTest.java | 6 +- .../galasa}/zos3270/cursor/BackSpaceTest.java | 2 +- .../galasa}/zos3270/cursor/BackTabTest.java | 2 +- .../zos3270/cursor/FieldOverflowTest.java | 2 +- .../galasa}/zos3270/cursor/HomeTest.java | 2 +- .../galasa}/zos3270/cursor/NewLineTest.java | 2 +- .../galasa}/zos3270/cursor/TabTest.java | 2 +- .../zos3270/datastream/ByteAddressTest.java | 2 +- .../zos3270/datastream/CommandCodeTest.java | 2 +- .../EraseUnprotectedToAddressTest.java | 2 +- .../datastream/GraphicsEscapeTest.java | 2 +- .../datastream/OrderInsertCursorTest.java | 2 +- .../zos3270/datastream/OrderTextTest.java | 2 +- .../datastream/QueryReplySummaryTest.java | 2 +- .../datastream/QueryReplyUsableAreaTest.java | 2 +- .../datastream/RepeatToAddressTest.java | 2 +- .../datastream/SetBufferAddressTest.java | 2 +- .../zos3270/datastream/StartFieldTest.java | 2 +- .../zos3270/datastream/VampScreenTest.java | 2 +- .../datastream/WriteControlCharacterTest.java | 2 +- .../extended/ExtendedDatastreamTest.java | 2 +- .../structuredfields/ReadPartitionTest.java | 2 +- .../galasa}/zos3270/network/ConnectTest.java | 6 +- .../zos3270/network/Message3270Test.java | 3 +- .../zos3270/network/NegotiationTest.java | 12 +- .../zos3270/network/Network3270Test.java | 2 +- .../orders/EraseAllUnprotectedTest.java | 2 +- .../zos3270/orders/GraphicsEscapeTest.java | 2 +- .../galasa}/zos3270/terminal/CursorTest.java | 4 +- .../zos3270/terminal/EraseInputTest.java | 2 +- .../zos3270/terminal/FindTextTest.java | 2 +- .../zos3270/terminal/RetrieveTextTest.java | 4 +- .../galasa}/zos3270/terminal/ScreenTest.java | 2 +- .../galasa}/zos3270/util/DummySocket.java | 2 +- .../galasa}/zos3270/util/DummySocketImpl.java | 2 +- .../zos3270/util/IOExceptionInputStream.java | 2 +- 50 files changed, 647 insertions(+), 168 deletions(-) create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageException.java create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransform.java create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/json/TerminalJsonTransform.java create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageExceptionTest.java create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/README.md create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testConfientialTextIsRedacted.png create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testDifferentColumnsAndRowsRendersInStatusArea.png create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testEmptyTerminalImageRendersOk.png create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testInboundTrueRendersInboundInStatusArea.png create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testOutboundRendersAidInStatusArea.png create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testTextFieldRendersOk.png rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/{TestJson.java => screens/json/TerminalJsonTransformTest.java} (89%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/commandcodes/ReadModifiedTest.java (99%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/cursor/BackSpaceTest.java (99%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/cursor/BackTabTest.java (99%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/cursor/FieldOverflowTest.java (98%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/cursor/HomeTest.java (99%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/cursor/NewLineTest.java (99%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/cursor/TabTest.java (99%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/datastream/ByteAddressTest.java (98%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/datastream/CommandCodeTest.java (97%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/datastream/EraseUnprotectedToAddressTest.java (98%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/datastream/GraphicsEscapeTest.java (98%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/datastream/OrderInsertCursorTest.java (93%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/datastream/OrderTextTest.java (96%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/datastream/QueryReplySummaryTest.java (97%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/datastream/QueryReplyUsableAreaTest.java (97%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/datastream/RepeatToAddressTest.java (95%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/datastream/SetBufferAddressTest.java (94%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/datastream/StartFieldTest.java (99%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/datastream/VampScreenTest.java (97%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/datastream/WriteControlCharacterTest.java (98%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/datastream/extended/ExtendedDatastreamTest.java (99%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/datastream/structuredfields/ReadPartitionTest.java (98%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/network/ConnectTest.java (97%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/network/Message3270Test.java (97%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/network/NegotiationTest.java (95%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/network/Network3270Test.java (99%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/orders/EraseAllUnprotectedTest.java (99%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/orders/GraphicsEscapeTest.java (99%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/terminal/CursorTest.java (98%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/terminal/EraseInputTest.java (99%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/terminal/FindTextTest.java (99%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/terminal/RetrieveTextTest.java (98%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/terminal/ScreenTest.java (99%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/util/DummySocket.java (94%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/util/DummySocketImpl.java (98%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/{test => dev/galasa}/zos3270/util/IOExceptionInputStream.java (90%) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageException.java new file mode 100644 index 000000000..47aaa2bb1 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageException.java @@ -0,0 +1,28 @@ +/* + * Copyright contributors to the Galasa project + */ +package dev.galasa.zos3270.common.screens.images; + +public class TerminalImageException extends Exception { + + private static final long serialVersionUID = 1L; + + public TerminalImageException() { + } + + public TerminalImageException(String message) { + super(message); + } + + public TerminalImageException(Throwable cause) { + super(cause); + } + + public TerminalImageException(String message, Throwable cause) { + super(message, cause); + } + + public TerminalImageException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } +} \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransform.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransform.java new file mode 100644 index 000000000..3df1efe90 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransform.java @@ -0,0 +1,152 @@ +/* + * Copyright contributors to the Galasa project + */ +package dev.galasa.zos3270.common.screens.images; + +import java.awt.Color; +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.Graphics2D; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.io.OutputStream; + +import javax.imageio.ImageIO; + +import dev.galasa.framework.spi.IConfidentialTextService; +import dev.galasa.zos3270.common.screens.FieldContents; +import dev.galasa.zos3270.common.screens.TerminalField; +import dev.galasa.zos3270.common.screens.TerminalImage; +import dev.galasa.zos3270.common.screens.TerminalSize; + +public class TerminalImageTransform { + + private TerminalSize terminalSize ; + private int targetRowCount ; + private int targetColumnCount; + + private int imageWidthPixels ; + private int imageHeightPixels ; + + private BufferedImage image ; + private Graphics2D graphics ; + + private int fontHeight ; + private int fontWidth ; + + IConfidentialTextService confidentialTextService ; + + public TerminalImageTransform(TerminalSize terminalSize , IConfidentialTextService confidentialTextService ) throws TerminalImageException { + + this.confidentialTextService = confidentialTextService; + + this.terminalSize = terminalSize; + this.targetRowCount = terminalSize.getRows() + 2; + this.targetColumnCount = terminalSize.getColumns(); + + // 7 and 13 represent the dimensions of the default monospaced font on MacOS + // Ideally, these values would be retrieved from the font metrics but that requires a + // Graphics object to be created, which in turn requires the image to be created - + // We plan to improve this in the future + this.imageWidthPixels = targetColumnCount * 7; + this.imageHeightPixels = targetRowCount * 13; + + this.image = new BufferedImage(imageWidthPixels, imageHeightPixels, BufferedImage.TYPE_INT_ARGB); + this.graphics = image.createGraphics(); + + // Ensures the font family is monospaced so that the images appear as expected + // If the font family is not monospaced, the font defaults to "Dialog", which skews images + Font font = new Font(Font.MONOSPACED, Font.PLAIN, 10); + if (!font.getFamily().equals(Font.MONOSPACED)) { + throw new TerminalImageException("Unable to set Monospaced font"); + } + graphics.setFont(font); + + // Collect the font dimensions + FontMetrics fontMetrics = graphics.getFontMetrics(); + this.fontHeight = fontMetrics.getHeight(); + this.fontWidth = fontMetrics.getMaxAdvance(); + + graphics.setPaint(Color.black); + graphics.fillRect(0, 0, imageWidthPixels, imageHeightPixels); + graphics.setPaint(Color.green); + } + + private void clearImage() { + graphics.clearRect(0, 0, imageWidthPixels, imageHeightPixels); + } + + public void writeImage( TerminalImage sourceTerminalImage , String outputFormat , OutputStream outStream) throws IOException { + clearImage(); + renderTerminalImage(sourceTerminalImage); + ImageIO.write(image, outputFormat, outStream); + outStream.flush(); + } + + private void renderTerminalImage(TerminalImage sourceTerminalImage) { + + for (TerminalField field : sourceTerminalImage.getFields()) { + StringBuilder sb = new StringBuilder(); + for (FieldContents contents : field.getContents()) { + int col = (field.getColumn() + 1); + int row = (field.getRow() + 1); + + // Converting FieldContents to Strings + for (Character c : contents.getChars()) { + if (c == null) { + sb.append(" "); + } else { + sb.append(c); + } + } + + // Apply the filter to confidential text if it matches, and such filtering is enabled. + String fieldText = sb.toString(); + + if (confidentialTextService != null) { + fieldText = confidentialTextService.removeConfidentialText(fieldText); + } + + for (Character c : fieldText.toCharArray()) { + col++; + if (col > targetColumnCount) { + col = 1; + row++; + if (row > targetRowCount) { + row = 1; + } + } + graphics.drawString(Character.toString(c), col * fontWidth, row * fontHeight); + } + } + } + + String terminalStatusRow = writeTerminalStatusRow(sourceTerminalImage, terminalSize.getColumns(), terminalSize.getRows()); + graphics.drawString(terminalStatusRow, 1 * fontWidth, (terminalSize.getRows() + 1) * fontHeight); + + } + + private String writeTerminalStatusRow(TerminalImage terminalImage, int cols, int rows) { + + StringBuilder sb = new StringBuilder(); + + if (terminalImage.getId() != null) { + sb.append(terminalImage.getId()); + sb.append(" - "); + } + + sb.append(Integer.toString(cols)); + sb.append("x"); + sb.append(Integer.toString(rows)); + sb.append(" - "); + + if (terminalImage.isInbound()) { + sb.append("Inbound "); + } else { + sb.append("Outbound - "); + sb.append(terminalImage.getAid()); + } + + return sb.toString(); + } +} \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/json/TerminalJsonTransform.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/json/TerminalJsonTransform.java new file mode 100644 index 000000000..662d869e0 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/json/TerminalJsonTransform.java @@ -0,0 +1,42 @@ +/* + * Copyright contributors to the Galasa project + */ +package dev.galasa.zos3270.common.screens.json; + + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonObject; + +import dev.galasa.zos3270.common.screens.Terminal; + +/** + * Handles the writing of a terminal into a json string or json object. + */ +public class TerminalJsonTransform { + + private Gson gson ; + + public TerminalJsonTransform( boolean isPrettyPrinting ) { + if( isPrettyPrinting ) { + this.gson = new GsonBuilder().setPrettyPrinting().create(); + } else { + this.gson = new GsonBuilder().create(); + } + } + + public JsonObject toJsonObject(Terminal terminal) { + JsonObject json = (JsonObject) gson.toJsonTree(terminal); + return json; + } + + public String toJsonString(Terminal terminal) { + JsonObject jsonObj = toJsonObject(terminal); + String jsonString = gson.toJson(jsonObj); + return jsonString; + } + + public Terminal toTerminal(String tempJson) { + return gson.fromJson(tempJson, Terminal.class); + } +} diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageExceptionTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageExceptionTest.java new file mode 100644 index 000000000..f5dd8441d --- /dev/null +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageExceptionTest.java @@ -0,0 +1,25 @@ +/* + * Copyright contributors to the Galasa project + */ +package dev.galasa.zos3270.common.screens.images; + + +import static org.assertj.core.api.Assertions.assertThat; +import org.junit.Test; + + +public class TerminalImageExceptionTest { + + @Test + public void testCanCreateTerminalImageExceptionOk() throws Exception { + TerminalImageException ex = new TerminalImageException(); + assertThat(ex).isNotNull(); + } + + @Test + public void testCanCreateTerminalImageExceptionWithMessageOk() throws Exception { + TerminalImageException ex = new TerminalImageException("a message"); + assertThat(ex).isNotNull().hasMessageContaining("a message"); + } + +} diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java new file mode 100644 index 000000000..81e8e9511 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java @@ -0,0 +1,313 @@ +/* + * Copyright contributors to the Galasa project + */ +package dev.galasa.zos3270.common.screens.images; + + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.fail; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.StandardOpenOption; +import java.util.*; + +import org.junit.rules.TestName; +import org.junit.Rule; +import org.junit.Test; + +import dev.galasa.framework.spi.IConfidentialTextService; +import dev.galasa.zos3270.common.screens.FieldContents; +import dev.galasa.zos3270.common.screens.TerminalField; +import dev.galasa.zos3270.common.screens.TerminalImage; +import dev.galasa.zos3270.common.screens.TerminalSize; + +public class TerminalImageTransformTest { + + @Rule + public TestName testName = new TestName(); + + public static class MockConfidentialTextService implements IConfidentialTextService { + + private List substitutions = new ArrayList(); + + private class Substitution { + String confidentialString; + String comment ; + + Substitution(String confidentialString, String comment) { + this.confidentialString = confidentialString ; + this.comment = comment; + } + } + + @Override + public void registerText(String confidentialString, String comment) { + substitutions.add( new Substitution(confidentialString, comment)); + } + + @Override + public String removeConfidentialText(String text) { + String result = text ; + for( Substitution substitution : substitutions) { + result = result.replaceAll( substitution.confidentialString , substitution.comment); + } + return result; + } + + @Override + public void shutdown() { + throw new UnsupportedOperationException("Unimplemented method 'shutdown'"); + } + } + + // I'm guessing what the colors are, as we've not implemented colours yet. + Character GREEN = new Character('g'); + Character BLACK = new Character('k'); + Character WHITE = new Character('w'); + + @Test + public void testEmptyTerminalImageRendersOk() throws Exception { + + MockConfidentialTextService confidentialTextService = new MockConfidentialTextService(); + + int columns = 80 ; + int rows = 26 ; + TerminalSize size = new TerminalSize(columns,rows); + + TerminalImageTransform renderer = new TerminalImageTransform( size, confidentialTextService ); + + int sequence = 1 ; + boolean isInbound = false ; + TerminalSize imageSize = new TerminalSize( columns,rows); + TerminalImage image = new TerminalImage(sequence, testName.getMethodName(), isInbound, + null, null, imageSize, 0, 0); + + checkTerminalImageAgainstExpected(renderer, image); + } + + + + private void checkTerminalImageAgainstExpected(TerminalImageTransform transform, TerminalImage image) throws Exception { + + ByteArrayOutputStream buff = new ByteArrayOutputStream(); + transform.writeImage(image, "png", buff); + + byte[] contentsRendered = buff.toByteArray(); + + assertThat(contentsRendered).isNotEmpty(); + + String testFileToCompareAgainst = testName.getMethodName()+".png"; + + assertFileContentsSame( contentsRendered , testFileToCompareAgainst); + } + + private void assertFileContentsSame(byte[] contentsRendered, String testFileToCompareAgainst) throws IOException { + // System.out.println("Test file name to compare against is: "+testFileToCompareAgainst); + // System.out.println("Comparing rendered image with contents of file "+getClass().getResource(testFileToCompareAgainst)); + // System.out.println("Class loader root is here: "+this.getClass().getResource(".")); + try ( InputStream testImageToCompare = this.getClass().getResourceAsStream("image-data/"+testFileToCompareAgainst) + ) { + + if (testImageToCompare == null) { + String tempFilePath = writeTempFile(testFileToCompareAgainst,contentsRendered); + fail("Testcase logic failure. Tried to open file "+testFileToCompareAgainst+" but it was missing."+ + "... was hoping to compare it to image\n"+tempFilePath); + } + + byte[] goodFileContents = testImageToCompare.readAllBytes(); + + boolean isSame = true ; + + if (contentsRendered.length != goodFileContents.length ) { + String tempFilePath = writeTempFile(testFileToCompareAgainst,contentsRendered); + fail("rendered image is different size to expected."+ + " ... image from the renderer is here:\n"+tempFilePath); + } + + for( int i=0; isSame && it>VMQz-+dl)@-FS0$h?lkq^ z=N{gB`Xw`_S%DKMM+6lzE>0@T_yhB+17V?uC#VpH@Y+I{$mV4Abv#kM6|j!A+zJ4^ zuLS_AJ9h&B=Su$p$X?V`<{zpl^Eq@2;3)DS08nrH|G%kTQo^k@T5&2B#lLt^)raf^ z9-gV2jguTMq#+DfHo!iv(K!cY^?o(Oi5$rqSI@BIwCO7N3X9c+GT?_u4MwVV`*V5Z z+iq12aFjIo4QyIK;f23}4Y4M9Mo4M+o4UgEVg0jn0hQk69~2a$6j;zDXXHC!K~#*4 z?NN~24ROJqIg0cVU$SL{W?4Y;@ZKwTxu*?Rimf?pUVv$IMB=+Es51MaMaQ?37%zux z*NdcPE*`$wF+^I^sR}%kxT*A)4@mZN%~9$JZaP`y$tCzQGOx<{ZQ|098ce7>hD${k zRa)o!Esj!(i1Yxj@^OTeqY9PNC9XM_)&jXtI){82`Ak59#P)?^vqci#X+Wgs`3`l3 z%H0r3v6|(P)G7jTsYt>E0y|MStHZ93QL1E7P;BqHiu^k3nad6T>Kc<^rM!VGzU&dK zBMy#*>w^tIcI!;ZONv^R$65=fiP9-bK9|ETmnHg_2Qx-`k3}_yLN5x#TsJnmB+wX6 zvtC4DawUT66D;R3S`!Hp4=$xM$9DyY)nZ- zwuBpMHLU9$cZ?^O%>)l^K36O{ukDyde?ef`3~*+OOaJ^AGi_ZIk)!@<$?m;FtB$e4}G zLm_P_Gt%41&XPj6Y}Y{~31yDpVuOdK!*a{3jZj$jK%A&ZRDuvEP{m`JDG%`W%n|yj zxKJ4_RNKhrpbIt>#l&*d}NCI(W)y~hx!y$v@l9Q%2y~_N`)JQ5bKG3lVoZgfrC`~km zNQn!#8!`xB z5kpdAqx0w`s<03)d<>D;cg&x9y^;JIVD1dU(S8||9eeeYfveNu?v(>Y_B_sj@a82$ zSjAypW{)_&JF^D)0yVdKw5#W13i{;<>-@sQ&tz5ffyTS*UD(JXZ@aMDCv|pJMp!@D z^mjC#+FSjr`fl0ILTxAGrPx=~yvyK{?%I)5VZuZ{--LRgtdwl2{pE6S{``-TYy5Ps z%CAGzK^p00yo%^lDa-Eg5LYa}DGaZmsC3_7ejCz?{On`o(hh=qqyk7x>K+#EBtWOx zMS-=Ms7Ya*(39P%CYAJqa;X+0Co+ooUD)n+BDF;6@DCo1K>{=#x`6bPweJLCL$J;5=&*pt0xuouhidxo&6 zRxYD;3Fo|M2J0Kw|JF-@emznXJw!5|qLBjB*w~sjurFZtTA zo;C1I74DEXrWA_pj8!1Y1TL@us}|%(NZZg$aGG_W)O`9p&5bjkNX;lUKR5Rn|7UtJ z&vYHn-!dP}POY>jKtmKD{tkmL460^mFGom{8oVL_9+(;dq^b3|I_&a`;9$izjp>i^ z_GAshh|dU{9;~-{=Eq;Sf+OU4+k;zUe{61PaSuUQY+L>(5cZ z)E(IB)W17knRsOC7{O@*x^{oYUB{32DN}TRk2qL=5SQKD@xXkhgR{koj8r3Rv|KLz z)h+lh?)ZNn_qV}+`7`rx=>CT8e}nFKWk&`&?~bzGld51#WR|Q0lwj*749TQc$w85& z@hvSPhkhFhR5O%_+t+~1*)d|;a%Ec2+}GP!Q;#}FgWinZ?eIKId|-Yd4lBH)Y_DLX zx!)ryQfzcaa&}+EPKKf^AkS-W#7}h-6{QkB!g0GytS@Zlx>2l9%qKHU(GGFU5e@l`!#*JciK zOl6xEB8RyZRn732nO6lrZ{wWi#*tN4ooF=AArM8A+~)dlIt=DGxOcD=bIwNjomuD{ zP5muX&Pp^EEZ3Jv#_=XD=4T%CzlsFcB!xg{yE+sNTmcYyBy2*`l10S4IiB^xIXZQ2 zPT;7S6w>pDg%vV4rOJcrZ zRJ3aaJy&0@NTDV(7dIOf(~?ClmgJyC-J6I-qH~iu zMJkc$8Ie5l>ScB8j=HBJ7zwnuoN(j_WYegBi*FgPPG|Pj%aU6TlK0)+`B-{=pP!g+=mDxUAgo&|HFFI#WEj7q+0H;$ z3j&{)l0i#fEpMPGNao_ctcLr?#@dy&vOQX5r4motcR$UqM+RZ>o*(|4+hX}$Cw1D9 zCXsio3j7dKTu5D#No4iT+c)7U(h0n*$$1e|Ny-X)7UjJO z;SxEiwY!;U-EXgy#Pz6)KdwoL#Zv5hZry#w?4x338n=|R$~V_4Tjzu`2A0c4yll92 z@L2*k{Db2tpPj{Ae5vk1RW<)9Slp(Uq25ObnI7T8H$2M=Zw)ro<09DeU31iJ<)tzt z!WTa(H=6ayF`mV~mn1tX!{2%H)78#vMzj5$3UOBBeeLw13-9=B@h`9k@Ks2?@{>*m z=tWNoB?}0Xj9c-D+KHaofsHZNm}ns3?erd6n-%BB+Vs1%TZYFr?rrhy0^j3#^ucrH z{h!*xSMx@WL|>aeKd8laxvS8R6}xz;s@UFES>w*pZj422g$idwom3&^rQ%_L^a;Dn zwcyx|l!9f~=u43-M%q_AmI?u+xrLdZq?yy?T3iQ11|-j1v>ChN0bVkX=Yxy3%z9$a z0tq+dJOK?-n5M)e0<}8o6WmkcxOLD^D%EA0G1n*;Mpg39*Os{Zs!Ur97LE~pN2D+CS@Xq6Gu2USWnYC3hRzZOau(+c1e^7Okf*_4RQ*iXl-ZAF9nhKX55N21K9SD=! z%W^*JgU2?hb&91_jw;rzgO4*;cl7Y({tDs#%_$5~tVn545*5Ps|H;r)b^ojVU~+7# zytzZe&-!h4>|{8E72Qy=u6NAwcltqJX1@M+&nR+UO>sBWt>d+;2oR0m)OiFUXzo)u zYoOp*%2WXA;f7Q3EFIvPwvw6fnHb6qxd9?&4z$P9CI*kwOyIRLr_4Jka>*@cToZF~ zmk@#_XDLbh*UU|SV<+XdM%u}?QV?@Q zmiEya{a|KV2oF?0VE~A8S|@zAPx`fOEZ?VVd1gU5f4v zhVfICyjMR$L%aWm>?7fkIqacktSq$pWBrKft3LRnOJ)u`#&691NsRy^$|5NSQO}ln z!Ht3pKpU#(nO50$0?e#6m~^fR-kvlW>AwRuyL=d2jpuJ~+XBkpiOfv~M&aM9>lKxo zzgq2RI|(|wyKVn+&0;EdpTJi8VAXYg!prk=bMbIQ)IwL^s&dgeTL0NB%{jnt*sC8* zFAqx~jhyld1j&~6a7&4x*n+_7z5nc6E)c4`5hi53(7h0&q?`Z>7CjITyERGkh>F5i zuBC-=q(L5XAzqV4u8GaH-(W5QAzAqi%uJtMXXg^)`CmCr@ucB;Ui(d8E7I#V7LfXi z`HAUkPH%GuX5i?wlz1bN`}NY3CtMM^k&CJ9-<8ooDyU52fCFE_g0`Biat*eZe9{cM z8h!`@rZ7oKx>HjFSg@N$wUzn#NYwO);*3vV3FIWY#lWs4-GA^8uK!$&m|N{S1EfOo zw)~Jg`Y%Eyq3l5Ff+RWj=9{gQ)zZZ_0!DW_a?JwVI-gA{?6qO9j|T8q-DJf|XwNw{ zk>5h%EiAh=@M3F}OB{r5$A1(FWhW52VOepd_{vgBJKc34iN~ROe_VFfHcT>bk1DM^ zO`RAK$&!lQwOf-4cw+;v;)I%D@_h#yxnhztfuc&rGCMD9GE~UNf+RQJQ`xS0piCK;2e$1#Q*cw9briK1l->QyaZPtHBPz!| ni{OPpue-Ca4G`rj!VXgo<3gYiIYIJ!gN~KVW`%p7Z(P^V93R zKJVxA!P4UNI&J+jL(A8T4RSx3KR6rOBXbn|pW zt9PUWMIaq7cmwvklT|%o3Y0r8Yd0;tcX57dleM^S0eNOK@R?j}c@`Fo>9o!Re;I=L z8Cr`t=ad6lKUM1my(WyYfJy@k7yv5K^so!#CnV#I+k0T6S%5~!K*rk#HEL10hg=PR zlgPj%AWmbIQP~}upEg-fI5Q=A&Os5P5a-cUQ7*T%$Th!>su$=Lm|A|pi1cf+V%YG6 z?B}GJqznLEtGHKhq1YIYX_Jz60F960Y_3i^GFuK25MrsRtpWH_9;^ z;CpF1rB8SSI^?vXzd5=}S^n795K%Ap;mKK|a45CJr~M=ldt6k`bCjf1<;FkrfqC<6 zcEj;&xc%XYNKT+XkW3MG(eo)zjh%hu4=$>mCJFdB$8N+|ttvRdQ8#V9VkUhc7grSw zC52#SDsbSzjNY%i+ug)~{riZ@2^+CKu01s&;>4Zr!Sj*|TjLLD+|l078NW1Jr0RO+n;NavFJ}J2lOpcoqDYJY$m;*MP`WR zx7V+CVofBz-ZiI-6?3cJoA4VVfy)kU!bp*Ev?WbA6eGA`Vs$Z{U_UFw2ZhAy+V`-h z*o}*A%HZCDX7g|tu!9{kMVs**NHWT_-M%i7Xhy0Yhvqn*YFzo2qKV=aFy{C%WMMPC z&pN%NZgxXeq*@3@K2%L;7_(?2`Sw}9O_(|qyXt4Phk4r;d7r$ZG3Pi^v;@R%caO=Ym4|&R8D$76pvpP zr&&1I`_)1r*8NO08lBfJN=Laq$}OOnYSbb1im>v~&F?s@e5ut5FVw^DaXic~*u_3N zt*G$CFJY9np1`Lh1>i_mNL4$MkoWaYvdm^FVgT^Ch?$sG_a1#UQ5Dd>L`0 zPsr3Mc4WBQ@Hn$C%T`C5Ytw0toxVy08TsAvg;Vnp7w<%7)4z$;Dap zx?>>)lX-{`RM>_QgH&_}NhDg@c487z!GniuW8(aOlW2hU#o~ZaLH^;VMcdqx{7d%v35ljEhR;}<+CtE^pHT-rq`uHNx;@WlLRHP?n*q|l-%p5Z z+pdl&-}dGZ4GcO|sG4LG!KWnsiBWXO*^EN0$#cLuABf76L9sGd3L) zq3s}T06^Wwj@duKG1=b3G;C4>bQgAUm5FFx&)WrWDc^>eVdUHO%A5hObMok|4M{WiKTMs^M&cu~ODkb8AG0f0p-yG4F^7=n zzPz?h_+P-$EsA^0I!<=HoAwyp6<|h=M@`IS#mQp_js}c{d=A@8)%z3Y$z|&H>WH4YM5h(94-P$)t73x?_?AC=%8(Q)#ooyx9qLi!( zW5p<#n@`y>Q%X-WQ6?6xS1i{4MON=At>{=p%`rIFW zjMK=5MeD)j1BWL!9@-_q2nSp3$a6g?v$DH=(by)QYjt!hTTpOYUeM}=MlAdJ*fxW_ zenY3~t-f^}Yq_Q`FU(Hk<{Xc+O^Os?feHfIzEqy-u5E<>Iq0LGX;$c zCnqfN4@8rem})@E`sun_zqU@7L`DmfO@mnU1rrlH-;p(AMsHz0`)G-*M9lMAZC$`Vqk^cx%ca5jE+$%Tgo_ z$sYk9uSpgxXD#ZjxTJW|EqHp;aug(LvK_3Q%#XyaMc9!^>%gG9x@B<+pZtX~KBl}% z?jYVsnH&0DxEFALeUv?`qDw&L3nEtdiGD!t%wBeOf=%~XeppA5$$Y+nH_u<1sVlWO z6Kc~v#XL{r7*%jqQdWOPG#w-}cXcg)IATeD@Y(D5*GSi;%K;deW1LkerEFxbKz98K zA1=*5aaZ(q(lLU4gJZmN>j|0A620n+DI;S1l(G;OVLoMz6AnpV#=AsvbJor_G@udw zuvZq^7V*U*zT!dAcLKG)w7RC$NS*Lk@E^0F7uHUF!1r^>73ey!=_iMhNTE=lt+K%vL^&%Lp&n0SUG zIuNquut=!}d%2_gg|WUUq%m+x-F;-RNLrO!hqUIe@1x|f)YQI?;KsV@=lj?P%w;f? zeW;bX`y`H&T213Q$(AQxxx>5OqDLSyC2M@;!*0?ZLT!77q$4<_d89JeC<`Y@DqHL} zX#jYg!4Bk$}@=QiqVla+072bB-Kj?7Pk*d7sv7UmFdmQsL zsFLB~&78_UVsT~l_Wqb6qc$(Gf>ViTtOr#e#cOq}=T9m^<_tV|vjZy^M`bx#bS_$3 z$zwT7A&_*h1y3_Trl^M5i}f3}KrY7bQ~mtXcwJ{-I;06YVBxsTBq{$Zf?>nU#J)h6xK?qnV>0}Z)iEQBqbvxL1nAm_EN%j zeWMa-S-wC@nxF_sU6-b!9uuTQAt!=?N`ufqUaoED{&nv^_wU<(&w0*y&htB;^L;tz z_hSqS>Av1`Jpcf3KYZxmQ2^kbPyk@nnRRPcZk}K+l>h)6rwe1FHfTkD>-Bz^$?#V@cWz%wEuK4vasf9=SQoHMchPw#Dtk{zUO^Ka>0b8O?5 zO$YDYG<}%x!Mno0{T_BLe4lwR++3oD8!3-3r4|xCp{V!VKY21b2{$%J=-Dxa zyfU$_17t|143_0OJ%LL5V`f3?Bd;UaT%cq<#Zo{^?$Q_DQ15`~?fZI1h~#pAjN z8ZCp(X>{Y2=E$|#4ZVL_DDqu^QDHHJU7PV4b6(?Qm%GH%ig6;^nKY326U_KIjG2F7`dn!q${=t=Dr1U9g#7gcz^6((md7 zDQ56TYIbWQJ4|A7gNJl8ie-VhjMqq0$t=G7Uyi6s&+oL%P*}Sx$kV!rrYzI6DDuEj!PlWJCo!wi^}Rcd8t9% zGjS@9>S_sEL2Dmjq)(N1PEj2iubwb(S9fODD%n!!3xzuSs`XP|-bF(qP-!y!*y=g& zIn`*C{~-G;WVGFfab?kPphvWz|2Td+U;TzJb>1cJ9b_F;e=W@_GBF04=9`FPZ5w>e zv!f|A!M9k1)pru`<{>|uYhM`|YYemg2EwO+S0gPkJ`6H3o_UKbj&Vm0Qr@r~BjaAx zVJpJs_6|oF!r89=rJ?p=mRQeMbX?-&{OAqET?^}W73K(bq# z+kCkNu2>fpz3c>$dMY#dL0no?njep9u{8`?*-H{uk$T8pl^>5MdUK|Q8tUhTRq~~I zVq$Nz6HbvT2)RZty7hGe@;=SzSo!EuLA+C-8!n(WD@Mq4KEYaYp6NUDAS>c$KBOV% zi2j9cD^Rjm3v`6+i{=0wo%uOFc5Y7ofkl%=Aiblf$`a!GaRsjeSFMk|_et0E!t@f6KeOmsy33-LaCtSlqOu1|8N)-1*1=i6% zST&qFtDyiTVcPn!tdHxxCjm>)P^9vHqSLKc!~%=?jnL2J8@=TRh#BkyuPK?nTN+Hb zXSG)P;!&Y+kCTTeqA5f5$_BlVeIr;R34d^fi4dB3tUeO-X3?9L@>lv~Z0Wl$?^b z7QEhkG5-(TZ9==NL6z4yrNWYkDuwZO<#g=w@^cV97{lCUb}VSzdh)Hh8pMDpMK{*{ zpH#^q>7~ae4{haAuO~n>!=C0r+jdUYVt*1eR2kXm`MYOU+;N6u6w^F4pV`$7CJ1}i&J$X%+2xO6MsXmOHa-0x;7Cc-dEG=Ape7*)|4uYRBt>qYbAs95q z7;?k@{8R2_p|)w5RAZlEz;L9rpcF&12MKJCTAa!(;qi;Ok@gQc#uQzi>p*XbSU!80 zSXn9JPgO!g<&DRn0PsKJW@MnE{+zDlM0t1YpAd`w3&flbvFF1XO8DunQ>m1}{3?*7 zUohCQ==GD3Zmml*`&JObeHb=QJ)hj_Fn}a=`vN7hA5dVGC0JOQj#d_A&=xsx#b7)1 zOT)~H=C76DV4;?S*4uFj=vhnq!ULIsbsfvRYO�B->!`Y*EA%$)mtDOQQS3*zmis z&^y?&F#E+f%JZ!kL4iwt?IP8R*j-3nilgUF%}q7Ygv#{IXOCRH&V`18#hyd@y}NvF zb7E?fEuFU`kvZk}#xT9j&`(3Q6PRj})aTKi`=-}@3RKs*R9rbHZc&y$&r{s0Y&@s3 z??r>_cp=L94lL4=!2AvxObj#b(N6R7I@%R!J`x+{0fRfLqYLK7wVn?-v@g<@L*UVf zK-YvhTZm8?PKl99ft2)bSF`uu_4va5PD1U`B=>I-I4Qc?0`JOG5x*Ua=GA=1f@!_X z5i`415-XYWONHr&eDmdwytxhD3TP-Xu2{u@t)XwFb1Ndu-l{N@h)Ga%?Gl$%L^@TH8}3Vw){b;|eNh`X*>UF*lqdC3gIYmY9*_WnjdI%UTCS zm<&yG|gnNuxn3ZVMvZp#nhhF)k zeIZo&dEA*L!YTgCdAHBct@UOF7D_al1;Rw{h<}WiY{tLVc=<)yn literal 0 HcmV?d00001 diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testInboundTrueRendersInboundInStatusArea.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testInboundTrueRendersInboundInStatusArea.png new file mode 100644 index 0000000000000000000000000000000000000000..4870b75bbef2ae9c5d8a5ca93aa4e63de7d9cecb GIT binary patch literal 3823 zcmeH~>r;~l7RFynC+WHf?RH(3Yo>Kwc3UL26uB4@U3F2psi5IvfHp-m5u!l2C4r*d zrCt!mYLHu^RTBl0G^8OIOafI&ok$`LA%#EyDZ~&+Bv*OiO_ptE`UmW{o$>3L^Wn^M zp67SwoIjY7uyI4+1^@sy?%%iPFaW%<4FJ4Oy#-sZ{CMPCH30bb?BBC1y&`96qH>YC z8ZTe=o4kAH&VfWB0ULOB+>C${0u#6F2|x3so_6x<3tRti;LYEi&-#YHcmMueYWYjncj30SH=w#3@HgI6MzS=P)JP%1-N6`PwYmCca_%2-=-iIQpw z!C&&gfZpTp13;<27jUEREdZF@3ji-7-T-!%zXJf`ivaKp_a^X#`E|={U0$2vbx2;5 z;r|7PVATuzJ3&ybbw-_CXg59YX!3{)dGO?hi5JHf--ENE0XUnc+G}!$utgIuJgr=v z+sEVDyAKl?Prb!7m7*J3^wj6WL8@%Ys=cM&y>mriq_LVVA5%7wl4?59#Bkf1%4jy) zwzKYUGFh3{5kB$0bB=g`_U3v0Uc`q~?q@L+9Jq$F_BlvrxI^T|MKw1*{$CiUzEuYYlOIcj`DU^QTU6$v1C?>uP)Sj6IrXA{p)YKpaC5C3^ z`?aC-t1cQN2fI~W*zBC`ljL4V8l;lQlw+yf;u=`bp57Uy@md6bRittHbIHR^bE zVs2JqB;~J&<^`fPji_gKL41m*h%m52!MI5RNyb5r=Q7-%hGPq*^M6%a zBs{T1#4vSCTx2oPNdl*2NhqYb=(e(ZWSmY|oplfD>2Z9`k|*=xl5CstnFw-Yh1`CH z-}d%ZG0tMBU}!wVss{er?ex`zkc<({6}47|i&)>A!|l^{p)p1EH)227%J;VK7m&dROPk(PM6_j$*{(5Rha z=`6Bv42V`K0kraizwM$CDY)-w$SkF9hQgi-R;X|$ubq*&htPFF10SbuO^j^E~4^dx@W`3_q#$cd1 zyRc5aaES-&0s)3Qq~AzAn(e(03UxO=gs@47Pv~B^-6@~9liG(TV(Eh3sU1~rQZiyk zMCi_*`P_o%vePG`Zj4-OR0Q`wC=2&CFI!0xv%ad+`+8iWdx_shtDc{!q^OyFYZTj9 zw!3(^>_LRi)UC)AnGQS=$gN*Lmdr{ml|&iz$OxBPLGtz-IFs_LFN6$Y_K3f;E*Y^N zsbxplHO>-w*eN*?n@V%o;bGM$@ZuvOuOOq{TkUGdZ$*C=p8Hf7Ox`qenSaWKj6)d; z<;D3O+=K00HTW^lkq-AF%jVOVbzzt1K6q*xe2m%L-nZ7NFo$6!7;pCbx7A+vtJz$n zE->S$<#a_C>~7pe&VcDof@-WqMIZuW;ItMvj974-%WcY&<%N5{;vtfAb2l(ibiu7a z`)IYQ_oFXP4at1}l2dxZ@vlP)O0)O%z^(?J-el&8W|@s>T6pdaGE5W=-B-w>nUXoA zf1%veEs5xBGeL*pFj*vhE>mZ$&W8Vq{P>oyF9A1-!pxsFy7bsdeU>W917ZuTB-BKX zY(&(f)jK6)#f%Q-c1G#* zVQv)N`>c@mW5%eaN+zAK#EEMbCgyT+zd1v*#Te+LT_w*S@g~x4n5x?)=&JB@o_Bqh z`1pWFgmKAAmoi}I!jyWjnB`h9N(QZ44q~?v`YWDhz}!_2V6|DwmZ?<)gE9+8VVfLd zXfun*thFl-mv#(V#d0`|{a-^!9BU5s?+5EWsFg4lDK1GQlsJ1VLv)+FqcfI=h<4wV zaD6nXN6C#=3%-)WPV#(Q6x{XTG)OlF$?K7(afCTkvFYmUinfG+wp3nc`N9aBxs9}BDJXFX*V*YKRW52*CZmelW=Ms+ZXu1-(*|+0%V`_aP5o5?4SzO3e!b3Pb}`$ubX?i& z{$@_LNG&pyJ@D0a()oG|XzR}p_PkjfkZm!QaSiL^sc^~?P3?~lqpNVuG1B7lPJ%v) qr>;K2eYk%4F?;@pzi-?FXiilQTsWU_cKwkB_U}#E!~I9z+5Z4ZB&d4; literal 0 HcmV?d00001 diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testOutboundRendersAidInStatusArea.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testOutboundRendersAidInStatusArea.png new file mode 100644 index 0000000000000000000000000000000000000000..5adb66b8863c30d333c5721da19693f34d77c08c GIT binary patch literal 4168 zcmeI$e^k=v9tZHR;})H|W!u@-u2bx^v%Gg@=FB;NL00B61DjLRL@m~(Fmt71_ycPF zKBlbE6!QmdUNur-&VY#mR#PGrDo{#9TKr1BD#ceIP~fuN-E;Qu{qvsF^XKzC=Q-zj zo#*{|&huPKMJKIX9g#!weufMHtNnNFNciGp?(8If zW@BNN_~rh8tb2F$j=fh7t{JMWSu+s+%eBLo-+AZgzO}@foo`ksFD^g$#kzpVhdXe; zd>wZ5)Y2V^8}}tF8M^qxGGbz?>HdsYY?R3rzIz&wt(+W{1 z9`Z$EeQBA?mftTF9-AjFk76vF#)p(?rcD!#@=T1!sRzqidhxLgUd!UBtR(7wUdj~N zdWoh=$&Dw?=@rCwL4b6T=gxM!==H_wFrKH*&}X7+EfWG_d)|UkqD6a-TQeKQT!zlj z6zjgyYI`8jg@naB?djeb$p#Ff7aHKen_IjVny9JLXzuZE88~Xi&`=uE9Eab)0}Dlh zpej@t56Rz%nk29L7o~CFB^sq7B8$RFWBSvyGWw#59`$Gz;&P$B$@5i$P}oq&o|bT9 z0*|?|m>+qtJJW1zWF%YD| zXvA?oRy}3!Q$72qmc?`1OCCC)rrEbWl#5?U?uLXlDMb^Xnu&$^Qe0TWz+vn2v0_5% zA}ze=Eb6Cg#3CePGil1)CvT{{uOD46&$Tfc2cS<|Fe^(qw^2ANTgSzBF;Kzg$J4@ox!6WaV1t9 zt)rF%cQkhhd7jk%vT%hIQujLW*Z*%c%clQk62{+4lAF zKu8X6JEmI5lJ~m2DRU?z<0_%z2J8XbZywzFy zQqwtYUVt7eW?L<$v7;Sdfz{t|@jD}b^tkD8S-_X(x8`G85S=wP_i)_3A_`k0Gp$&U z>gDIbM(WX1gpt_uZQk4Z_zVXRVjj9dVZ<6w3qR5G0-+P*tGenSH-=ZR7Ilqcb2*qe zGRhVcNe$40=49-*-g(6qsb31#+?~MOL{ov|^GScu)j79g6k}_%?zPbHZ+p1Y&j6!7%R-^?7V^6gWZ8dk)#xYij`y@skL zhj1A<=Z_Lcjnf8pRk)Ly)YDX?m|rzl{&+uQO}DqYuDDZZl50;|WhK=yFBTw)11-dl zXn*amA;EK`d+}<{-A;?M6)k5r|GGk4xdhjbF6h95OrpJ1WK7el;Fp~rjYx-wP#-k+ zFGej81#uK`(v}L}T>8Rxj>di;dX>t+$J-&C@U1lX6KOi9TF5X=&c1!D>di;Qe5O|6 zTMhQ~*&Z}?Y-=`N9eK|)Wsa_ZNP2qN7O6Y0p>mim|A~-_byW`=;QWb`^?o;HuLwvE ztXxLmmv>VG#Skh00Jj>BbY#Gi1)dWCG@s^u9B#P|ro1@pZi@A`I+Z21DFU85QqaTm z6m0FHl(xI>D`pSjGq^C_L+eJWC1`L)z_y(jd%8Ff&i1wyqQu!U{K4q$EE3z1lKqz>Z zDj~yt^(XS|M8bG2ysP&Jp2g-Rf7;3H}#DQrXeCZfi}wl95Ss+LN{S!d-&Tvhp7eP zxXnskl8^BDT(Ox0l|Mh?n)ORzO5Ie1_>Z_AQ?1Q~J^h${;+985uvh!=e~PL6CO!RWZB0JLtntZ%<`?@JJaozhMH_Iw&QZWZNx82Q!@lYIR_0sZ6lr> zBZOqZKjJ9*b#$!)H(Z(igC|s-nI(H3?7M8+S&!qUm8_0NQh%<9TF`?$MVh30Hw+kn z_Bhg{J$WoqD=+3MW={-uZ@5D;&$KTcHISQ^r1wLzTS?}WvW5OCW{~mYuktQU9M@EJ zsGi8ML{}dqQh#cptj*wprgdvZy~(EHNYHyPQCi$)j$j&?&7i&K18MrX4ID>wuH2St zANTf2NvxPuK8R*-SPgDy%OV literal 0 HcmV?d00001 diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testTextFieldRendersOk.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testTextFieldRendersOk.png new file mode 100644 index 0000000000000000000000000000000000000000..3bfa148956abaf0318fbaddc5f427ba369ad9210 GIT binary patch literal 4548 zcmeHLdr*^C9{sdswP=cuC@2VBt%CBF7QrBqSJA3Gtb!0A0mM+@ONfL74J1_C2&mBN zLZSsiK~NU~<&gxw1W=HOL1M%bNk}535Nu3ROeJDSSh~BjGdr_??aX#&XZr7*JNKSB z=brOBbBm%P!eQ1MtpNal?cW!A7yy=f0l<>X<$qdSd3y956#!OW*dH2nBsWPrMj3RE zja&BOL7n?w4t#aE?bMfIK(Wf|{qI68dyA_71Y7-Nvu$)#{N9i34q9D2yZTD}UaPG& ztJj))?d(_Y2evZ`LWA6&KROie5~PE#TK9eq|LWC>mpmVnCQyy2;8Zv}NA5K3^2sit3OZ?a5&4H9cL{2#xWB9G_ijuh->PO=?S)g!k z$A(TddrR2;gt4g($>-EhtbT*%I7Y`3aGwZuPw3reic_4c#DoiH`AI#0#Wx4o#A$SGg48fnlZJIrta;<=fnE$l?0G;kq9n@)5oK2{rirCw?$%*bV z8z)eLTev^ULy(-}+`1MJckayMNM}xVW-CX`$LxnxTclAd57xRf$fX-@sQB)ZJ?o(onTJrM9yr$X zb)#M!^Why2tMCd5zxe`fMrAw9seBA|LM;dyJA$}TkLxYdvj)rMC!KlKlTJ855o$vzK4jUa>%0gWmnwXrY=xK*Dnn_N)C40z zrO9==`zpqS()I=JIi8@~03KU_1bJHCe6TTAMJz0tzN#X^y`tMfWnV;RGpUfth~ zBIr%8T**#m)uvv2X_s7d8XBU!y`@9Tez8o^3$VYG(~=CXLh84wyvi zmPs2t@iO74@tUq(ejdVJGAPFACC*eYhN#v}cGYbKGf}JL!D8*!)BpkD5qFFN;qfvp zzTF4hQd~OyP%TK-@Xt$nwiguqn)MRk1#1fg}QGq7ixrB02(dRNKkm+RmOuB^;0^+7Bi5jRf z*oyWaQg2b{PlI-e#i={pjW%*4M>}gY&mYuyYAFu?frkM6s>*EQsw=2cLrv}6oG&q$ z@pvRI1KZ+;A+^&^7=Q33O1+QdN10HZZ|}DhjJC^HA@6ur@k@dykE)0Pl+`kpHS>UA zeq4SO;0@75`mH6yHtpl%YUD=4G&gmWso1T*tL19pn->0J-e-?%Jk(sf zmNxk6&C@Q^!gDrtEalgai|e+R=KI|&D5^=>0i=BFEG^2m?o>g}_J5ix`ecO0W{ zdS5`>CRuT+eb^&LrylGDuP>YoFD`30IEKZI{gpEH_RJbhC_?Gyv9|I{9%GW~(AcP2 z9~NA}@M9^*=!Q@ATn0%6P%$+*L_h-2%$P+H_&*ru3- zyZyZ^LfM&nnU(Fc9BU@`WXWX8awOXaq=C@zZt>`6;Typ~a4@@fN4?bBC&=K zL)tdzT|;Hj$HN>s_XB^VPfRidnHpX=VckN#*=88Lj^+Gtr*J|;?tkS4ZsJ^!{jz~q z0~2H^2#blZ7>t4a{za-)nh0S(fqRlT?uO1-NDoAwPnM7*v)S=DEv3zM*)hghbKlVz z;*Mbr_g(R;XJu)n{VnF^@_aU>-%%LxVS`yCU3A`>T5ll=kA{hpE4wZWmiOiTq)QKz ziAQ!K-4+Ac*ByDT?Esv~i64l}&@9Z1b!qkQ<{ctUI_Dnhe^(P-v terminalImages = this.cachedImages; for (int i = 0; i < terminalImages.size(); i++) { - for (TerminalField field : terminalImages.get(i).getFields()) { - StringBuilder sb = new StringBuilder(); - for (FieldContents contents : field.getContents()) { - int col = (field.getColumn() + 1); - int row = (field.getRow() + 1); - - // Converting FieldContents to Strings and removing confidential text if required - for (Character c : contents.getChars()) { - if (c == null) { - sb.append(" "); - } else { - sb.append(c); - } - } - String fieldText = applyCtf ? cts.removeConfidentialText(sb.toString()) : sb.toString(); - - for (Character c : fieldText.toCharArray()) { - col++; - if (col > numCols) { - col = 1; - row++; - if (row > numRows) { - row = 1; - } - } - graphics.drawString(Character.toString(c), col * fontWidth, row * fontHeight); - } - } - } - String terminalStatusRow = writeTerminalStatusRow(terminalImages.get(i), terminalSize.getColumns(), terminalSize.getRows()); - graphics.drawString(terminalStatusRow, 1 * fontWidth, (terminalSize.getRows() + 1) * fontHeight); + TerminalImage sourceTerminalImage = terminalImages.get(i); - // Prefixing images 1-9 with a 0 to ensure ordering is correct - String imageSequence = String.format("%02d", i + 1); - - String terminalFilename = this.terminalId + "-" + String.format("%05d", rasTerminalSequence) + "-" + imageSequence + ".png"; - Path terminalPath = terminalImagesDirectory.resolve(terminalFilename); - - OutputStream os = Files.newOutputStream(terminalPath, - new SetContentType(ResultArchiveStoreContentType.PNG), - StandardOpenOption.CREATE); - - ImageIO.write(image, "png", os); - os.flush(); - os.close(); - graphics.clearRect(0, 0, width, height); + writeImageToDisk(i,storedArtifactsRoot,imageRenderer, sourceTerminalImage); } } - private String writeTerminalStatusRow(TerminalImage terminalImage, int cols, int rows) { + private void writeImageToDisk(int imageIndexNumber , Path storedArtifactsRoot, TerminalImageTransform imageRenderer, TerminalImage sourceTerminalImage) throws IOException { + // Prefixing images 1-9 with a 0 to ensure ordering is correct + String imageSequence = String.format("%02d", imageIndexNumber + 1); + + Path terminalImagesDirectory = storedArtifactsRoot.resolve("zos3270").resolve("images").resolve(this.terminalId); + String terminalFilename = this.terminalId + "-" + String.format("%05d", rasTerminalSequence) + "-" + imageSequence + ".png"; + Path terminalPath = terminalImagesDirectory.resolve(terminalFilename); - StringBuilder sb = new StringBuilder(); - - if (terminalImage.getId() != null) { - sb.append(terminalImage.getId()); - sb.append(" - "); - } - - sb.append(Integer.toString(cols)); - sb.append("x"); - sb.append(Integer.toString(rows)); - sb.append(" - "); - - if (terminalImage.isInbound()) { - sb.append("Inbound "); - } else { - sb.append("Outbound - "); - sb.append(terminalImage.getAid()); + try ( OutputStream outStream = Files.newOutputStream(terminalPath, + new SetContentType(ResultArchiveStoreContentType.PNG), + StandardOpenOption.CREATE); + ) { + + imageRenderer.writeImage(sourceTerminalImage, "png",outStream); } - - return sb.toString(); } + + /** * This method creates JSON representations of the Terminal screens and writes them to the RAS * @throws IOException diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/commandcodes/ReadModifiedTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/commandcodes/ReadModifiedTest.java similarity index 99% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/commandcodes/ReadModifiedTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/commandcodes/ReadModifiedTest.java index 718f1ccd5..9cdb73b9c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/commandcodes/ReadModifiedTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/commandcodes/ReadModifiedTest.java @@ -1,4 +1,4 @@ -package test.zos3270.commandcodes; +package dev.galasa.zos3270.commandcodes; import static org.assertj.core.api.Assertions.assertThat; @@ -24,8 +24,8 @@ import dev.galasa.zos3270.internal.datastream.OrderText; import dev.galasa.zos3270.internal.datastream.WriteControlCharacter; import dev.galasa.zos3270.spi.Screen; -import test.zos3270.util.DummySocket; -import test.zos3270.util.DummySocketImpl; +import dev.galasa.zos3270.util.DummySocket; +import dev.galasa.zos3270.util.DummySocketImpl; public class ReadModifiedTest { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/cursor/BackSpaceTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackSpaceTest.java similarity index 99% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/cursor/BackSpaceTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackSpaceTest.java index 9fa5c3069..18b21ab12 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/cursor/BackSpaceTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackSpaceTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2020. */ -package test.zos3270.cursor; +package dev.galasa.zos3270.cursor; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/cursor/BackTabTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackTabTest.java similarity index 99% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/cursor/BackTabTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackTabTest.java index 7a31ad5ff..8f5a799a2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/cursor/BackTabTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackTabTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2020. */ -package test.zos3270.cursor; +package dev.galasa.zos3270.cursor; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/cursor/FieldOverflowTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/FieldOverflowTest.java similarity index 98% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/cursor/FieldOverflowTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/FieldOverflowTest.java index 6a1d7049c..55aed1526 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/cursor/FieldOverflowTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/FieldOverflowTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2020. */ -package test.zos3270.cursor; +package dev.galasa.zos3270.cursor; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/cursor/HomeTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/HomeTest.java similarity index 99% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/cursor/HomeTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/HomeTest.java index 60261e60c..5bf7932c0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/cursor/HomeTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/HomeTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2020. */ -package test.zos3270.cursor; +package dev.galasa.zos3270.cursor; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/cursor/NewLineTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/NewLineTest.java similarity index 99% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/cursor/NewLineTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/NewLineTest.java index 0ae2fa0b8..5cbb200ad 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/cursor/NewLineTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/NewLineTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2020. */ -package test.zos3270.cursor; +package dev.galasa.zos3270.cursor; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/cursor/TabTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/TabTest.java similarity index 99% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/cursor/TabTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/TabTest.java index 0b8e8b87c..a7410663a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/cursor/TabTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/TabTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2020. */ -package test.zos3270.cursor; +package dev.galasa.zos3270.cursor; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/ByteAddressTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/ByteAddressTest.java similarity index 98% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/ByteAddressTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/ByteAddressTest.java index 9680c000e..1ff748a54 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/ByteAddressTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/ByteAddressTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.datastream; +package dev.galasa.zos3270.datastream; import static org.junit.Assert.fail; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/CommandCodeTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/CommandCodeTest.java similarity index 97% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/CommandCodeTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/CommandCodeTest.java index 77bb7ef83..9cba9613e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/CommandCodeTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/CommandCodeTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.datastream; +package dev.galasa.zos3270.datastream; import static org.junit.Assert.fail; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/EraseUnprotectedToAddressTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/EraseUnprotectedToAddressTest.java similarity index 98% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/EraseUnprotectedToAddressTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/EraseUnprotectedToAddressTest.java index e64f5a686..90782e976 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/EraseUnprotectedToAddressTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/EraseUnprotectedToAddressTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.datastream; +package dev.galasa.zos3270.datastream; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/GraphicsEscapeTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/GraphicsEscapeTest.java similarity index 98% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/GraphicsEscapeTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/GraphicsEscapeTest.java index 695bb36d3..1a4c1b13c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/GraphicsEscapeTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/GraphicsEscapeTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.datastream; +package dev.galasa.zos3270.datastream; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/OrderInsertCursorTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderInsertCursorTest.java similarity index 93% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/OrderInsertCursorTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderInsertCursorTest.java index 8a87b326d..c6911ee45 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/OrderInsertCursorTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderInsertCursorTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.datastream; +package dev.galasa.zos3270.datastream; import org.junit.Assert; import org.junit.Test; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/OrderTextTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderTextTest.java similarity index 96% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/OrderTextTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderTextTest.java index a8471479b..5012313f4 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/OrderTextTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderTextTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.datastream; +package dev.galasa.zos3270.datastream; import java.nio.ByteBuffer; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/QueryReplySummaryTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplySummaryTest.java similarity index 97% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/QueryReplySummaryTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplySummaryTest.java index 1880185c2..b7beedcfb 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/QueryReplySummaryTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplySummaryTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.datastream; +package dev.galasa.zos3270.datastream; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/QueryReplyUsableAreaTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplyUsableAreaTest.java similarity index 97% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/QueryReplyUsableAreaTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplyUsableAreaTest.java index 60c8282a3..8ac774299 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/QueryReplyUsableAreaTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplyUsableAreaTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.datastream; +package dev.galasa.zos3270.datastream; import org.apache.commons.codec.binary.Hex; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/RepeatToAddressTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/RepeatToAddressTest.java similarity index 95% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/RepeatToAddressTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/RepeatToAddressTest.java index 64376052f..6d7ef5f0d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/RepeatToAddressTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/RepeatToAddressTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.datastream; +package dev.galasa.zos3270.datastream; import java.nio.ByteBuffer; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/SetBufferAddressTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/SetBufferAddressTest.java similarity index 94% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/SetBufferAddressTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/SetBufferAddressTest.java index c9eaf8ebd..ce961b116 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/SetBufferAddressTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/SetBufferAddressTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.datastream; +package dev.galasa.zos3270.datastream; import java.nio.ByteBuffer; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/StartFieldTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/StartFieldTest.java similarity index 99% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/StartFieldTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/StartFieldTest.java index 1f4d0f9ef..1f5a4e97f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/StartFieldTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/StartFieldTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.datastream; +package dev.galasa.zos3270.datastream; import java.nio.ByteBuffer; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/VampScreenTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/VampScreenTest.java similarity index 97% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/VampScreenTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/VampScreenTest.java index fddbf3567..aa5c74d32 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/VampScreenTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/VampScreenTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.datastream; +package dev.galasa.zos3270.datastream; import java.io.IOException; import java.net.URL; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/WriteControlCharacterTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/WriteControlCharacterTest.java similarity index 98% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/WriteControlCharacterTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/WriteControlCharacterTest.java index f62d32c5a..5e70b7d32 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/WriteControlCharacterTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/WriteControlCharacterTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.datastream; +package dev.galasa.zos3270.datastream; import org.junit.Assert; import org.junit.Test; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/extended/ExtendedDatastreamTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/extended/ExtendedDatastreamTest.java similarity index 99% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/extended/ExtendedDatastreamTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/extended/ExtendedDatastreamTest.java index aebeac14b..af0b6bafd 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/extended/ExtendedDatastreamTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/extended/ExtendedDatastreamTest.java @@ -1,7 +1,7 @@ /* * Copyright contributors to the Galasa project */ -package test.zos3270.datastream.extended; +package dev.galasa.zos3270.datastream.extended; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/structuredfields/ReadPartitionTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/structuredfields/ReadPartitionTest.java similarity index 98% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/structuredfields/ReadPartitionTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/structuredfields/ReadPartitionTest.java index 2af61a60f..6df56589a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/datastream/structuredfields/ReadPartitionTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/structuredfields/ReadPartitionTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.datastream.structuredfields; +package dev.galasa.zos3270.datastream.structuredfields; import static org.junit.Assert.fail; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/network/ConnectTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/ConnectTest.java similarity index 97% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/network/ConnectTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/ConnectTest.java index 200ff7dc2..89ec1de38 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/network/ConnectTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/ConnectTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.network; +package dev.galasa.zos3270.network; import static org.junit.Assert.fail; @@ -17,8 +17,8 @@ import dev.galasa.zos3270.internal.comms.Network; import dev.galasa.zos3270.spi.NetworkException; -import test.zos3270.util.DummySocket; -import test.zos3270.util.DummySocketImpl; +import dev.galasa.zos3270.util.DummySocket; +import dev.galasa.zos3270.util.DummySocketImpl; public class ConnectTest { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/network/Message3270Test.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Message3270Test.java similarity index 97% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/network/Message3270Test.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Message3270Test.java index 71be8ceed..f643787b3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/network/Message3270Test.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Message3270Test.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.network; +package dev.galasa.zos3270.network; import static org.junit.Assert.fail; @@ -14,7 +14,6 @@ import org.junit.Assert; import org.junit.Test; -import dev.galasa.zos3270.internal.comms.Network; import dev.galasa.zos3270.internal.comms.NetworkThread; import dev.galasa.zos3270.spi.NetworkException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/network/NegotiationTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/NegotiationTest.java similarity index 95% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/network/NegotiationTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/NegotiationTest.java index 7726d535a..e9c6a75ca 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/network/NegotiationTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/NegotiationTest.java @@ -3,11 +3,8 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.network; +package dev.galasa.zos3270.network; -import static org.junit.Assert.fail; - -import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -15,13 +12,6 @@ import java.io.UnsupportedEncodingException; import java.net.Socket; -import org.junit.Assert; -import org.junit.Test; - -import dev.galasa.zos3270.internal.comms.Network; -import dev.galasa.zos3270.spi.NetworkException; -import test.zos3270.util.IOExceptionInputStream; - public class NegotiationTest { public static final byte IAC = -1; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/network/Network3270Test.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Network3270Test.java similarity index 99% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/network/Network3270Test.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Network3270Test.java index 99236f9ae..e4b721f5c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/network/Network3270Test.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Network3270Test.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.network; +package dev.galasa.zos3270.network; import static org.junit.Assert.fail; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/orders/EraseAllUnprotectedTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/EraseAllUnprotectedTest.java similarity index 99% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/orders/EraseAllUnprotectedTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/EraseAllUnprotectedTest.java index 5b9718679..a6b5d2cde 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/orders/EraseAllUnprotectedTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/EraseAllUnprotectedTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2020. */ -package test.zos3270.orders; +package dev.galasa.zos3270.orders; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/orders/GraphicsEscapeTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java similarity index 99% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/orders/GraphicsEscapeTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java index 7d7982e9a..40ae6f3fc 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/orders/GraphicsEscapeTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2020. */ -package test.zos3270.orders; +package dev.galasa.zos3270.orders; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/terminal/CursorTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/CursorTest.java similarity index 98% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/terminal/CursorTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/CursorTest.java index 113198d8e..77ded4c86 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/terminal/CursorTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/CursorTest.java @@ -1,15 +1,13 @@ /* * Copyright contributors to the Galasa project */ -package test.zos3270.terminal; +package dev.galasa.zos3270.terminal; import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; import org.junit.Assert; -import org.junit.Test; - import dev.galasa.zos3270.KeyboardLockedException; import dev.galasa.zos3270.Zos3270Exception; import dev.galasa.zos3270.internal.comms.Inbound3270Message; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/terminal/EraseInputTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/EraseInputTest.java similarity index 99% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/terminal/EraseInputTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/EraseInputTest.java index 927525cdf..710b5a863 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/terminal/EraseInputTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/EraseInputTest.java @@ -1,4 +1,4 @@ -package test.zos3270.terminal; +package dev.galasa.zos3270.terminal; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/terminal/FindTextTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/FindTextTest.java similarity index 99% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/terminal/FindTextTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/FindTextTest.java index 9b38a08e4..93bee9d27 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/terminal/FindTextTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/FindTextTest.java @@ -1,4 +1,4 @@ -package test.zos3270.terminal; +package dev.galasa.zos3270.terminal; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/terminal/RetrieveTextTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/RetrieveTextTest.java similarity index 98% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/terminal/RetrieveTextTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/RetrieveTextTest.java index 709c335c3..3b1e9c59d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/terminal/RetrieveTextTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/RetrieveTextTest.java @@ -1,15 +1,13 @@ /* * Copyright contributors to the Galasa project */ -package test.zos3270.terminal; +package dev.galasa.zos3270.terminal; import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; import org.junit.Assert; -import org.junit.Test; - import dev.galasa.zos3270.KeyboardLockedException; import dev.galasa.zos3270.Zos3270Exception; import dev.galasa.zos3270.internal.comms.Inbound3270Message; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/terminal/ScreenTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/ScreenTest.java similarity index 99% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/terminal/ScreenTest.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/ScreenTest.java index be5102958..76eed1171 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/terminal/ScreenTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/ScreenTest.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019,2021. */ -package test.zos3270.terminal; +package dev.galasa.zos3270.terminal; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/util/DummySocket.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocket.java similarity index 94% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/util/DummySocket.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocket.java index 600fad09e..eae29933f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/util/DummySocket.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocket.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.util; +package dev.galasa.zos3270.util; import java.io.IOException; import java.net.Socket; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/util/DummySocketImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocketImpl.java similarity index 98% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/util/DummySocketImpl.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocketImpl.java index 70063dc8a..bd0b60530 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/util/DummySocketImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocketImpl.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.util; +package dev.galasa.zos3270.util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/util/IOExceptionInputStream.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/IOExceptionInputStream.java similarity index 90% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/util/IOExceptionInputStream.java rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/IOExceptionInputStream.java index d165ea708..bf4631d56 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/test/zos3270/util/IOExceptionInputStream.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/IOExceptionInputStream.java @@ -3,7 +3,7 @@ * * (c) Copyright IBM Corp. 2019. */ -package test.zos3270.util; +package dev.galasa.zos3270.util; import java.io.IOException; import java.io.InputStream; From 403f7cb007704f904dabe084802f2bfa07bd4b38 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Fri, 2 Jun 2023 15:57:33 +0100 Subject: [PATCH 091/263] make unit tests work in gradle. Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../dev.galasa.zos3270.common/build.gradle | 4 +++- .../screens/images/TerminalImageTransformTest.java | 6 ++---- .../images/image-data => resources}/README.md | 0 .../testConfientialTextIsRedacted.png | Bin ...stDifferentColumnsAndRowsRendersInStatusArea.png | Bin .../testEmptyTerminalImageRendersOk.png | Bin .../testInboundTrueRendersInboundInStatusArea.png | Bin .../testOutboundRendersAidInStatusArea.png | Bin .../testTextFieldRendersOk.png | Bin 9 files changed, 5 insertions(+), 5 deletions(-) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/{java/dev/galasa/zos3270/common/screens/images/image-data => resources}/README.md (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/{java/dev/galasa/zos3270/common/screens/images/image-data => resources}/testConfientialTextIsRedacted.png (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/{java/dev/galasa/zos3270/common/screens/images/image-data => resources}/testDifferentColumnsAndRowsRendersInStatusArea.png (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/{java/dev/galasa/zos3270/common/screens/images/image-data => resources}/testEmptyTerminalImageRendersOk.png (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/{java/dev/galasa/zos3270/common/screens/images/image-data => resources}/testInboundTrueRendersInboundInStatusArea.png (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/{java/dev/galasa/zos3270/common/screens/images/image-data => resources}/testOutboundRendersAidInStatusArea.png (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/{java/dev/galasa/zos3270/common/screens/images/image-data => resources}/testTextFieldRendersOk.png (100%) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle index b8a4eb53e..c5bf98e3c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle @@ -1,5 +1,6 @@ plugins { id 'galasa.manager' + id 'java' } description = 'Galasa zOS 3270 Terminal Manager - Common Packages' @@ -7,5 +8,6 @@ description = 'Galasa zOS 3270 Terminal Manager - Common Packages' version = '0.25.0' dependencies { - testImplementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' } + diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java index 81e8e9511..12d461076 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java @@ -106,10 +106,8 @@ private void checkTerminalImageAgainstExpected(TerminalImageTransform transform, } private void assertFileContentsSame(byte[] contentsRendered, String testFileToCompareAgainst) throws IOException { - // System.out.println("Test file name to compare against is: "+testFileToCompareAgainst); - // System.out.println("Comparing rendered image with contents of file "+getClass().getResource(testFileToCompareAgainst)); - // System.out.println("Class loader root is here: "+this.getClass().getResource(".")); - try ( InputStream testImageToCompare = this.getClass().getResourceAsStream("image-data/"+testFileToCompareAgainst) + + try ( InputStream testImageToCompare = this.getClass().getClassLoader().getResourceAsStream(testFileToCompareAgainst) ) { if (testImageToCompare == null) { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/README.md b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/README.md similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/README.md rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/README.md diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testConfientialTextIsRedacted.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testConfientialTextIsRedacted.png similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testConfientialTextIsRedacted.png rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testConfientialTextIsRedacted.png diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testDifferentColumnsAndRowsRendersInStatusArea.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testDifferentColumnsAndRowsRendersInStatusArea.png similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testDifferentColumnsAndRowsRendersInStatusArea.png rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testDifferentColumnsAndRowsRendersInStatusArea.png diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testEmptyTerminalImageRendersOk.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testEmptyTerminalImageRendersOk.png similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testEmptyTerminalImageRendersOk.png rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testEmptyTerminalImageRendersOk.png diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testInboundTrueRendersInboundInStatusArea.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testInboundTrueRendersInboundInStatusArea.png similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testInboundTrueRendersInboundInStatusArea.png rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testInboundTrueRendersInboundInStatusArea.png diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testOutboundRendersAidInStatusArea.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testOutboundRendersAidInStatusArea.png similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testOutboundRendersAidInStatusArea.png rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testOutboundRendersAidInStatusArea.png diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testTextFieldRendersOk.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextFieldRendersOk.png similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/image-data/testTextFieldRendersOk.png rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextFieldRendersOk.png From 3837a06d4b559ef52067e8ecd0d7f5741701a407 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Fri, 2 Jun 2023 16:03:41 +0100 Subject: [PATCH 092/263] Copyright fixes Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../dev/galasa/zos3270/commandcodes/ReadModifiedTest.java | 3 +++ .../test/java/dev/galasa/zos3270/cursor/BackSpaceTest.java | 4 +--- .../src/test/java/dev/galasa/zos3270/cursor/BackTabTest.java | 4 +--- .../java/dev/galasa/zos3270/cursor/FieldOverflowTest.java | 4 +--- .../src/test/java/dev/galasa/zos3270/cursor/HomeTest.java | 4 +--- .../src/test/java/dev/galasa/zos3270/cursor/NewLineTest.java | 4 +--- .../src/test/java/dev/galasa/zos3270/cursor/TabTest.java | 4 +--- .../java/dev/galasa/zos3270/datastream/ByteAddressTest.java | 4 +--- .../java/dev/galasa/zos3270/datastream/CommandCodeTest.java | 4 +--- .../zos3270/datastream/EraseUnprotectedToAddressTest.java | 4 +--- .../dev/galasa/zos3270/datastream/GraphicsEscapeTest.java | 4 +--- .../dev/galasa/zos3270/datastream/OrderInsertCursorTest.java | 4 +--- .../java/dev/galasa/zos3270/datastream/OrderTextTest.java | 4 +--- .../dev/galasa/zos3270/datastream/QueryReplySummaryTest.java | 4 +--- .../galasa/zos3270/datastream/QueryReplyUsableAreaTest.java | 4 +--- .../dev/galasa/zos3270/datastream/RepeatToAddressTest.java | 4 +--- .../dev/galasa/zos3270/datastream/SetBufferAddressTest.java | 4 +--- .../java/dev/galasa/zos3270/datastream/StartFieldTest.java | 4 +--- .../java/dev/galasa/zos3270/datastream/VampScreenTest.java | 4 +--- .../galasa/zos3270/datastream/WriteControlCharacterTest.java | 4 +--- .../datastream/structuredfields/ReadPartitionTest.java | 4 +--- .../src/test/java/dev/galasa/zos3270/network/ConnectTest.java | 4 +--- .../test/java/dev/galasa/zos3270/network/Message3270Test.java | 4 +--- .../test/java/dev/galasa/zos3270/network/NegotiationTest.java | 4 +--- .../test/java/dev/galasa/zos3270/network/Network3270Test.java | 4 +--- 25 files changed, 27 insertions(+), 72 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/commandcodes/ReadModifiedTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/commandcodes/ReadModifiedTest.java index 9cdb73b9c..aa71b1255 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/commandcodes/ReadModifiedTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/commandcodes/ReadModifiedTest.java @@ -1,3 +1,6 @@ +/* + * Copyright contributors to the Galasa project + */ package dev.galasa.zos3270.commandcodes; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackSpaceTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackSpaceTest.java index 18b21ab12..ef0b3991e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackSpaceTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackSpaceTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.cursor; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackTabTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackTabTest.java index 8f5a799a2..50a32becb 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackTabTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackTabTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.cursor; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/FieldOverflowTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/FieldOverflowTest.java index 55aed1526..945a67d8b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/FieldOverflowTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/FieldOverflowTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.cursor; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/HomeTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/HomeTest.java index 5bf7932c0..0e9372026 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/HomeTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/HomeTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.cursor; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/NewLineTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/NewLineTest.java index 5cbb200ad..1b87ee400 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/NewLineTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/NewLineTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.cursor; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/TabTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/TabTest.java index a7410663a..4c5d17327 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/TabTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/TabTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.cursor; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/ByteAddressTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/ByteAddressTest.java index 1ff748a54..d31006037 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/ByteAddressTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/ByteAddressTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/CommandCodeTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/CommandCodeTest.java index 9cba9613e..c4c160499 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/CommandCodeTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/CommandCodeTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/EraseUnprotectedToAddressTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/EraseUnprotectedToAddressTest.java index 90782e976..cd9fdc31f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/EraseUnprotectedToAddressTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/EraseUnprotectedToAddressTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/GraphicsEscapeTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/GraphicsEscapeTest.java index 1a4c1b13c..87ac0914d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/GraphicsEscapeTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/GraphicsEscapeTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderInsertCursorTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderInsertCursorTest.java index c6911ee45..91b951081 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderInsertCursorTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderInsertCursorTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderTextTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderTextTest.java index 5012313f4..ffde9d6b9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderTextTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderTextTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplySummaryTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplySummaryTest.java index b7beedcfb..6784de780 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplySummaryTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplySummaryTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplyUsableAreaTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplyUsableAreaTest.java index 8ac774299..01b5a6d69 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplyUsableAreaTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplyUsableAreaTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/RepeatToAddressTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/RepeatToAddressTest.java index 6d7ef5f0d..52a4401fb 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/RepeatToAddressTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/RepeatToAddressTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/SetBufferAddressTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/SetBufferAddressTest.java index ce961b116..69c355576 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/SetBufferAddressTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/SetBufferAddressTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/StartFieldTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/StartFieldTest.java index 1f5a4e97f..e85252ec5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/StartFieldTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/StartFieldTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/VampScreenTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/VampScreenTest.java index aa5c74d32..c3fc9fb49 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/VampScreenTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/VampScreenTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/WriteControlCharacterTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/WriteControlCharacterTest.java index 5e70b7d32..4722434f7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/WriteControlCharacterTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/WriteControlCharacterTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/structuredfields/ReadPartitionTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/structuredfields/ReadPartitionTest.java index 6df56589a..bb6ffd900 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/structuredfields/ReadPartitionTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/structuredfields/ReadPartitionTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.datastream.structuredfields; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/ConnectTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/ConnectTest.java index 89ec1de38..4c9597bca 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/ConnectTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/ConnectTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.network; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Message3270Test.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Message3270Test.java index f643787b3..7ecbdc144 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Message3270Test.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Message3270Test.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.network; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/NegotiationTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/NegotiationTest.java index e9c6a75ca..a18d5da03 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/NegotiationTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/NegotiationTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.network; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Network3270Test.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Network3270Test.java index e4b721f5c..a08e232d5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Network3270Test.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Network3270Test.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.network; From 2f5a6986a8c6fc8e4fa6da93f078f6d68eeda87b Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Fri, 2 Jun 2023 16:09:48 +0100 Subject: [PATCH 093/263] Copyright fixes Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../dev/galasa/zos3270/orders/EraseAllUnprotectedTest.java | 4 +--- .../java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java | 4 +--- .../test/java/dev/galasa/zos3270/terminal/EraseInputTest.java | 3 +++ .../test/java/dev/galasa/zos3270/terminal/FindTextTest.java | 3 +++ .../src/test/java/dev/galasa/zos3270/terminal/ScreenTest.java | 4 +--- .../src/test/java/dev/galasa/zos3270/util/DummySocket.java | 4 +--- .../test/java/dev/galasa/zos3270/util/DummySocketImpl.java | 4 +--- .../java/dev/galasa/zos3270/util/IOExceptionInputStream.java | 4 +--- 8 files changed, 12 insertions(+), 18 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/EraseAllUnprotectedTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/EraseAllUnprotectedTest.java index a6b5d2cde..538280fa5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/EraseAllUnprotectedTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/EraseAllUnprotectedTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.orders; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java index 40ae6f3fc..3ec4343b6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.orders; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/EraseInputTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/EraseInputTest.java index 710b5a863..fc6b85625 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/EraseInputTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/EraseInputTest.java @@ -1,3 +1,6 @@ +/* + * Copyright contributors to the Galasa project + */ package dev.galasa.zos3270.terminal; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/FindTextTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/FindTextTest.java index 93bee9d27..b51ebcfaf 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/FindTextTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/FindTextTest.java @@ -1,3 +1,6 @@ +/* + * Copyright contributors to the Galasa project + */ package dev.galasa.zos3270.terminal; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/ScreenTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/ScreenTest.java index 76eed1171..eae3e5d8d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/ScreenTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/ScreenTest.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2021. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.terminal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocket.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocket.java index eae29933f..47c5f078e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocket.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocket.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.util; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocketImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocketImpl.java index bd0b60530..f5524f97a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocketImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocketImpl.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.util; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/IOExceptionInputStream.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/IOExceptionInputStream.java index bf4631d56..abf1d0ff8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/IOExceptionInputStream.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/IOExceptionInputStream.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.util; From 66f2199596914dd3f55697a80004bf17628a3445 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Fri, 2 Jun 2023 17:21:16 +0100 Subject: [PATCH 094/263] Fixed column and row offset bugs in the transform. Images updated Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../images/TerminalImageTransform.java | 11 +- .../images/TerminalImageTransformTest.java | 245 +++++++++++++++++- .../testConfientialTextIsRedacted.png | Bin 5886 -> 5874 bytes ...erentColumnsAndRowsRendersInStatusArea.png | Bin 3808 -> 3812 bytes .../testEmptyTerminalImageRendersOk.png | Bin 4380 -> 4387 bytes ...tInboundTrueRendersInboundInStatusArea.png | Bin 3823 -> 3826 bytes .../testOutboundRendersAidInStatusArea.png | Bin 4168 -> 4172 bytes .../resources/testTextAOnAllRowsRendersOk.png | Bin 0 -> 8493 bytes .../testTextAtBottomRightFieldRendersOk.png | Bin 0 -> 5819 bytes .../testTextAtOriginFieldRendersOk.png | Bin 0 -> 5776 bytes .../test/resources/testTextFieldRendersOk.png | Bin 4548 -> 4546 bytes .../testTextFullRowFieldRendersOk.png | Bin 0 -> 6755 bytes 12 files changed, 251 insertions(+), 5 deletions(-) create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextAOnAllRowsRendersOk.png create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextAtBottomRightFieldRendersOk.png create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextAtOriginFieldRendersOk.png create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextFullRowFieldRendersOk.png diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransform.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransform.java index 3df1efe90..35d17a230 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransform.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransform.java @@ -88,8 +88,11 @@ private void renderTerminalImage(TerminalImage sourceTerminalImage) { for (TerminalField field : sourceTerminalImage.getFields()) { StringBuilder sb = new StringBuilder(); for (FieldContents contents : field.getContents()) { - int col = (field.getColumn() + 1); - int row = (field.getRow() + 1); + // Origin of each character glyph is bottom right of the character. + int col = (field.getColumn() ); + // Add one to the rows, so that the row so that row 0 of the input + // displays at row1... + int row = (field.getRow() + 1); // Converting FieldContents to Strings for (Character c : contents.getChars()) { @@ -108,7 +111,6 @@ private void renderTerminalImage(TerminalImage sourceTerminalImage) { } for (Character c : fieldText.toCharArray()) { - col++; if (col > targetColumnCount) { col = 1; row++; @@ -117,12 +119,13 @@ private void renderTerminalImage(TerminalImage sourceTerminalImage) { } } graphics.drawString(Character.toString(c), col * fontWidth, row * fontHeight); + col++; } } } String terminalStatusRow = writeTerminalStatusRow(sourceTerminalImage, terminalSize.getColumns(), terminalSize.getRows()); - graphics.drawString(terminalStatusRow, 1 * fontWidth, (terminalSize.getRows() + 1) * fontHeight); + graphics.drawString(terminalStatusRow, 0 * fontWidth, (terminalSize.getRows() + 1) * fontHeight); } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java index 12d461076..dc9b9c49b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java @@ -142,8 +142,13 @@ private void assertFileContentsSame(byte[] contentsRendered, String testFileToCo } } + static java.nio.file.Path tempDir = null; + private String writeTempFile(String name, byte[] bytes) throws IOException { - java.nio.file.Path tempDir = Files.createTempDirectory("TerminalImageRendererTest"); + // We want all image files we write out to appear in the same folder for ease of looking at them all. + if (tempDir == null) { + tempDir = Files.createTempDirectory("TerminalImageRendererTest"); + } java.nio.file.Path filePath = tempDir.resolve(name); try ( OutputStream outStream = Files.newOutputStream(filePath, StandardOpenOption.CREATE); @@ -308,4 +313,242 @@ public void testDifferentColumnsAndRowsRendersInStatusArea() throws Exception { checkTerminalImageAgainstExpected(renderer, image); } + + @Test + public void testTextAtOriginFieldRendersOk() throws Exception { + MockConfidentialTextService confidentialTextService = new MockConfidentialTextService(); + + int columns = 80 ; + int rows = 26 ; + TerminalSize size = new TerminalSize(columns,rows); + + TerminalImageTransform renderer = new TerminalImageTransform( size, confidentialTextService ); + + int sequence = 1 ; + boolean isInbound = false ; + TerminalSize imageSize = new TerminalSize( columns,rows); + TerminalImage image = new TerminalImage(sequence, testName.getMethodName(), isInbound, + null, null, imageSize, 0, 0); + + String text = "^ this is the origin. Should be in top left."; + + int row = 0; + int column = 0 ; + boolean unformatted = false ; + boolean fieldProtected = false ; + boolean fieldNumeric = false; + boolean fieldDisplay = true; + boolean fieldIntenseDisplay = false; + boolean fieldSelectorPen = false; + boolean fieldModifed = false; + Character foregroundColour = GREEN ; + Character backgroundColour = BLACK; + Character highlight = WHITE; + + TerminalField field1 = new TerminalField(row,column,unformatted,fieldProtected,fieldNumeric, + fieldDisplay,fieldIntenseDisplay,fieldSelectorPen,fieldModifed,foregroundColour,backgroundColour,highlight); + field1.getContents().add( new FieldContents( stringToCharacterArray(text)) ); + + image.getFields().add(field1); + + checkTerminalImageAgainstExpected(renderer, image); + } + + @Test + public void testTextAtBottomRightFieldRendersOk() throws Exception { + MockConfidentialTextService confidentialTextService = new MockConfidentialTextService(); + + int columns = 80 ; + int rows = 26 ; + TerminalSize size = new TerminalSize(columns,rows); + + TerminalImageTransform renderer = new TerminalImageTransform( size, confidentialTextService ); + + int sequence = 1 ; + boolean isInbound = false ; + TerminalSize imageSize = new TerminalSize( columns,rows); + TerminalImage image = new TerminalImage(sequence, testName.getMethodName(), isInbound, + null, null, imageSize, 0, 0); + + { + String text = "The 'v' should be in bottom right"; + + int row = 16; + int column = 0; + boolean unformatted = false ; + boolean fieldProtected = false ; + boolean fieldNumeric = false; + boolean fieldDisplay = true; + boolean fieldIntenseDisplay = false; + boolean fieldSelectorPen = false; + boolean fieldModifed = false; + Character foregroundColour = GREEN ; + Character backgroundColour = BLACK; + Character highlight = WHITE; + + TerminalField field = new TerminalField(row,column,unformatted,fieldProtected,fieldNumeric, + fieldDisplay,fieldIntenseDisplay,fieldSelectorPen,fieldModifed,foregroundColour,backgroundColour,highlight); + field.getContents().add( new FieldContents( stringToCharacterArray(text)) ); + + image.getFields().add(field); + } + + { + String text = "v"; + + int row = 25; + int column = 79; + boolean unformatted = false ; + boolean fieldProtected = false ; + boolean fieldNumeric = false; + boolean fieldDisplay = true; + boolean fieldIntenseDisplay = false; + boolean fieldSelectorPen = false; + boolean fieldModifed = false; + Character foregroundColour = GREEN ; + Character backgroundColour = BLACK; + Character highlight = WHITE; + + TerminalField field = new TerminalField(row,column,unformatted,fieldProtected,fieldNumeric, + fieldDisplay,fieldIntenseDisplay,fieldSelectorPen,fieldModifed,foregroundColour,backgroundColour,highlight); + field.getContents().add( new FieldContents( stringToCharacterArray(text)) ); + + image.getFields().add(field); + } + + checkTerminalImageAgainstExpected(renderer, image); + } + + + @Test + public void testTextFullRowFieldRendersOk() throws Exception { + MockConfidentialTextService confidentialTextService = new MockConfidentialTextService(); + + int columns = 80 ; + int rows = 26 ; + TerminalSize size = new TerminalSize(columns,rows); + + TerminalImageTransform renderer = new TerminalImageTransform( size, confidentialTextService ); + + int sequence = 1 ; + boolean isInbound = false ; + TerminalSize imageSize = new TerminalSize( columns,rows); + TerminalImage image = new TerminalImage(sequence, testName.getMethodName(), isInbound, + null, null, imageSize, 0, 0); + + { + String text = "The line should have 80 characters visible"; + + int row = 16; + int column = 0; + boolean unformatted = false ; + boolean fieldProtected = false ; + boolean fieldNumeric = false; + boolean fieldDisplay = true; + boolean fieldIntenseDisplay = false; + boolean fieldSelectorPen = false; + boolean fieldModifed = false; + Character foregroundColour = GREEN ; + Character backgroundColour = BLACK; + Character highlight = WHITE; + + TerminalField field = new TerminalField(row,column,unformatted,fieldProtected,fieldNumeric, + fieldDisplay,fieldIntenseDisplay,fieldSelectorPen,fieldModifed,foregroundColour,backgroundColour,highlight); + field.getContents().add( new FieldContents( stringToCharacterArray(text)) ); + + image.getFields().add(field); + } + + { + String text = "01234567890123456789012345678901234567890123456789012345678901234567890123456789"; + + int row = 20; + int column = 0; + boolean unformatted = false ; + boolean fieldProtected = false ; + boolean fieldNumeric = false; + boolean fieldDisplay = true; + boolean fieldIntenseDisplay = false; + boolean fieldSelectorPen = false; + boolean fieldModifed = false; + Character foregroundColour = GREEN ; + Character backgroundColour = BLACK; + Character highlight = WHITE; + + TerminalField field = new TerminalField(row,column,unformatted,fieldProtected,fieldNumeric, + fieldDisplay,fieldIntenseDisplay,fieldSelectorPen,fieldModifed,foregroundColour,backgroundColour,highlight); + field.getContents().add( new FieldContents( stringToCharacterArray(text)) ); + + image.getFields().add(field); + } + + checkTerminalImageAgainstExpected(renderer, image); + } + + + + @Test + public void testTextAOnAllRowsRendersOk() throws Exception { + MockConfidentialTextService confidentialTextService = new MockConfidentialTextService(); + + int columns = 80 ; + int rows = 26 ; + TerminalSize size = new TerminalSize(columns,rows); + + TerminalImageTransform renderer = new TerminalImageTransform( size, confidentialTextService ); + + int sequence = 1 ; + boolean isInbound = false ; + TerminalSize imageSize = new TerminalSize( columns,rows); + TerminalImage image = new TerminalImage(sequence, testName.getMethodName(), isInbound, + null, null, imageSize, 0, 0); + + { + String text = "Each of the 26 rows should have a number in"; + + int row = 16; + int column = 10; + boolean unformatted = false ; + boolean fieldProtected = false ; + boolean fieldNumeric = false; + boolean fieldDisplay = true; + boolean fieldIntenseDisplay = false; + boolean fieldSelectorPen = false; + boolean fieldModifed = false; + Character foregroundColour = GREEN ; + Character backgroundColour = BLACK; + Character highlight = WHITE; + + TerminalField field = new TerminalField(row,column,unformatted,fieldProtected,fieldNumeric, + fieldDisplay,fieldIntenseDisplay,fieldSelectorPen,fieldModifed,foregroundColour,backgroundColour,highlight); + field.getContents().add( new FieldContents( stringToCharacterArray(text)) ); + + image.getFields().add(field); + } + + for ( int i=0;i<26;i++) { + String text = Integer.toString(i); + + int row = i; + int column = 0; + boolean unformatted = false ; + boolean fieldProtected = false ; + boolean fieldNumeric = false; + boolean fieldDisplay = true; + boolean fieldIntenseDisplay = false; + boolean fieldSelectorPen = false; + boolean fieldModifed = false; + Character foregroundColour = GREEN ; + Character backgroundColour = BLACK; + Character highlight = WHITE; + + TerminalField field = new TerminalField(row,column,unformatted,fieldProtected,fieldNumeric, + fieldDisplay,fieldIntenseDisplay,fieldSelectorPen,fieldModifed,foregroundColour,backgroundColour,highlight); + field.getContents().add( new FieldContents( stringToCharacterArray(text)) ); + + image.getFields().add(field); + } + + checkTerminalImageAgainstExpected(renderer, image); + } } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testConfientialTextIsRedacted.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testConfientialTextIsRedacted.png index 0f7820a00a8c25712d439e1dd0f44a7f07aa0c71..35c737a2434724aa0de791b76723b561838f85d4 100644 GIT binary patch literal 5874 zcmeHLdsNcty2f#rQ^&NjM$KDIyQwBGX^!O$YD%4Ml4EI#mx4hpMKdp`h*(Z}MfQ{$ zO{p__Qp@`dQb1}nNHK{_2oNzFMMWTF>rX`BFf(hPbp6Mi*!heo*?8th zT(qyrM+;O(SJA%kZ@Bwz!B>sXZn)d-_cDCT*4oPr3A=WeonyEyLz?o4?Xjq@yNdqP z;qkVhAnvuO6gj33Kt}@;Y>g@t2cc)aK=i2^08OUC7s!@hAL)_wHFk4#CZNezXAIFi zIc)?wnzkPVYH(f$0*yTafqv@U1_GVG_X#L>-Vo)v$bbK)Ymw?_a>fC5g-tpdHV945 zm(xNPS=YY;ESVqjLKdgJB%U$MvdpM^K`~F!zZu34)nS7!tg&&iHyTI2!>$B~cEK~5k^cAJ7xzZXtGYT83MT9Q5h-mS;8rJf%$@kkH%2~aVv{qS8i$*A~8tq`u_QjLrwG^f!DLO?chf>6H z-6PB|31O+<(no21_|ngZ9wur2A@>tWdmTLCd{`=5F>#d?MO~k944pTp*-gRCMveOK zb#qaHMbIuKSq}s3I*|m0u17<=qCt39xFptADFK&z&Du>V$<9?Bck;Xa7e5=t;X-UQ zcsAK5nLnW;JxsHQU-}3YL7{r>yBEtC=0aew?zY@TP_DWbavwt)=?_CDMxG|ib8yRA zO9~K?K=~@S=VclR?I083FsxtlDEHD_WcIEsVA*n6Uh5QF-jh~Z+MX_xN2)9%No2?+ z=XLcOhWr6#Z#rb$f47Yo!AA+=A|_&1b@xzIR&+)CHbveCalaq~UdYhNVp$3?4GAQo z+|!lwlWmUczg60NA2%-dU;!1rotl4mEN_`Y{|)EkR2=BO<5>e>0LW2K$B_%E714*Vy2t6r z*O?q7MkDM*8<5znud&D=c&y)@oM>?vbWRN(x)U;=~NGB~qJd!<=l=-fGs&I%1HCm9>bbND79x=66pf zGbf&YJ_iS>)`@C+Tc!4IvFrr3OSh|q#io;{mnwv7E2_6+)UsOhPx7XR`xHt{)2#y7tg3e7}Xt{MkuFbbeSn@nqri zm)V+b#AlVT;Zx(uKRCc{X9Mw+lAK4oQg5KVs7R<(u{e;An5RL z5}DpliU&Ah%R}Q{0rl@FGcLWRNBlPiS{f5Gb`(EWw$6bcy1NTGG!IUklb@Z8Px?t;L5 zF%bD%>`Woc`KrQaVUy{M(1j4TGUyTW$<)e=9`E6E22uNw_Qxe|%Ohk=ZxMqmDeJe)6J&b{p7$daF+o%r=$IUHm1fOF93ZE?C(jy<4}|MBg>wo<>DP z&&2jb1IY)}`&rI#sn3aeh+aocmzm{AiMLj?$EoufCvEKhC{eP3&YeT!l!~eC;igBU z-!Y_R$jB)H!J3euVL; zA`Zjn-K)SA>Wa9(*X}O%pN%=d>TeG1*bMDZZo~AaID4NS{<|n+59GAZBl|jG>urN_ z>J?MWpE+|*s^TNlJ_`onjFaf?zIke(RQex+IWzUHX)G3ns~3E!Dogp>`MWn++k>Af z`$ZWhw6ROAp6+*8wokJ$fOx_!m-X8s^yuN}LH2cyEO+#G#RWM-|NVyhC;R(fzx%U0 zs=pBb3-Ld_jsO2hy2-`yF3R&$IZ=w&*f=1)bK$l~6vCy2j|A&z6m!J{7RlFdcX(&8 z0eZr{Zt+uRUdt;f)ZiHpn!ht4&rZPi(05F&QaPt`n%?QE4ychmO{xrg7%&%NcK#4{ z<(B-5EAQ3KQn~U` znr%bO>Sp6&bqT}I5U5nd3#?YWq49>&nX7X7mILY~0r7p3m|(l6C{(C>GR6$5f)&)-W=||(2AdJVF$Sj^5 zLP5_Zj%r~Pw~xg}Kz=HKLTv6FPnXk#RuRm!#X*$mdb3U^msxu^Y@cd~RA1nw53m8w zmuVF!Q~wI7lM_L&XBwTkI8h%veRP+(T(6vR*7?vIu008iiXh#}RBLs!aGxq#kntm)4G=4^ z$u>)B*_`HixRyL5exeUibAq&iHc%Rl=bJ@xO!z7ndU239Z{2yG9fz2-m{MWu(#Z4H zeckwDZ>VeCs_n)^@k224z#T*T7mjNLzgLPNXgZIPS!@=kI5J=wX4^UIs5dON>Lh%{ zn!?+!Y&-9KM18U?{HLvXH-zap&t{b|>MdY~(olz4C2MqwkgPnlzeQnnj^W6^uCHG$ zlk+;-TwUNa5Es$J3*d=dd?dTA<2-|SJ!%>Lr43@rK*C)I7dmuXL4rd(k61I?P$ z114YI2Rl~3tU0FFc$*VuD5mApmtF4lE$6aMkibZPC{?77-C^D4t= zp&voHw^WZYbT!nAK%0or%{j_u6=jY0MQS!&Z`8$>8#oxEey=J3-n$<_gha#0lAM#^`-*;!-?lu}0sEdrwP`!%8z60_3v*&7@VM~Q0hhwfxT^N*f zC7YVtz2+tttU|i+fooU+QTFbM-ftPxogE7_$;}1jMiT*K*A%O~UuUg8qztzWbkI~= z!8A>$M=6>LE-HnTDjItgurU3$=r`K61x)H>^aLZ#-gxM^Zp|ZV+P=?)fU{Mt0P9eu zlQn(H*X`))mU4O;E^;|@T%ZW?H5ZfRqs_Jr->tSKyaqqP*FTD$%jq`E@(1dW$^pAg zS?(uTVpm62;oLv_?=FmEdm)ureZPFSAnqERF|$6{9xCUk?YJeDJJmgp~Ycqb%U>MccNm|_woTseEe zw5zWkAMX~m-9Nx;sepfTmil2(`}3#=MzY6?J$taWlb{F+v=tL+g<(XZFI5G9(4*o) zxOzSxs9xyns1zj|;E50`F%A7oTX2dzp$^*{qT_1Q_>$y!I&8@&TigpJU;pXOTz|*0 z;u`^}iJXu2n3+1>o|rx1<SM~$qSuh#T zziZ`ax7g4>k!H_Bn|^6#oJ$-myiPKZW05RxWq}DWjp&Kwy@reJEjKPd;{YE5d)4*> z8E#kVA+j_~LD< z>2=bMntlLbauBuzX5QvDE3VChYh|u!x*Lv-&4UnGeCX#J7<(?NpI4uJ+H-G zX98RLt;$At*&vIlrNP~G$oQomlnv8q{dVPfdwq?uz}w8#W^?Dhp!_4`Aa013O%bcb z*+oRBqWd*OyF!NxOzFrGwCgu&f`_gGld2cAn1*miPDikDZyCeSscY}P7%IHqaB;8K zsJ9c>(;!lZ%pG3SqHXdR#C1i-zP4pQolv}CBnv4cAD%Ml8d7pg6xW~so9n4z01sKs zY}O`@soEy~1(H3VK@h{|mtJ!Q%GCd1pgtY|@RofgKul&othx3GixH2Yg~ zh}pAc0h07rzc$u6?ik8EzAc!kS}zF@uHc_%S1aFIYl`=OY*1XzZ41$N4n;TW!_^$V zF9nbIIOUox3==10!!We_4b}2P?t$zA` z#a7K#7lqw4D0aS8LByeEdPwzg5n{7tr#a^bKa(!Bt(?oy+b-=9u_%;4wZRff`?)z1 zrs6#0t-ty`Q)qR~&z>iV7g$lVm&#C;_e@9}PewB22-QF9jE!;eQwqSE z%8_s*!S;hC$@QQCGz7>Ztwd$T+(q(jqNGp(5PZT#6Fa!#vNO+}M$k zRmfQV=v#I5^J44r>0V6D4?TmQQ-UaK`s0mAZEM|hV`Xqeh_6dlA9p@wwA^vQE}!_S z!0ht2QDEw7>{@-9+F&TS@R`ulZt>VMQz-+dl)@-FS0$h?lkq^ z=N{gB`Xw`_S%DKMM+6lzE>0@T_yhB+17V?uC#VpH@Y+I{$mV4Abv#kM6|j!A+zJ4^ zuLS_AJ9h&B=Su$p$X?V`<{zpl^Eq@2;3)DS08nrH|G%kTQo^k@T5&2B#lLt^)raf^ z9-gV2jguTMq#+DfHo!iv(K!cY^?o(Oi5$rqSI@BIwCO7N3X9c+GT?_u4MwVV`*V5Z z+iq12aFjIo4QyIK;f23}4Y4M9Mo4M+o4UgEVg0jn0hQk69~2a$6j;zDXXHC!K~#*4 z?NN~24ROJqIg0cVU$SL{W?4Y;@ZKwTxu*?Rimf?pUVv$IMB=+Es51MaMaQ?37%zux z*NdcPE*`$wF+^I^sR}%kxT*A)4@mZN%~9$JZaP`y$tCzQGOx<{ZQ|098ce7>hD${k zRa)o!Esj!(i1Yxj@^OTeqY9PNC9XM_)&jXtI){82`Ak59#P)?^vqci#X+Wgs`3`l3 z%H0r3v6|(P)G7jTsYt>E0y|MStHZ93QL1E7P;BqHiu^k3nad6T>Kc<^rM!VGzU&dK zBMy#*>w^tIcI!;ZONv^R$65=fiP9-bK9|ETmnHg_2Qx-`k3}_yLN5x#TsJnmB+wX6 zvtC4DawUT66D;R3S`!Hp4=$xM$9DyY)nZ- zwuBpMHLU9$cZ?^O%>)l^K36O{ukDyde?ef`3~*+OOaJ^AGi_ZIk)!@<$?m;FtB$e4}G zLm_P_Gt%41&XPj6Y}Y{~31yDpVuOdK!*a{3jZj$jK%A&ZRDuvEP{m`JDG%`W%n|yj zxKJ4_RNKhrpbIt>#l&*d}NCI(W)y~hx!y$v@l9Q%2y~_N`)JQ5bKG3lVoZgfrC`~km zNQn!#8!`xB z5kpdAqx0w`s<03)d<>D;cg&x9y^;JIVD1dU(S8||9eeeYfveNu?v(>Y_B_sj@a82$ zSjAypW{)_&JF^D)0yVdKw5#W13i{;<>-@sQ&tz5ffyTS*UD(JXZ@aMDCv|pJMp!@D z^mjC#+FSjr`fl0ILTxAGrPx=~yvyK{?%I)5VZuZ{--LRgtdwl2{pE6S{``-TYy5Ps z%CAGzK^p00yo%^lDa-Eg5LYa}DGaZmsC3_7ejCz?{On`o(hh=qqyk7x>K+#EBtWOx zMS-=Ms7Ya*(39P%CYAJqa;X+0Co+ooUD)n+BDF;6@DCo1K>{=#x`6bPweJLCL$J;5=&*pt0xuouhidxo&6 zRxYD;3Fo|M2J0Kw|JF-@emznXJw!5|qLBjB*w~sjurFZtTA zo;C1I74DEXrWA_pj8!1Y1TL@us}|%(NZZg$aGG_W)O`9p&5bjkNX;lUKR5Rn|7UtJ z&vYHn-!dP}POY>jKtmKD{tkmL460^mFGom{8oVL_9+(;dq^b3|I_&a`;9$izjp>i^ z_GAshh|dU{9;~-{=Eq;Sf+OU4+k;zUe{61PaSuUQY+L>(5cZ z)E(IB)W17knRsOC7{O@*x^{oYUB{32DN}TRk2qL=5SQKD@xXkhgR{koj8r3Rv|KLz z)h+lh?)ZNn_qV}+`7`rx=>CT8e}nFKWk&`&?~bzGld51#WR|Q0lwj*749TQc$w85& z@hvSPhkhFhR5O%_+t+~1*)d|;a%Ec2+}GP!Q;#}FgWinZ?eIKId|-Yd4lBH)Y_DLX zx!)ryQfzcaa&}+EPKKf^AkS-W#7}h-6{QkB!g0GytS@Zlx>2l9%qKHU(GGFU5e@l`!#*JciK zOl6xEB8RyZRn732nO6lrZ{wWi#*tN4ooF=AArM8A+~)dlIt=DGxOcD=bIwNjomuD{ zP5muX&Pp^EEZ3Jv#_=XD=4T%CzlsFcB!xg{yE+sNTmcYyBy2*`l10S4IiB^xIXZQ2 zPT;7S6w>pDg%vV4rOJcrZ zRJ3aaJy&0@NTDV(7dIOf(~?ClmgJyC-J6I-qH~iu zMJkc$8Ie5l>ScB8j=HBJ7zwnuoN(j_WYegBi*FgPPG|Pj%aU6TlK0)+`B-{=pP!g+=mDxUAgo&|HFFI#WEj7q+0H;$ z3j&{)l0i#fEpMPGNao_ctcLr?#@dy&vOQX5r4motcR$UqM+RZ>o*(|4+hX}$Cw1D9 zCXsio3j7dKTu5D#No4iT+c)7U(h0n*$$1e|Ny-X)7UjJO z;SxEiwY!;U-EXgy#Pz6)KdwoL#Zv5hZry#w?4x338n=|R$~V_4Tjzu`2A0c4yll92 z@L2*k{Db2tpPj{Ae5vk1RW<)9Slp(Uq25ObnI7T8H$2M=Zw)ro<09DeU31iJ<)tzt z!WTa(H=6ayF`mV~mn1tX!{2%H)78#vMzj5$3UOBBeeLw13-9=B@h`9k@Ks2?@{>*m z=tWNoB?}0Xj9c-D+KHaofsHZNm}ns3?erd6n-%BB+Vs1%TZYFr?rrhy0^j3#^ucrH z{h!*xSMx@WL|>aeKd8laxvS8R6}xz;s@UFES>w*pZj422g$idwom3&^rQ%_L^a;Dn zwcyx|l!9f~=u43-M%q_AmI?u+xrLdZq?yy?T3iQ11|-j1v>ChN0bVkX=Yxy3%z9$a z0tq+dJOK?-n5M)e0<}8o6WmkcxOLD^D%EA0G1n*;Mpg39*Os{Zs!Ur97LE~pN2D+CS@Xq6Gu2USWnYC3hRzZOau(+c1e^7Okf*_4RQ*iXl-ZAF9nhKX55N21K9SD=! z%W^*JgU2?hb&91_jw;rzgO4*;cl7Y({tDs#%_$5~tVn545*5Ps|H;r)b^ojVU~+7# zytzZe&-!h4>|{8E72Qy=u6NAwcltqJX1@M+&nR+UO>sBWt>d+;2oR0m)OiFUXzo)u zYoOp*%2WXA;f7Q3EFIvPwvw6fnHb6qxd9?&4z$P9CI*kwOyIRLr_4Jka>*@cToZF~ zmk@#_XDLbh*UU|SV<+XdM%u}?QV?@Q zmiEya{a|KV2oF?0VE~A8S|@zAPx`fOEZ?VVd1gU5f4v zhVfICyjMR$L%aWm>?7fkIqacktSq$pWBrKft3LRnOJ)u`#&691NsRy^$|5NSQO}ln z!Ht3pKpU#(nO50$0?e#6m~^fR-kvlW>AwRuyL=d2jpuJ~+XBkpiOfv~M&aM9>lKxo zzgq2RI|(|wyKVn+&0;EdpTJi8VAXYg!prk=bMbIQ)IwL^s&dgeTL0NB%{jnt*sC8* zFAqx~jhyld1j&~6a7&4x*n+_7z5nc6E)c4`5hi53(7h0&q?`Z>7CjITyERGkh>F5i zuBC-=q(L5XAzqV4u8GaH-(W5QAzAqi%uJtMXXg^)`CmCr@ucB;Ui(d8E7I#V7LfXi z`HAUkPH%GuX5i?wlz1bN`}NY3CtMM^k&CJ9-<8ooDyU52fCFE_g0`Biat*eZe9{cM z8h!`@rZ7oKx>HjFSg@N$wUzn#NYwO);*3vV3FIWY#lWs4-GA^8uK!$&m|N{S1EfOo zw)~Jg`Y%Eyq3l5Ff+RWj=9{gQ)zZZ_0!DW_a?JwVI-gA{?6qO9j|T8q-DJf|XwNw{ zk>5h%EiAh=@M3F}OB{r5$A1(FWhW52VOepd_{vgBJKc34iN~ROe_VFfHcT>bk1DM^ zO`RAK$&!lQwOf-4cw+;v;)I%D@_h#yxnhztfuc&rGCMD9GE~UNf+RQJQ`xS0piCK;2e$1#Q*cw9briK1l->QyaZPtHBPz!| ni{OPpuB{d}(bdhXKC z5Qp9hekV96DCn)jA0PNUC}^2#X*a&Ua%ui;=sF}QXbtD^fe(%sVeEQJ%kFg4s^_h* zy;f$tyf=RP*jLJB)&>YrqKyAy>z}~Sl*|pc{o%nM4EzrRndxL(@>y_*#}=-W3>=)ui_#X5jgPXmmZI+`V(dJC<@}Vyf-ZKE%yo95^uD)b8Y_~0 zKWx`%w)GOQUC%CcUQd=%Q63&XGrMX0MhS`W#3+1ZV%H^>#5rh=i%AXM4n=k0u;Y7m zUTkvx&HGYJGz!IP+QQtW4V>Aw(tp3`@@@TsZyK%Z%)OKfTHc!lwV7Kg!NRV(h)Ltf0P;{i&<~J@Bic5MWeXsk@`FGpH1g|mN}n{% zs_|1YKZd+e?xX425_#rJCqcbQ(ev}Z=5qihYs5p&;lP-cx85%Hu?ibjuK8Z=I2Wo&hcRvAX(f~Q{}q#pZV506 z7DSX^!Bk!>NK93V&;=bG)zzqVc9wvj59f~-^6GBITi)9xEY+fjR)F7c<(+M;GiN53 z*lHY7Zl$;{&HrTiLId6O1UTZEf<|92`lMCJ)XIqHcdEU)y3UNmcI<55bGVqCCe$zX zLF+%n8kGmSvf_}nd~A%4Mn`x|Mr}cdFePy?Aj4ZG8YiK+l%7nFh)agNEzkW{0#s_V83rRRJz}g#@zuuaUor3y0psxkdl4%LWhac< ztdmrcLr>!_Iv?&Z)5-RJOqSxoOa?yjN4a3m)pQ=KQ8)M}8t2trixY;YW?RV*f6E&Pg!|j+Jid!a(dQ47$JOPe@ zR%`~xU`o5SZP9CbN;-(Mj~%zIg~HJ6YnSO$ZDD4HR>(NyI))E349)Ead~#?o1cAvs z4H-<;%PehnYcvZ7Kc#n(CxFEl(~dY+2T=O;PF>*I845KHhOC_xLuOi7xE{*Ko-O$9 zG3qBCOTTB#*+5UV?vMrqMzjF(K368zBEp)AbW|BsmF3F-tBOc}J{b4`8oXD?bH}YL zW1h!7IkAds&LjPoyD|wHjDn+`@^qIKgMVoyi(}3$II{Ayt|HIk-e-Q06nW2H-Pc`= zg7Y(73|@GTi5OpCSmSbDRMfoe?%OBxLrKfgg&a^^$I?dBC$|Y&#U;HpoCCxPj)E6#n`KENl-^shFFe z){Br1deNwK(rTiV7BiPkToH$y#XTt%&#>zb35iwP%UAE3?$eg;2~LWX1@MjV5_eqW zjn4f(J~a9tF$9a|OO2Wh;M8bMfL-T`n@IR+u}gP5-m@6mKl|H-V<4n~++K|zAgxdS z$vX&jzgz#eu`loHq-<82$;Lp1@ClCiumnQM;=c03mf=T3WMPIPD1tQe09qf7)hKtV zcQPIFt+Wgf^1KsL2Ud;r=GKfO36}U4D?!Z%n05x;xnLFLoi9jStmQr)I)v*ts zSeL5J($G;XjjN5$D4ZfTEBR@jZm4puvn!+b>3-MdiG{HdKdbJ{7s+2hAo8snR){X? z&t$DTYe+Ib1qLTzRQu!5?65n?QCfY7Jg0su$M+fBa+g_N>;-bX?B~O3CtWdgJoAA~ z(NSiuXlixkzljMk)2d3HtDr2)G$h*Za@y@Z^3CL*XA>qe#7I2up9#;@66c>+YzmB3 zy%h9cG&H2z<$rP;c9dVP1TbLL#wg0m@ha%_1rAV&Kh@*2A545pz5?sIpA#5yqFk~Z zuu#vbX0tew(tI9V?~vb_d0N;OJ|QY|u16L@-a8o4IKWJ}_lnnUZGatq%4i}sSLx3I zwMJeg_}{JM(NTiy9@KpX2)kmbTs4;_MS`kvN2axS;Tul*zH;1J?aNwTl|6vdb#53| z%La=-fYGEqG&+t}@#tjTOugnKn1+NFU^Uq!NsE4UTiELN z)f;==fvKp~v%!%G61o%(TZo92XE}@Yo%0d*PS17%-<;92>qui2SG>PL5jlqUxHju@ z{=b&+n5}J8JUT`ju=+I{AHW^qW$~r{*TD;dvXop&$n_W85%^CLvvW8CIJdWZAgwK_Vd#z9^P3n_O^<&p8O;w zf=??30cOO2}0wx;W(%CCx<~GVw;Dd!EBg&3; zrDw%B{h92g+$9maEfcm_yn%MGusQjcL~JcNklX*^RNB;oe*M)z{EOB4BFW1(XgJG) zI`ZaxN(*rnl?u8l!e1bOBUPPeEplabubYH0TvZg3g|jfEvBmpn`hFZMWSk0A(DJr6 z3z@GOHVn7gPk*5Hu1|k+6OjzUAK)h!JhGsMx0L6dXwxL=Iv+Hi440jT1Rc^dbV^R! zyb=Gi;_oxf&|vOlHVHF^*gO51)}D9Xf)M0@Yh;|tv5K!FRT=BX8ugD#cdt~9$mWeX z49j*V9p0Ta-^yl{=-_Ue-36bM6mB=aLfS*Hux_b*O`iWsyqpb6Y!DD zjNv3+Ws`8;gT?!J2V39VR&!DoeM!W2^F?70}2= zp=jEz<4x|V;n>Ebj$1}V{@?AtRWCFwwoH^erx?3eq#IffK)5UmH?mD^KkrrU^*Hw~ zy;YD z)58lSwM`oZvt-*o`0xz}BRJ@}FY!)gz%*VXgwJAur6Otto4%2ocUXN#4+RH(b>ja} cPhdH}VrR<(bbP{6dks2#5OIL};mOPY0l^$j00000 literal 3808 zcmeH~`&ZI=8pkPjYPyWg94B!nFFVte(_}L0e-Ca4G`rj!VXgo<3gYiIYIJ!gN~KVW`%p7Z(P^V93R zKJVxA!P4UNI&J+jL(A8T4RSx3KR6rOBXbn|pW zt9PUWMIaq7cmwvklT|%o3Y0r8Yd0;tcX57dleM^S0eNOK@R?j}c@`Fo>9o!Re;I=L z8Cr`t=ad6lKUM1my(WyYfJy@k7yv5K^so!#CnV#I+k0T6S%5~!K*rk#HEL10hg=PR zlgPj%AWmbIQP~}upEg-fI5Q=A&Os5P5a-cUQ7*T%$Th!>su$=Lm|A|pi1cf+V%YG6 z?B}GJqznLEtGHKhq1YIYX_Jz60F960Y_3i^GFuK25MrsRtpWH_9;^ z;CpF1rB8SSI^?vXzd5=}S^n795K%Ap;mKK|a45CJr~M=ldt6k`bCjf1<;FkrfqC<6 zcEj;&xc%XYNKT+XkW3MG(eo)zjh%hu4=$>mCJFdB$8N+|ttvRdQ8#V9VkUhc7grSw zC52#SDsbSzjNY%i+ug)~{riZ@2^+CKu01s&;>4Zr!Sj*|TjLLD+|l078NW1Jr0RO+n;NavFJ}J2lOpcoqDYJY$m;*MP`WR zx7V+CVofBz-ZiI-6?3cJoA4VVfy)kU!bp*Ev?WbA6eGA`Vs$Z{U_UFw2ZhAy+V`-h z*o}*A%HZCDX7g|tu!9{kMVs**NHWT_-M%i7Xhy0Yhvqn*YFzo2qKV=aFy{C%WMMPC z&pN%NZgxXeq*@3@K2%L;7_(?2`Sw}9O_(|qyXt4Phk4r;d7r$ZG3Pi^v;@R%caO=Ym4|&R8D$76pvpP zr&&1I`_)1r*8NO08lBfJN=Laq$}OOnYSbb1im>v~&F?s@e5ut5FVw^DaXic~*u_3N zt*G$CFJY9np1`Lh1>i_mNL4$MkoWaYvdm^FVgT^Ch?$sG_a1#UQ5Dd>L`0 zPsr3Mc4WBQ@Hn$C%T`C5Ytw0toxVy08TsAvg;Vnp7w<%7)4z$;Dap zx?>>)lX-{`RM>_QgH&_}NhDg@c487z!GniuW8(aOlW2hU#o~ZaLH^;VMcdqx{7d%v35ljEhR;}<+CtE^pHT-rq`uHNx;@WlLRHP?n*q|l-%p5Z z+pdl&-}dGZ4GcO|sG4LG!KWnsiBWXO*^EN0$#cLuABf76L9sGd3L) zq3s}T06^Wwj@duKG1=b3G;C4>bQgAUm5FFx&)WrWDc^>eVdUHO%A5hObMok|4M{WiKTMs^M&cu~ODkb8AG0f0p-yG4F^7=n zzPz?h_+P-$EsA^0I!<=HoAwyp6<|h=M@`IS#mQp_js}c{d=A@8)%z3Y$z|&H>WH4YM5h(94-P$)t73x?_?AC=%8(Q)#ooyx9qLi!( zW5p<#n@`y>Q%X-WQ6?6xS1i{4MON=At>{=p%`rIFW zjMK=5MeD)j1BWL!9@-_q2nSp3$a6g?v$DH=(by)QYjt!hTTpOYUeM}=MlAdJ*fxW_ zenY3~t-f^}Yq_Q`FU(Hk<{Xc+O^Os?feHfIzEqy-u5E<>Iq0LGX;$c zCnqfN4@8rem})@E`sun_zqU@7L`DmfO@mnU1rrlH-;p(AMsHz0`)G-*M9lMAZC$`Vqk^cx%ca5jE+$%Tgo_ z$sYk9uSpgxXD#ZjxTJW|EqHp;aug(LvK_3Q%#XyaMc9!^>%gG9x@B<+pZtX~KBl}% z?jYVsnH&0DxEFALeUv?`qDw&L3nEtdiGD!t%wBeOf=%~XeppA5$$Y+nH_u<1sVlWO z6Kc~v#XL{r7*%jqQdWOPG#w-}cXcg)IATeD@Y(D5*GSi;%K;deW1LkerEFxbKz98K zA1=*5aaZ(q(lLU4gJZmN>j|0A620n+DI;S1l(G;OVLoMz6AnpV#=AsvbJor_G@udw zuvZq^7V*U*zT!dAcLKG)w7RC$NS*Lk@E^0F7uHUF!1r^>73ey!=_iMhNTE=lt+K%vL^&%Lp&n0SUG zIuNquut=!}d%2_gg|WUUq%m+x-F;-RNLrO!hqUIe@1x|f)YQI?;KsV@=lj?P%w;f? zeW;bX`y`H&T213Q$(AQxxx>5OqDLSyC2M@;!*0?ZLT!77q$4<_d89JeC<`Y@DqHL} zX#jYg!4Bk$}@=QiqVla+072bB-Kj?7Pk*d7sv7UmFdmQsL zsFLB~&78_UVsT~l_Wqb6qc$(Gf>ViTtOr#e#cOq}=T9m^<_tV|vjZy^M`bx#bS_$3 z$zwT7A&_*h1y3_Trl^M5i}f3}KrY7bQ~mtXcwJ{-Iu3k~%IZid`E?A(*sWQlXMXMMXg*1mW78`|W3skIu=P;r!S4WocYOhXcak^RZd8W8|A`6!Y@0iDaR0IM@e7k@M0;Z5 zY?m(oZQGVzn<_SqGP*17=1{)P@qe;wcg3Y2fLomC!Qt2&PVa2_@`s$;Ge9h_Nnjhb z?UN4<-j6N35f%RN{H1HU)2s6N0BcFM1gXmA(q0t9_@(0#QC&$iIdSB+ziATEe;y9# z^(^@i0LYAd7jR+mFaYpp+-3lv)AJp`SA?Aaz)Zt?0Kils0PsuK+e2?9cuT=sBfQOm z|Km7(;nL3G34*B%1BdcLp7N!#`?vFr10a}IUAV^Y+fCM_!6y)_&w*-ltKEpPyes+i z4cKj7e=zlfwz&nDXq28O_7NtOp;TjCXhZsoW{?LpF})V5qo~uRr?t(6d9o<^3dq)Og=QLzlyhxs}B2P~rpmA57F# zl!3JHY~l;GdU1!?lo8u+%xI`ruNkT3zPmL3Y2xSGf!#_B<5()`Nwp9!$_w& zi1-g-n=8z?*teoi_9Aqr!nnF%YJ-oH-j-^Utpn)8XoCT!v^cPBl1Zlc_|3qKWkR*>Qs%0=c~h3T`Zh zpcXtN%hrAthh(LSOhg`r4C}>#GQi13UOTFG(0Tnemsa zE(({{rCPF}E7>6P;QK54vy(2g4d&FZVS4aALFctAmH3QUxC69%HLb&Tb3>QyBnO2$n3WWb1=_MxCg-8sA}y_Kl*1`p7um$6NdKY~ z3i24iL~-|9r&+jOZgj#f(}JBYeVW99z;3H$v^rrl!j~4PjNDh?Y=NPBl0<#WD5%o; zE2OH1!5;USm6sjC3JuCRU7ETXcC6@3Pd)bHvduLtS@S)J@G=3AG6O9zm z`Z^TMnNm787X!-Rj?0qw>X4bDN(?SYX}k7%fS|GM*tqwcQ?Jc%G4@FD+5xPz-S0iJ zKHn}Z9#kE1YjjJ}zUKKis+KM!u6Q&acBMuspJo~6P{tAC>SZPe85ZJH;R6q=wPB)< z48|k;9cBZ-`~ao+$|EWRw$Pq!|$`j*)}k2k8yQR-># zaq`5}ghZi};ya6Nif4VBdiGaC28Ja*N2x>+X6-~4s~EgK`AY^i+UlARCmy;u5FyI8 zU-VU8*$3l?9PP={Zf0s6Gl0tK=|OclFUB&~w{qOLtiz_>9eT6}^WX*^sC=515bwmF zep1oB9;;LZ_bm3x30sBdiczJ!;ZtjUU>VF<2tl=ayTh9ZHj{I`^9z#WMtdh+S|WAz z3sC8Qltlc@M=8TE-s0d5MX~^Co}-TX`H{Z-0(QhiTw7CvbqpaJnz1~60!2ZL+P=)e zQ1FY6J5pwPd8_tky5iGDl<~%Zfx(q>Aj-&VNt-eP9ruJzmw^qEz&fT_e-!KbAd1tK z6gYgcrb(i@#Ux4a`Qa>w+~LLo@szcj)YW>0yrCygqNys1AkUZ~dbdiFJ)9%Oe z%^4C-!g_0l`oAcJ-Q^Wy+>4xNUv0J5r5~`cA+kCS@ptiY_z_^@)UIkb@vb9RO8JS} zG;AuRrOdBc$d`AdiD3F}t-HErznPIHbeoAHoJ4~no&KzD; zLYp6Z>8K$>g)M6xCCy6S*jhc)Xa-`a%lA`*&sffhwmygta^Zh{cpR2z+)Tn5yQh!B zQG`d@2?hmM+g7S*n?tpU+pp5O*cLC{IVJ}62E$;uN&g^3n9LQhLbfrc$XMnno`?Wc7-;8Ocynd6iJdEZYQk}7be$f zV`B~Nx#d+Yzstw3#;AL%BAPM*(3{M3EeNUqk(=zPzaMGgswB;m&$;^h?Nb|+AT@Ed zWcWWz>^^c##khA+#7yOl{=!igg0t=(dxGxCztf>&;hsllHL}mm_R4)QDa7XWQV73h z+!F<@VD<-Snp-T(JUlQ_(*Z3j#UZ{Hs5J{JsP$}sFR_B6brXI>vM@H*>rCV9X&2m^ zI$5FWFTeBp=@BP^x!P^)-qmTlFuDJLJKBp+;299|S$5#b$+fJ#-QQcusu=3@P4EnX z!xOSX*wEVriVb6!{n)d9UZAQQ`Qi0E?}3@n;LR=d6vAv3@3aU{QPG=#2&>v32K?;6uSv&lCTuc~ zW2vu1rq`3ajEl;e+u)ZQY0yuJebLFTwqe$`=GHxQ7wmC$E=S4lf*e+}pB0DtaruG)rxTYdsU$3OxGoORgy#Mv{6 zQ0=bbXp0zJ)crgiU50a{NAtgfK=6jWa50pTWC}_0;@mux}JPv&R$;R*laOfNK!G^C- GUivo#lgp0) literal 4380 zcmeI0eN+;06YVBxsTBq{$Zf?>nU#J)h6xK?qnV>0}Z)iEQBqbvxL1nAm_EN%j zeWMa-S-wC@nxF_sU6-b!9uuTQAt!=?N`ufqUaoED{&nv^_wU<(&w0*y&htB;^L;tz z_hSqS>Av1`Jpcf3KYZxmQ2^kbPyk@nnRRPcZk}K+l>h)6rwe1FHfTkD>-Bz^$?#V@cWz%wEuK4vasf9=SQoHMchPw#Dtk{zUO^Ka>0b8O?5 zO$YDYG<}%x!Mno0{T_BLe4lwR++3oD8!3-3r4|xCp{V!VKY21b2{$%J=-Dxa zyfU$_17t|143_0OJ%LL5V`f3?Bd;UaT%cq<#Zo{^?$Q_DQ15`~?fZI1h~#pAjN z8ZCp(X>{Y2=E$|#4ZVL_DDqu^QDHHJU7PV4b6(?Qm%GH%ig6;^nKY326U_KIjG2F7`dn!q${=t=Dr1U9g#7gcz^6((md7 zDQ56TYIbWQJ4|A7gNJl8ie-VhjMqq0$t=G7Uyi6s&+oL%P*}Sx$kV!rrYzI6DDuEj!PlWJCo!wi^}Rcd8t9% zGjS@9>S_sEL2Dmjq)(N1PEj2iubwb(S9fODD%n!!3xzuSs`XP|-bF(qP-!y!*y=g& zIn`*C{~-G;WVGFfab?kPphvWz|2Td+U;TzJb>1cJ9b_F;e=W@_GBF04=9`FPZ5w>e zv!f|A!M9k1)pru`<{>|uYhM`|YYemg2EwO+S0gPkJ`6H3o_UKbj&Vm0Qr@r~BjaAx zVJpJs_6|oF!r89=rJ?p=mRQeMbX?-&{OAqET?^}W73K(bq# z+kCkNu2>fpz3c>$dMY#dL0no?njep9u{8`?*-H{uk$T8pl^>5MdUK|Q8tUhTRq~~I zVq$Nz6HbvT2)RZty7hGe@;=SzSo!EuLA+C-8!n(WD@Mq4KEYaYp6NUDAS>c$KBOV% zi2j9cD^Rjm3v`6+i{=0wo%uOFc5Y7ofkl%=Aiblf$`a!GaRsjeSFMk|_et0E!t@f6KeOmsy33-LaCtSlqOu1|8N)-1*1=i6% zST&qFtDyiTVcPn!tdHxxCjm>)P^9vHqSLKc!~%=?jnL2J8@=TRh#BkyuPK?nTN+Hb zXSG)P;!&Y+kCTTeqA5f5$_BlVeIr;R34d^fi4dB3tUeO-X3?9L@>lv~Z0Wl$?^b z7QEhkG5-(TZ9==NL6z4yrNWYkDuwZO<#g=w@^cV97{lCUb}VSzdh)Hh8pMDpMK{*{ zpH#^q>7~ae4{haAuO~n>!=C0r+jdUYVt*1eR2kXm`MYOU+;N6u6w^F4pV`$7CJ1}i&J$X%+2xO6MsXmOHa-0x;7Cc-dEG=Ape7*)|4uYRBt>qYbAs95q z7;?k@{8R2_p|)w5RAZlEz;L9rpcF&12MKJCTAa!(;qi;Ok@gQc#uQzi>p*XbSU!80 zSXn9JPgO!g<&DRn0PsKJW@MnE{+zDlM0t1YpAd`w3&flbvFF1XO8DunQ>m1}{3?*7 zUohCQ==GD3Zmml*`&JObeHb=QJ)hj_Fn}a=`vN7hA5dVGC0JOQj#d_A&=xsx#b7)1 zOT)~H=C76DV4;?S*4uFj=vhnq!ULIsbsfvRYO�B->!`Y*EA%$)mtDOQQS3*zmis z&^y?&F#E+f%JZ!kL4iwt?IP8R*j-3nilgUF%}q7Ygv#{IXOCRH&V`18#hyd@y}NvF zb7E?fEuFU`kvZk}#xT9j&`(3Q6PRj})aTKi`=-}@3RKs*R9rbHZc&y$&r{s0Y&@s3 z??r>_cp=L94lL4=!2AvxObj#b(N6R7I@%R!J`x+{0fRfLqYLK7wVn?-v@g<@L*UVf zK-YvhTZm8?PKl99ft2)bSF`uu_4va5PD1U`B=>I-I4Qc?0`JOG5x*Ua=GA=1f@!_X z5i`415-XYWONHr&eDmdwytxhD3TP-Xu2{u@t)XwFb1Ndu-l{N@h)Ga%?Gl$%L^@TH8}3Vw){b;|eNh`X*>UF*lqdC3gIYmY9*_WnjdI%UTCS zm<&yG|gnNuxn3ZVMvZp#nhhF)k zeIZo&dEA*L!YTgCdAHBct@UOF7D_al1;Rw{h<}WiY{tLVc=<)yn diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testInboundTrueRendersInboundInStatusArea.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testInboundTrueRendersInboundInStatusArea.png index 4870b75bbef2ae9c5d8a5ca93aa4e63de7d9cecb..81794e895010e673b14f12fdd43e4d013e5a9b7f 100644 GIT binary patch delta 2289 zcmYk7ZCH|r9)~f{a$A|(<=J}EsGaS&trg9t4hwB7*E;j1HU<3#An4e z*P2qZP$$C5l$3ycB{5{q4$q1+Ss^?rA~r&Xk4T6>^7b6p_Tl`$|GwPUecgXY?0oFG zmx2C$d)_%*USOYKT%-AMpcCEv>D_~^t+{EDt($t<{Ckn}s)py@yd|D!s7`Eec2RpSM%BCakrsatyTyW3`$MPL?0LyLqO>%F z^Oy2r_x&1hNBM6H0&R2~n1Ljg@K85D@?Etxk{D4!4bF2)D@>;(uvGZk#$hA3K8r5a zItH8*ewb%|_&Vp4sdV}X!q6Q?X6oD9$c5qvxD!hErfX7wii44fKs=x zCod+ZstU4s+XVbjmCx4;p$@Vie9)G}@fSF8^f%bk>xCGiVIW<3@-2-f1HH{tPaG`r z32ixG*G+TSLxU>*er(lNO+!^##a;aJM~-!VDM3pxh%*bT7|jyG9FoE{fJ~R^j*qhC z6MzyFQS2Za?ow_Y;0xrQ;mQamc#QRH=*|L%)K7Nlk{SUAOSdq2QZi76;a7d!Z2i^i zf%G9GL1Sp`quC)}aciw%9Lj3kkgBL?wpN2(xS5xowYFAL|HfAn@*URlMjgVe&~#R| z9tQU|<429(X(46)Rwggc?F3fxNX>66E?*0SDPa6Y9foEcXDQvCzNe6{J6H126$?DE zC5E?Zqa%g;j)SV|ny4sHe5^PU^xx}TdBMFRR05OSVf$g%dH6)+7rnf7H=@+R7Ta$9 zU~gdE%kbP@6UQnkct;1pq%Sk~=@>n+v`OFEcU^GVws+quzahK)_)Mek%zhU1tO-85L{ z>+0lPkMZe4@=uY19=>eYo32dYN(WZO6$;)C-oxv~DObtzx$C1OOpJOT{v1;2EJwcJdgcp{wsmN!U`=hgV>#NB&RZ= zP=}eanZkHmt%YP%yJHyL6$;$3u~qS(kDAWJa0xkY(Q7TQ&v`j~#GnPgJsWXOY=JI5 z#z@4=FUX_I8lxManxY?Z1&A0j8cG1#vO_tymD{-@jV4bZOG5f#rHrR=V^-V2Kb=U( zr~iwe#Ff4=7wctd2%tSKJ#`xwl8T(kixW*x+|ZwtunwT_qZ3(=@F};Vi0w!1(z6~% z8qAmxwWaQKve&y}N6(l98KzX03GcD}1DqeqgAdT3pIZZ{tB{}ESV|Ii$01tv%!wv_ zHRG5t`I)N%GS=;Xbft6ROGfa%$lyz6gpS~*21q^4yN-u<8sETbJ}PhK)@FIl;f zpq54hXI4waDcg!!80xY^Y_M?UscsmxJX?;VOb$ zkErd@Y*Vb-7c*`vCB(f*16wjz6%+LFslL-ste_mT=2iton-`PB+Uh8`IM^!#D1Ch4 zjHpJ)EB{GV8PQu4n)=QoiWs<&H4LuF>1O>>{oEhVsvJ{85hb zIeh5;>_xK*ZPIUfP|vYEd#!{H6?%T?Tp3S$g`vSO?=U~b-zp3lR=E|GkrS8S9Zo4_t$7OM5HN~Wm;lR9XF`+H%5>jl! zmFr}EhGz3%+&1?R)q(G`>I1T_5J5dgKon1)Ed4aYZ#AUF+?KvyR&b_Y6E1ZW59NPf zL6ojjBkunL13x<`nT=8pkSBl}KbgjfMPy|1D2`H%j#Yaww9DCXMLIH~PZZbHCvOsY z(n#0??R8xd919Nj$s6>|Geozhb>`27m4fe9R(z0yOWvd9Ue}0orwDh&`eD{1N*E z2l@!mCF}jTO5E|aAn{b5O7E998~TshO;pI0N4vc6sHTAa&sxWXu_O277PyCa5k9^% hyzZT_?W=n{%2&G?L#y|<;ZaMsFD-MA?+A3to5Ubh};W`GCCk(0R9+v^n!3gu3di)U34dA=Hh`f|RA=6X0*v z?pzN(ylP>VLalI6TwKg5ow$jppE<82HxvsO?tNP&l1?U_|TM3K%atQsFdSLKLoIu2#)q*7yjS0G>5FLdGO0 z%AhrC<~9xkXz%A9Gx(SjXODd0%G8@^u8PuOODPX*<1qSIP&=6z|M_U{!7ZlhjOpq= zcq~Fc-Kpag;MiD2_>wKH(stPc91D4js6qD07+(b5ZBF`-MpNej#Ez3fas-Z35 z$879!o=|-nXC8cu=f56BNU4I1XXX$yZhdNIW`u^3$g+z=+VRD8m#lF^J-TjUe!;dW zdLOKe&?!{f@l0Vkfb8AfH>8vG#K1Cnb!~wF-4`Z5(U&1SQPI(uy zl;ju`$_7`r)mKCJtssw<=nCIK*~(mT@y<-gDN7oQe`G##ZEEmn^`fW@r$mps46nA* zI(%oKYvN~M4Pwxj(_ibTXKUiJUji13Ju?L;InmLkq zuEC0Ml##<+`05y^z+#||Q4K0=gl0!B=4EvX?r0%Gio?+RNP(XW^O1JC5=dnIaGN%) zLOzv4hg!cQ__q!Z2N&UIw@wk8=2tVr)^CDuwE?!sqfMIfNVf?b$Wr_8hnI5(Z z+GASzH4Rf^F<$i{%j){}j^!%>?3q(L65_xVcHjl~;_#S@0d|#v0t@D*k^(uzk>7T+ zs0`9~ENq_EG|S*mM{0B=TfonHeqp4h#}G=N5`GZl{@FQH{-e8H{7|i5WocchO(dLv;9~V;lUytmbmHdj^H2SzZ}c`UY9{2!1FF?gL?6@2-yuGI6m}% zm3cHja4#I?Yk33{(=i{j1Md0`9PglYj7%o6C4JM|>wL5f%=Xx*9lZ;MCC^o#os7RV zdaXqhIqhuY9EHVXVp4qsf)o z_CJ-V9aolK-sa+)_)lXBpGhO>n`WEDrvWcE8D}X~mlt;m4|WLk&_^P7 zHY$LwTFBxyL^sX9|I9Y@gz#=h|9Y3k9!*pb0{QRU)dxJN=L@l>@SLOIXEoi(Z;~$w z25t9Jb>la56e?mInlT~{V;0@#3tNj+MKOV|M3{`i!ryUmY{{K)*I2!-@59ee537RT zE2socy8n4d!)Ob<9^Tz-GTZC|*&Me8&x$F$MMugK;0GF20#`AQ4J}pMdK9t!?Kb!@ z3aN@?&*z$~_4%kj(VyH24yKUCaD;_(RsrZjb@Kxyqwd? z-NvbWz7nAqP|&b%1kU@{1YmOmW*q$DwlNfv<1z7U!WH59Zs@}ND`{aoJMf&8^;6E6 zp-!co1e4{!;^cfG>Hl;XHe17kjBE6TBY{-bEn9tu0$&$%-v3tcvX~t9m@=VQ?be3v zSe(`mmGiudR>hEG^FiWP%0SJt9Hg)AA@XdV_Qv!Y2H-G85RSfGqCx-t1}nA#kyWBp zmx6Tfm}w;-{k~>J*H;8pv;s6dLjy>bYc||n+$v#PpEevVfu!wff~DOqqx06UJX+p9 zClZHB29ef9dp=%w&Jz z>K3ny$3GZqBq#-G-){&ZEQe$l4leB^haF!`cW}f(*`dRH-*m9MpZWUay)vTc?98jc zg4T1!fL}7mZC>gS3)KP0kJp2PMzs3|ufRD^4lAPK8BURj-g4L}lspdqvTPo40;G4* z1hVaFR!Gs}C5u_ytrPrDpX-eO+M=RWGWH~5$RYWM;HCwgk#)dpf_j8qAG?(WNo>E% z`)XjO5>j}j8x{>xYL|?wQ}Jc(v$RrC4oa!E58v3MRXRdofDLr7DxflFH zCu=1qID7Hd(jd7uQx~Z*T!e_GQ__Mnb)Fp0ZTY9p$zA;c91Fj{pJ zNo`c3kQ^K$<(dM95FiBFY8nDW4CKfyu@Z=I3;_;F%=L`g?RonB1>g7n-rw{6>^|Bawj$KMXRkK-QUM(99qc8QbA^teI zgOsc$U5Cv%RT$e&yT{vJv$w17f7#A%{$smtv;CPrc0M53182;=h)PE><;F_^C9ABM z28xp@rgXkQEsTe?0*Yy+s7CF~=+_qdQ=0DeD9?6kBK!#k19M0M;lHr{;RjmQ^Q^RyQN6<%fLfwF9TtHNMtv zU(N|!k($=z*^5J!zCeg^lpzW~xA9PnKVmCX^C9>XMF-Csq-aic2|syOq31&jpD2G_ zd-*?Fb;#^L<~BWptOk)Vn8kwUmMUrvKavq=fkOC z?(I^64!B!a(O3{LZkzmI|F#ggYbmj;pCxo~5+~%MEUbx6mq}V8H+;U>Ox#cc%>&ZX72nFl|;B zAMM!!01Fb%n+$xS=hK`+WfDw4hGr-`L<#Vd9gGu}R!A7*ftZ`2X4<58YC^)wx0a>= zS)1egD=g*m< z3=WwzIYa%5H%1m{(EK0Nvv%nvIr_1L<~o?OQA@Oid>&?JUK0nc_hi|M$`%tf_=UU6M-fPKMTgBfy;Km2 z6g^@}KLiY?`jj_I9_(iWI#Y24*3W8W08|g;+E=Lrf>Q~(F+Hrjx#B5LR6;SYOZG;< z>N%s=SVrmPnkrgak}_gC2@N`;`A$*1u}W0XShinIw+m$z>s$AW49;nKMZ$bX;IgR7 z=zD4B5gv2xTgD>!Er;L9|beQ^ayeAFL933a6I?YAh8Wrw$M@W`lmVDa0iG5^@ov&6Jyk9~i4JVER;jpMGa`t4kqw zy~E)%*7{UQw&UhA#_|d`yue+GX4&b5H=dwzdbxkZgzU52X4{0@~0S9B?1#^FY&x;Pm$xFcSX(81%@ zs|BVRZe^PXIuriID4Z=w#SUKp=aivTqZcOcnWl)92LmsFfk8`P|KRCS@N?kf);Z9A~%hDaLO7g8HAYBSl)Z>{tS6qlFV~VohvFi zy~$>5rFY{?mY@9o34~LjX5Aln19UE&HBJ^x3NKU}qjdL(Y^vs`l~*I3zBG6uz|c{; z*BF{v-!FZbqt<nN`v=Nn?58WeylC84><4lfw-MEk)htO)% zZ_X@38QkRR9PmOR)493CU&lic|FLzLWhs!N3H&g1BV7q9zLbN5;kG~FgWjOUw zcOhvfG6n+Nk@BL@9|gt|7+|93>v5~6W@Zk`?*e<5>@9`$v*S&{&vw5F2jw{6=lSxt zwyH9?aa%hk-1d{KVwHB7Gpqbyi3TO+IWdEdP9|z((RVl=NrLG13j!T!)zYdRYceUE z4VhNRHJionkcE|;45@7IULeppyAc>ywp=VB(J??Y`M}W?fYOdO7~&vpQK|_| z;MAX%~v>Jcn?U zQ2_m`VkGe0JrjIz?gsq|5TPSK)7Jc%@s-9|&#g3965Bg<` z$OcwQ29`R#tR6@676wp<&aPzqPJX71M-GR&Z1j_NalH6aA1;ndnh&R(611F2(v()$ z@I6NqCOkDn8t?cib$*%r(i7a~$P%}O1`YIBy9R>up_*S3iMHa~xp)YLHV)$9p__qZplkcz5RvYJYC>YsTAdwA*%D6ZvuUM;#xg G{qw&eL-sfT delta 2571 zcmYk-eN@ti8V7KU+w9gY+s?Ljoua4R>Af>EXU>TVS(!I8bl0U>q84i?rp`AE-+pUr z)s87^G{t;jo7WdYVa|Yw0yZ#V_tF%oMGj{m0%{cOQN4=J`EijSYK7!hgD*cjJ{;E}jk~ zHXM7gT5)~*`Sm`QN+G)R5l<-6Ra82y zxx)fM(He1k6m8oAKDbi7V4P`{Wu&+rI4%I|jd_Mo?9N#?h&32@i6x^|#Gz^RZ85H!oz|bl z+TgG_hwYSSQ5=$j7=%XH-t8S8Gey`|V=xW)bc|fIq)^am(lVRZ!UYS3eE(W>7#GFc zhn}t5`){CiWEF!}5>dtBq$%BHN+oqeNsR&?FF_m*G&Fm)mLCcq3qIKqZiwd+gV>b0 z7#vF3@Y?mc@`)J6%&NK?dIBadbD*}dD$-o8<%*bs;d157xZDXAx28K_kW{lCoh==b zn}_n^%1eY|AZ0nmP^d$Ty5M5~wPsXz4p--+GBWuRUFZ0Qqi&YUy{RVvk^l^%gojnl z*@l$AeyCw`UAFQ^cBpOXWjApBBk}#c+mW)foc$vjXJKhM_&yri5bx1b!jSAvhtQ#` z3_?ef#;CHr&G~?!#1clqH<0QiUK8>Zvhq!rZ!h@vvZaFy8fP5=lRdHJ796Fgk>qV} z?-6j_C$OPaGrFD>`92qfk$X&cuylcLGOU1_`RV2LWcT91NuL{}T1EV?M}lO2kj%TQ zNV%RV8+3Y-m(d2=EkboK{Ab=BPOYn;Vz5}LvX`+1mn<9M!fVcKmz4^<#Hd(RGZswi z&=dJmr`b4lvF9VO{tFKNSmbwZ7u8$p`+@1DwU`bBqrvJLk9|-Ku+&oHjvxR%$jgCG zG-Kun6ERo2JU{B<((PP`exVnj#TYIN-qCUWpwj7GeNB)ng&OZAC_s zeRZHI3HzmIO@2_~m5ep@$J6&yl;HGQ;_rA(jw31ZslZGbutE>$_XKp*h^b1_Qg3s% zTn)_HlI`$3QWIt2&w=6AmUW`DQ#MdU8%EfsjR~OVTm1+^P+)1rxuefT!`4^CVPw)% z!nG_excx+&?G^>OJpd>u`9DVf1p1r(wB!DHQ!d`&Q{KYjOShT3l0d%Vj~eh3J8cyT z&kjnCAJj6|OhYgtl7nRXJ~t&vN?~d6N5y2vqD`A3_v@#X8G(Z| zePlM$aJi5aaG}_xJjm{>GK+`FBqQ5>fAS0fUS8eYUu55vYn#hZGb0v6jgH{@J!Dl~ zFo%Y7d?&UyIILh_wJWhrwLnIRc(uz_PtMZz^n2=?$`}G8Ak$p3NXzSyE9;QhjuGG| zG`|ctki4@b@8MPK`wX+A6CB?)nvjf-q2Fj9 z-iTT!@?!yT)|%>lpkl@P8HM#a^gNY@kF!BI!Aoi0PbH_=^#YoHcIoA!+7}-abLkrS z<}?64|LaK%dFs#^yejg6d(ISH4Uu%z%7YSDPD{-=RrWn073-`Y*L(A3E;W1Ikv=D& z*zhVTfmhW}_7g#9Ul@2upWl-XPvW~vVbEHd=SjHvYcP2w&(#*=>2xT{t#brCXQE($ z>n=Fd2UK)BAIg_5;L|y9?IX*+7s+P-(M3MXS~@kqF%r)5bWuM1O8_vWpS?pnfcT+A z)4uR3yRiqe1pTtWc?MwpZ4ZkPpg@5ZE)iWbUt>?wa-}eTh>gE zNrhPw7xD`W(tp z2!osZLJ3zBQEWe}`5X?FRx73&u`vU@!~cS-_@dYY3T@&h)wAU?6C0{}mhW8hN~TL( zWQ6GVlocrhv*Gh^vr6x}g#?Qh&^`v5);lRIY+P~70Ys?G^872rr~<$8bs8hW<;U02=N9T$}$3~xa@W}(P;%T3!AkB^`gpZb7l3{ z@5(h9707LMV^p6{7=Q30!25PCZPh*wSVa*g&^r_@=drfFc>69K;xFJ0djbxT8Wu$> z_J=gPZ;4pl{r(@ETu;OyM*k;uP8pcV%6$EKmGMmTMox|8D~2G-Pg|m1O8<7)d zP?GM^&7rcm@r~#yuXwtO?IzD7?78gCUM^j_w)#Vuk2<%iCs`Ids<1u*+O!`0P17XEY%Y-qK9?Il4fm5QwbVb8ArZUI@%v{ zk7QcxeqmBy*S_`CFeJU3XiBbJAFieQ8{Ym1$oYJxL|xmXd@98fokNgN^{yEROy_{c zy?Z7-Nyf5B(DNWcQr2aPpzG=Fpl#p{$*Ipm*!JjbnKjim?HQ7gn8;Kfh+&27218mi z7zQjfV*~Z+b4=DXJlSEs$#G?|`t{e8f^D$bzuRAjG;hWgECzh+mGRaVSk(3;tbd>I k>{H@=7NulM$etOG*UZ(=C@0Ky3fN{HPrw{y9?t#bKL8BelmGw# diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextAOnAllRowsRendersOk.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextAOnAllRowsRendersOk.png new file mode 100644 index 0000000000000000000000000000000000000000..066fbc98ff8221592307ea8fde0966c61bf249c2 GIT binary patch literal 8493 zcmb7qXIxX+_V&RjC>n4?MWo49L8Z6QK?etrP@JG3Eg&r-CG-{`ItbV(N=fL>AZY$l zBy^<-2tz_qU_fe&K#-21gpfeq6L4nkoqNB$U-s{meRkG<*0a{y&w>Y6EsUZ3C;0&Y zfL<}Vi~xW=N&vv)y`L9+(tAB78URkMUb%efS{QO+?BKGzvF)klI6zAAh>*mQBYXDj zxn%wG#ZyQ7kINl9bM36%F9)A4C&%A^^Yxdqy+e*cUIh>l*6qzzI@g)=LPPJw@wZ(e_nox5LNb(2JR$gA4^FR zP_?hE=tw+3v0KcLWM@}jMO=Yeox0=9> zCQALv0|CTz;_h)@&fo8lj4h34;~?7ll^t9Y|Ayf2D=B}wasYT{#YpHtH4iq+wDi5; zS{ImycR1>MTtc$sfR;WY1N6rFoXaWb$Sy93Nh4)tUy0KnHjVhaSmgl*j?n*bLnnE-Hc=^uk>l;7A)*B;=G z#h9M76Tj0Tn|PF^Dgdm~V9K=&rNC%{<%FJZ<^kZDY<`Ani$=4EIoB_(lT}o8sw(yD zcPBpg^AGb0!}uRK0DK+0MWYprLsmXWgZ?n?KF?YV*U}hOVpH7q0$<+?woQ_$Rt4(~ zbzzwx8FZAj^s^mj&pwAifQ#sV7`Jm9*Lr|DL47FAeIM6)utl93nt2ES>K}C2QtPQd z{RH6!G>^AV{y{xJ?fs4G2Z)4Nifl{QL#{I(*T_lRq-pc7$+QSJue{)581Mo=iuMZ+ ziz2k}tBLRcZ4gx=`6nLpdVKiU|zmz6n!^Eq42@oJ?qLWz4 zNBdZ?-XvzQ!{SFS^h(4MmgyHpR|7X1>he^Bp8JO!xXg7SaB%!<0Kr}LTiF4_B_Mhu za^uDFue*2j2EUHO8{OO+l!fdXHCXG&nn+(P0O*m(#zS{%VUY^#b?)Nm+#@LFt>>0$#HHvHz#WA#eQAw*OXq@3?#|z>9pOfmjSIbbIn6IP%r=D! zf#H`{1jc!o>jlsMffgCnFsk`fu#)^@1qK2f;qO4O{A|wPcM^~>Q{@4I+|>d-!>;eF zl%K(fmAs__^3B5}5=}Ubp#0VWW{oVVZ?CA;nOx&9R1Qv+Q*U;0@lD$-pLx~Xwe$S; zfB$g3=#gr%irr|y#q}Ig@B$YOqGjXR@S4CH*BbrN9U{vx?swQU7n?>s8xwA+?K1-a z#|ItgdyN8E+s8&wkUtg=I@+7baPfmPW7PiLG;|_`@p#YDp`@!?S&BJeFDSpCy7J7I%5QA^VdY$o8NA^4pFF$C5Q0`enXV?V3o2Z!uSG zS^~2`9CNhZ_J2$2J~W-Cjd#`0sqWYhe0cQ8l}`Klb075y*G9b#Bu-F3m8mvf8ovYM z>Lg7WHwOupBge62JtY^FGl5VN+0IO%DU&PNp2)C;#>A$&e_%Z0O`yKJk z)23VMy|LdTH(d&AkyEea!zHsC4>+j*J>0bxpx=6C3_O!8(1*|*si(V|vGP3^)&{T4 zXsMEUfU3n-gs4pE{=7_uLxXXA@y1YQA@{KYRy*pgAEy`Q+|4g3-n)~|uSfuQ7DSH( zLh%Qi?VBN{^{uHhk1|0gR{5B8sypW%89zFHJfMG8;~q+F9{_ldB;&oBbfrg6AhkLh z^H1Ccqu?F)QT7kM`vuRhsq`Aek7#fw+M8{ki>&X@3Mzj>@BcXt4j2DbdqVM+H81cf zR{DdsRF*-~G<6q2X*E@c0O!!SR=d;g+(+xs z2bD%7?kv!HuY}Y}cK{gCI5TkaycZcXzO+bi_X~~xmAf)8&Q)Zb0Gbw4r+7q{MD>Ll zj_Zr$ju#yQUPHVfuyL91$^LwB3!)X63PKCZtOF7gHHsz#p9R{m}y0z&&<4R%O@Hjz_zw%`|zAB?LO#wCMsd+0#{ zZ>JIRHVNY_q5b_M2M8^jxRi?vY=O3Le5627uch+^vfnLFAw*$AEczD@ci@iWtvxKA z-TE*CdSL8-C1_c4jFxZqVSR}bJQsstFYvZb$w4R@xnd=Xl~O6bdX6H1v+w|KU?;Dcz9fxX zLLLHuj_MiEqeGCu;EkX#k8%~DN#W3gT3$15ElF-TjT;W6}1Gjk+-*vxyrFf3cVcq<$kcDbg# zlUT-%rQSUR38<)Axq)L%-BtaTFYm;_puRL2f#4|TNa{;&pO3ud!8HG)8n?wqG)v0s z2vu4+|Fb~x$5fmuH{LrXyZzUfmot~&Ales55-+=mwNdHqEKJLR{K%o}dC-?# zN+Ltao6dy#OQk2LM##Mpn1!C&1vBPQLzEgP&TpyX4IGMh5^xeg%T~@qe46BZriYdD z>OC7(GC2jy6ZuR-E#v?aZH_eR8lS9Xysk39!q|=kCmQ_*=^F)xOCa*3e5+313=J7N zOu2!;Z`$V82~sRHXx%CT;dFSeH^8(-YRqz^ZBkODV{tuka}->)>s#I3I8 z#@WO_LJf?O5rUn)AvBKDxnO&`-t<&%r>cBtSBmLaX;vGRDuyz+I$PzjFEt_0e8R^k zZ|ge2(8aAKsxJ&X{aVi5J&p0p4`n{lgdH3-gS0Sy}`zS>KWQeC8qIHO6ro`Z1n^? zE>GrFRdQCYIYheg*D)_82_vd9wJ}};w^{7H;v;Wa6aEV;@#pabUFM|TsVwy7kWLCT z+p~cXA0L`Tqx>MD)e-o7$4r??wg;zexe(DvKx*4!&2xjwk93eCgmkhe(siigzV zU<2zzrRkec#zTbcD^x5lflkxlRHxc8EtdrC$}7f)w;e{hEBQlROL$fc3nXwE-6Z)u zV$?GzzF@%&-X2Lp-o@I_nori|WNlEz6unBT-4^tU7J9s!+#pl6)W&;~2O8Do$Z;JS zq=p_fjBl>yb4COf-adU7|2C-dFH-1M_4|J8ip(`p@Z_)Y99DCtS?E%1W~)nd-+2^d z$-Iw0M5d1f=6VNi%|v*~d{7TR(us`einLA@wxEm6@N!+hB|BvQWC=4dB0ZB2Gd%A#niaYiccBArgAB!0oz+M#{0B|fNVa!=c+ zhwWni%(tgdJXxkp5{lJ)UT%EGVB)V}h;HaN`dpf}rRXI#`;9m_CvS@p^kS)sD)q>% z1&m`atexm+vr-_(U54$^NQkS8TyZswC}mU!MM~TU3s^5J2Cc_UyeWf^(dQ~Pq%6Cc z?bzzVJ6VO5yk^lYTjf$wZp@bU(Df|Id3N@@n}_KKI8ARdF05&0NhpSAoK1Q^&m3tD_?i@1 zUt}VwUldvc#n&e?*>%Jh)IN6({9JrQ-TYbve24I(uXs{864z%@f!BvZBNulV4gnP{ z<~&$g3x(5%^OGI(nb24Ap9?+v?sRND9i;RH#<_<>zEV;*p^K*rw&lVi1G-p}^yy+r z*|mGyV}`o2gl`?wOQgGbk;F@@j2I`p?Y05DzS`|11)lqQ#iL0O7X>Y@uUZi)7+>AY zMJz>WCYNj-gpcKAMP*2+*+su>AF|t5R@Fm1vPnf$d$Ez_QpwPl^Orh$7&vLrZ}#ZY zt=g)b@LE}eJO*y~A|BkfTti9!_`^DO*@J2GN?Ya>?y2`taTAD#j}AkdW`*3&oGa5# zotV0aM0XEkOyI1*(L3Qk6WZHqcv9LueBq0Ia<1%5uO;-thQo?X!L~WA;FTO}Fn$BM zB-l`?c6Z=GL9|tNTjL+@J@3?DAx1--L4|nPrFXS!W|21ZkmArn0x=?4FEOM;qW z|5l6tD$VZUO6_pcc8mzErL7wcHhn%3*;B^)?VpboLU>MW%3-qzxg&I8OF*-CaQV_`WEia6;Lcv3Sq{!dx+U7g+< z3s3^ZEjS%4{`G2+9)3fe0l=MNd(qBs*~^O5ZfYWR6VYydo1X{xR0x*sr5_rO_+Fod zED(PUT&w`VsXO{$Rg_xV;&eR!X9!S#f-4xTn*Ww#h2S)wT^Z2==66t%d2unRl2RVL z6Yg9C%RXvxZVhLWprb^9DiL zHIH%Q&PfoM5~;HOJ6iSqx%d~cbEe|f&Y66m5Fl+jCra|?$*v8W2*YGS>wgsbM3IMY zX$7x0o8h=V`p?~fO0(GZwWYx1EhSLCi8AEZmNjd8k)xPc0u>ZUx={H;ANPzI{JrsXXayCUBrqdu8fDSx$gt<0T8&h-xR`ZCdc*Z7_DzbyZ@f4lZ2*TF~DX~ch zG~#RoR+i4ifmUn#eQ#IoN8J-`HZ-k&oH}u4ELvI;XtH)sGTnX~?G`CA(~B_vwY!ac zu#mg?%R;x@6}!%Jnf*^m0BW=ttvz6mq4b@Yr2VW_n1PDp4}h}`*MDXGJYr5i=&N%d zpo~=e-ieh<1%f)2+cjEsQ&Sc1^f%_1B{nJZZKN>r=!336>gk-t^B8sLk;kH*I_mg8!k24 zx|lay4N(OB6qe<;Bo(#W&a(qRVU*wj&igkVXQUbkDpFWoVL#bS(Q`*WOO>fPPh6pX zSsq?q=XS_G!~{4)V6-UZp{DS!ouD8qwiA8*?Qa>^7YP9Nl`!WC!8pZu%d}xo#m$gF zQS)){dT6BP+j*9!I;e&Jt--);H9#ML0Dx_{axj?Mc3OR0X=`82y*(Jev1DcgD)|Q= zJ4c-pQL&6T;bYJfV8+VNsC_5qB%XU%L7wXr#kf}Ry`Vxc{;u~2Zc}#a92pGZT_sod zj&YF6!5oRsE- z)99R?$N?QgQ+1)E{uoNWqGgS++J&?*M$6-SN6_OZP``?FnehdVt~NP{>x<_OaW&vU zLlEl8?5Lu?s8SbzA#9 z7Ma6njMUT(=laz`?e3PlV3+MqApBP+PD8%>LOh2|SZO}ptS6upE%yeirEU0A=K_Z> zJ%7c{m09;&E$aA~i&BE3t?1AmY%}oR`YYH8jdE+#pC>*k#wkLPy5-&3wE@v8Z2yfl$bExf z`xzSv2y*zWTTV-G1&I@;MVHwq*vgBEANP^wJfZg@oK8E!9vZyrM~M_ncNS?>!G51% zQdg*X&G8-sdJb@wPuJ?wmw80HdKOK`F0t)f;A`5p#Nd~vGGCKO_0hr|dnT)iV*BYf zEogxmA&&u_t9|r7A9%4D(PeX8Dx}@dP*WokMR3)gx)NnKj-2vln`IdASWFn$&AuG7 z&2T%*6m)Np`FvHpn4T20ucC^R1Uhi1Tow2l>L33c(n9otM;)HXH{E*tVlJ^58n6jA zT9dmOFh_=8(L%L)U*jY6dtS55ZN0@~e2F)it7A#2n{s&F1Mb?gbO$`Sggi~o(x%ow-`=Qf1D+0wI#j|K7}f6m5k$9tzVbp=(D?$EwINF z6xIkWOZ?cw+hzUew^_P@Q{Hkpz>9C*&g_}wZul`<9(P7WHz$aYc1!=T(jb}tTfIAn z*D+)ZwJ#&#Y3){>_4eqt1E#T2tU+wtdN#!8!n4`{M6^KZfl}GZo6BB?k-j>(b!?#q z6weNiUJujrPF?bw!fcolSjr4b*fpYZa%q}nR=2KAYJ}KWrJN*sLZv+>n|8K<%_d4k zx1FIpd0j#Al^oZ9*eEsnR*vK729c()?BQdQ6S*&E{PAT4bit_&tt08kP){9=mA=OI zdeC{^CT5NA-1jZVA}p7~RXR)PVv6T+QxCqe;9DV^_4&ax(hwfzJV3(!L`ZW*@^93C z)CSSX1x2AP`l@{WVsD5q?FBXo1BTmBGCmh5Cz8-M=tJlW!Ix*@@$OjU?S08I zB{N&+`T}5uP<$obQeiF2Ejm9tU0vQlHm%5{K`}CvkOp7(p1i`rCeiC*>_~!4Q(fuJ zz@f8wN^D2>+U%~)?-)6Ob^a-380&W5K(`K)x+G40Qh>B$5fGStM0%uk*ibUc*FZ6? zu>u5WNibGJu&n3=QAS4gSwR4-^hrX}sLe!_QgsfTWzc79v`F#)ss0R^`St-vIR!nD zx?HwQU$!q;T(N=|?_b$+LtnBUXLfCgv}l7kS?Ai`^l;Bxv9(xa%-44y@jbXTvI*bY zEil|mA7VB`pFr_-mbX{JCs|Q0w)z4%lEJ45RQY!QyT$l|LC4|lE)YonQcXWO(Ib6A z&PYa&sfuO4C_hZspW|hp1u}^{!#RKZSu1 zf9uc>eT>JnmHNr(2s46)L1Vyu)cc%p)%u{iDX(ew7hTg&B@vqE?L+ zra4TOuKNRx?E|lGeL`vI5pfBXt3><`W*l!bu+uPw+6<=RnjeuGQYH~h#r>RD^Q@uy zrFf3Rtln`ZbTOJrNsW+fqCF*zKJX`Gn>QHaBCxIg`JWsjN1IH-MNTiB?l9HISkU*f z7YbmhMARt?wr~Y;dHtl@rVfc7jl6*M#46NN%HzUd781zYG4fmzspO}AaC$=& z7C4gl|A2j&sIlCDZJBK`R%U1DjON@(5Gbg;W8pH^2e zF`NBZ#nQTvi7XuPf0@2+4?98+?C4oR7DOW_cBqu+w2iq&Xdk*>kX|1orjUkx-QKgh zCH8+iL^5xfp-dqCKi`0zp|>^E*($ufUEWK&5mLsbN=111S=o49p2;gZjh@)w`h_?( zO|=2N6+GqFwpHQ9n#3RcA0Zm$^-&ew6>K(dEz=`UL1ds~6;5j4x!|PTN^jNESN5<8 z$pr>US8PQ*e!?;0bwkhQQU*9d6}oSSISu_=={OgaoamdWGO{>Hg~}f(-Xp!yNLj2e z7cR4DRDe05UeNZ*PS#e@AG~8b+^ts4v4UM7@+8ktM2WVaBR|1TVR@GkUBAKasx9~yD&PLwOiBN&7Y-FLgL%={)pbg7Fwnzx|WeB3YsH}UCB$lrTbM%DDVP*UBjWs zh;^TCyY_wY#lf$B_mf6%!tC+i>lV8!FHh@#E$`{0eVe6QPi-`7?%V9b_9w>f+Gx>d zzWd;)W7sCMvlh*}N|!pXbft?QRGgD_ewxzHd{E1z#^DB^)+?%pqe&_cQrnmT2zbAA z%B1Jn$yI>wGY$X%PaW3)0Hd`4z$1zU0C2wS3&8b{CY`6F|9^#@m7L&pWH`KWt+* zjiJ~69D+d@S=gqom`d~=SqjG?>em!m&Q&|mYcz+K)~1p_=HH{F2+PTz#S0%oLs1W8 zq+^Q(KNrVA5+gtyeyklRQIN!oP%B-<5w-f&DB4ClK+2>~yRIowi>s@s@BCEFL3{1~ zOVuR(4w-{DAI4E4lRt=4Yk3+L{{ifS{TmF-E2*k#*8BNOEP!NNmmfr)eBXaty_Fvp zYRnnEYFJIN%y5$0v{WMhqp@f(p4@D$l%&krWZhi~P0Lo_;e!yMmccMC-RUEkOKZTH zzkW!MQ$Hx+fP^&VRX)vp_!z?YP9F%2BebtpZs3nl!ZU=FN~}Qi={D>ggVeN0{+L5r z;4rH1wWpJOp*rJ}0>a$8zR$2Q7x~j+r}=7Lzsmcu?m0p`5UHNaxpq-5q@+X+^PabE z9B@zUMk9Aa8KOguq^_a1#{(^iDJFgG9ahi$N@NeH!IeB_FV{M&7Siq;X9vam{aOyx1yjfa2a)m$Q#Gcec9(i)x`?HRefox)wFnZqLHeqg<>kTlUxv> z=+qXBbvbrE*^_1v$@q2i9fJcu{CrPh^usJgw}jGiCYW9Zz8NaH4>g_)o!D+8f6p{ z7rdXbCeGM(A2oSB*W(}b@e-etL72=|U)B4ZsmG24#>e?MT^pUq<~=o*7iAU{KZsj5 z`{cjKq~&UJ_^sUK#zzwmNMj&;5FDQb9XGthJBBXqgL&V*JK)9we+bf9;x2fvEf)va z&xz{ixBrNG9V;-il)R}~t+akFJx8?<9dY^H0yk#zl|4}b>_J&5B1S&nx4F~Uzx)(j zWCatS$z~SqR5YT4;sV#rrt?s}pO5nGGlbNO*su~WWMI2Vq@HRYHsW$~nY6HIJ{-K% z*@gvJRqSJOZ=grqa)(8+HY8D}KC;22lG>iC)=eX{LA!#c9ktAn&kMZeL(j)msO*SDCG>pF@ z8|`=NRY%uU#|r+N=xGIq|I-A!i+Gsya`hIwi;}GNALA9Y$0+aZ)`J)_1HX{?F+Ir$ za6cSkidfC13t*J!WHG}`E{3z@)g%4L@KD{}*Y|pf*JplseLv6Kzp&IF?Q(WAt++*3ng5@`Woy<|C~SNQ(r&0TTLkRL5&@v5{-#-^m2yq`|YX==6a-~ z5qb0DMt3an9GYK3sPk2;HeB~P;7;v$)%7|M98g%^>n6Ac6$B>>7Ry57$;mq5J@?JT zFU7x+<_h^&?Fc`5m=St|P6LQ~VgV2<3f*#Oo`F}U%|w!a z9c>~)kXOsF@_$@^zW48{^#8Ffexj%+_(V$*{W0c~ktVpX3h+K-!J0ysBu~o0e)rY93W!6p)$j#1x z@3*p~)m4lCQ|rEO+UEpZ)}hirw|ZBou6ybi>IR7*2P%+eQ;$s!It`5;1bv*EeJ<5= zN71C(2cct{kbROYR-;?XL?dtc)oIDf?rWpGh+gd(mSp8>=S49qLYiHqN{gvn?v!my zoSkT79E_bIUQ2GFv>t?4U(aqHJOmKHN zvkcCH5vR~6)Zwsiii3VJFh&k5625g@c6n$`qQAgp8b;@rq(EwT23_Do!v)IC`3@Aq zLj#Wbp16QVvu~hTiJ6J=Y+}Qbq7oJz1NAcgro*{?gvxrP3-X^dDWm;_Vz8V8)?j9C zxvM~9f%>38?U^3G63E^etK@h9NsnLICFVpDh(xO<*hsI|e81x(c2D1$!;br0-gz6>balMw zRUev`CF_0iGdx-|*3CX$u}vVR=0E;C;50Vj04mkIl@;(39u<}13ox#gtcuybKbCO3 z@#=)0Sd4E>CD?Zhq^z|}eqR~FCvt1E@0y+MDq8DfQ|lkUFPA4eu`|v;;tZYB#*q6H z+4)+0(LjA$>J;8A1s*dkz5#m&y~c@Rjv;cN8c|&vGi+z6ibl1MC-_qK4ctN@`#!2f z@d%OVrB)$HD>OaV0ZV!~UWczPEnr@5z^V@jJqe;H?L?xdzu)J$5jZ@iW@K|5tE#f# za}_^@%=W1CI&aJKX~V&aa$V}6xAx9jXM;~Xw8#F@Z|D;d6PAer5%yP=9>{>?(=rQ0 z9ag)tz-n*-N1{AZ6upv_1GMfK7nl|%fkazmWf~gP;;w&LDq*pMJ)(GZ`Aci|II2>S zizPBk?sk{u#Y6$AEp-)cgF%bgDoMK{F&{poNqO5}bz!o&k#Vui)^es}qp%Sd=;O#_ zIPGgHqXz+T2-h*fc)u^#dUi7S1Tp*;tcaboU7A zb$yARL%2}Uq z1QMN{5(n_bOo|?}ggE<(<_i+76v%_$4A`mEt6)ZDTeu;DML_G@TE|`qbTXKDB~$O= zdEibG&$YSxdT+Wi;qvr}V;E&3ILg^}vcK>1L_tRTP(`DcbI^>iPRDTDN!Xs|bI_O! zo1E`8nHxO7%4!x|^mV+hJe`&2^+!rFF|}Yy=7A4f5LuEqGtwE%jQ^kQbi2V&DZ59J z!^%Ks^QE~6%^-_nx5@8wSalur!yJTHYd*}rol2|P<>?%W|FvD9o7wo%V_z^2euLqZ4p(gNs~s_Qd3xs6KA5w1Hzd6@n#d(73^x;&u-O7)Fx z9xg?dY_$98B$9g}d7F4BeH#f1sj2p@!#RPBf0P8h@*xl~gff)eokN@=v|`AL1XzwW zZh5JIlN8T4uo8Gn+lcn;h)U&nE>U@eNuN7EY<+$E>-;p8F9b6~SX!wli}XtJk<#P> z1e3%e5bvdRw1;eQv9hVUp~;y1N8p`r9rq}-?XawhPk{?>%fKnZ{(z$fl}fOX$? zBrHKh{-v7|O&OHlH*V$Q$tURuEs@W$`HpVFdceM&c^!WE!0!UrPJfY3b@TL36;s3i z;%K6$^DY~p_hm&Uzc|lqp215fC%W7vjKE{YcsrPHZ+Liur-=n><+khN;X6yMI~}&- z$EH(*3yX$@?7I|P=+JZOhN~i%v+yV}b7)Mwm-$MVSZ0HH6I-=k46Bc;alvIrqzs@J zMkC>yr#pHTS@ouE#MbN>aLO_L4~WG9uo9YD!*wt=h*_CfW|BNx-JT9k{&xg7t(Q1( zw|^`w$hqv|uU~PKeI;@UiHZ`fwy>mioXft%pyzh|7#i6I1ATfa%9hB#$e3=3x4&lE=%jZB;WU{^BpD2{n4KVST;JXId6$9RIE9{dbO$p@xQvwEm48K%u@X}DfrdHbSVu8 M4hZ#cIuUd8pA$C(PtCw(+iLA=prL@h5( z7cZGwa?DCoGer}@CQT~5;aw0&8AU}OR6-;`4$V35S?fLjy??%I%|Fi{&wAEg`}cXi zd;j)#XLx(LL)ROxhd>}ukE5<9A&}MkA&^xO>(*-D^#1*N3Iwvv*TdEMRD9svD4}xS zX{_%25zA{ie3nb;N!J9QOx3DySNW{l@m=p%&Np^^_x0M}4YzOBZ*o5GO7Z*l-twt+ zYwsei^%ia!bG%_QO@Ag9&Ax|E+P>@_Q5MHYB#sz+g+nL_7dlsP@FniKzjfYVfHDYj zC8l5t1ac~GHRQ^SHY0EBdM|z|?KI*KX-H)4t&&XPu9)}1OOjJufRk)l18u99JQm+XNM1)j3oe=W}>1B!dfU`8q`lO-Q{I%0b zJR?2Dd%J8aIj`j>K#(jT(6QJGWdzK4W;sdzzFAn=?cQ)5Hn1L^FSOh6B{b?7){^KY zpHFpoFp~`FIs*133_Oj}klokm@ywy9Tl0rznAp z9Sy z7O>IK8`Fg+21lqHA#=FTq)3OaBZql0jGk?tgrn^5-U@V@B!a#AIZxXa(GA4V(~QEb zwLAD}=^=Qc#Yejj-_XDym4wtVR&*t7o=^7=4Fu0r8o(?4BtI8UPbV4?B3cQU$FvA^ z^rMa8N>kQb2J-;DTT`u`gUUDw+@+|Xyogo`WhibVAXs^FnJWh>^8BJum!(Uf+nw&< zr#@K;8Ne%N`RiP9$Z?bI&3k&jF;Add!hX>nVrj+28~GxL<^l0my2jba%R4U-`uv4xJqesLK1n$5#+xK}EYIf%F2t zyzvAJGb5~t1tTlEr(P#fXv32+&3%h~FJ%q>&%~|$H#dA!Q?g|?bb576J~?Fi8XUnU zqdysPNUS$1Ae+*Gl}k){FiwwQCc^PF$>YqFaC7&vJqk-G=rlu{d*&{w19?u7kA*>+ zq_PQe!Y_0{X;8|}Vc(4Z!wxH{Db-(U$Dh+slLgd-40cZZr~O^%#9IC?;{jY}ZHYLr zu>eDYWiK=b=DK2!;Bd3vZImKi;IZ5h?5ia>ZqW5d5gG5bZer(^%m!(T?l5O0+ z&z%YJ=>NNl$AEG-DK{y%N|*lkp&nQ)7?@lAruK!I0-Y@E%Tq&XPxAnHep&K5<%8?5 ziO1LD^)0_@*CQWjh8vW>8y~l$&$qW+x*r%H)Z~vL3x&~d>}E|27>$%{pW82K7RLwe z-$mawS{iB5Z3u?(ImylN6%G1(@?iH!yefiE-O#~dq~))igPCr1b-Apqb#$1fy%C=wcQsnK` zU7q7X>NcmFS?G_th>kS&@YMnlFq{gmI1t6^26)fhEEGy&gyylYOlj*o~s~- z;(mlco*>phAOmF($it@px|II<=r2y#zYzR|Ks%uR)eHW=A-E>_#sEar-m1=+h|)es z;uHsIcVomLl_y7Zz<8CkslzF!vMW?&!nm7w2f@L(M_I&_-?NB}$&-2`Q&v2M!6K#R zR1_^;Mky94qV21sID_yOO1+647OAgw6%L)FyygcDv4ZCK}1#8Y57d%n(N0!PkEdkRw-nPLB%ob1kF*cxFgOB(wr7DpK zGp-2x)rptuZj6uXhxSl~aS!16;dsGR6`Kq!UnD3xn@>>3;De0*}uNCdI{>fQ;Iyk}nnwU;X-DV4)ySBjqDj#>Y4JvA3re9FVy1MtH3j zd)^+AV}U6fhp5`w0Q<2Y_i5(yKI8;*eCr+w_0N4q7KRLc$YK9#fF})k*{lm^2`UnW zp#}3CkWo0jTI7hSH)GLNsYfMJ2J*Pz}BkTFbef=;+n8mOwRG~2jt38s%s6GjKd zo{h9qI0Wpr*gL=tn_dm$DpJ89PS0{SJU~UQTTZP6*atr^77llI zR{+fL+1F>DL(MNaq5Q!MZ!v8zvfOw1II(>)x(+1`ks@;y6y$@Tp^IYCTwTXIO*#4{ zH0Lg6fV@E*f@8r`>l0{)<@Y^Su7OQ}TK=tenv&-=Ji*j_Z}5K!L(}OsQ(5tZUn)$>^gJ0&y2DH<9$~1x zY$n|uU712mp{!j`(!1!(+bg|-oW(`>_B(gnOh{+y`RE2W!-96>PSaBrYmiiHH{Wre zb{%fUoOU*IK;4kT#upCTnD{IOD8jidKWlNlI36x*jtvCRf$XapUY>Uy@fWjuU(!h7 zE~2nmZ?&tu8yKDpGdz!S^E=0?e(wxrttz4)aIBmj=zhFNZ zC5g0AIB4i?FK)J^)j!fP;3nQfnh2)C+85{pp(s>X_=F^3r9+Mj3K!6*MM9B6GWF2J z4vy59>iODOMf-jl2Y=wD(U`y_{Tb8%Z2Z_Euq?>4zE3zyy+_JGj;?Ai`q*4aRIm+Q zbuRTGV|SMN`#H-dSxv@Nx9nwifvsl#P>?^Z`GF@=G|Ba3OiBd)HcH`SM_}J;r=0xey?TAnVqXX>rDgt{2TA)_lBbu!V*%P?3**@Q$uCSO*mdO_#H=`cU0 z*Za|C^UW@wG>rv}L-Kq0OS++R*R%$r%>Ah6L_|fyCWB$zag4kBL~7ym)bNqy%rB+4 zSTf!9ODp`-f9Sjz4REw9@|8!4nR`(C*}Ir{_3(v)9~O3PciZ&1>V*~(f_K`YVx zT^seOAsTYvw*ExhflTH};pGLa&&EGBmC5Ry3)uMIsygtES<%&nn9-|lY2P8vE+{So z@fizAb8R$J-^kXt4!PJpUszS%GwZ{}otR0X6g4(Jzo!xNg6j1(qcY1T!Dww#v-M`e z1zRws2HGtv&q1DRJNr4ALUiAO_{V`yaA=H;+X7)XYQI)MqmQ7HAlLHU7$zFFKxY%v zX_L|Da(Mox91m0eAS;NwQolI#A!E8MArM_ng;!6#Zc~NXQTq1Jy(_AWuiKX6c`o+* zKva(8MpKs8has9-Wb65VOf_Z~-7AwKQ6URYz!!zx6hDg(isDWyc78jfqv3o|xNKX| zuXc!Nhw47E@F37AYSC_a76?jY=Aq;#&=4k)xh^pFtEzr7EInUa@KvJjB+^p-5OYYxyhtf%Q44jt2Yz);nFRwsVGYoy#-Iy-gY zh-uCnZ5!|MjD2W+T3dNBTS>yDwCG>wzXt3`rBWHKaCX=80d606zAzpKo4Lff)J?L~ zHa{Tq{I{}A;%t_iG*!tWz-6)_L+Jgoht|baC&Yk-ZPKn`Vf|5ii%O!)LGk E6IkS;MF0Q* literal 0 HcmV?d00001 diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextFieldRendersOk.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextFieldRendersOk.png index 3bfa148956abaf0318fbaddc5f427ba369ad9210..869ababd7b0a0a66f00d28d693fa5b8d02e1de62 100644 GIT binary patch delta 2861 zcmXYzdpMMN8^_VBb`{!EWSS1HZ%_N>V(}=I*=X5@(H1SrY-qVOazQbhN5-kX znK&F2Fq~3CiBkMto~E7Ft1*9;AQaUSGFl;Q*dRW`#4R-f7 zSb9bG*5h%a4j2xT2aa@9`gaTnT_mQrlot`)t)!xX?2-HiTxU9AxbqHEXZDlS4u&C% z#*)fQ-CEtj8)KBFk>eGgr1@=biN_udXxQj`y_3!Qy8ZF$jprqRNox|IXhYw7??gdk z^-4|rGrefclc7G^@;WqVw8JbbSGmRv4>I89*Lin4wNum%NS^Z26@qvwTGg->~1y%l8?&T@&ha-dc!zPg24?Y*X#JzTy7&Gne;HU5AW_8aQ z8Damd@$J5oPm1;RwXfb~Go1-Pg`qZTa}{b^4$x7i54sWrQVC4XP7Dbw4f-JvS~lFg z*ct4%Zk1cJ330OZpOqyF09fGjF-ouuSYDwim!@r0J3v~845QWUr{`JS!2R$pW^K=N z%~orzIEORAu|A%zcv%hK9)6`mypwg5y9OFhVk6`cjhT6l$^W3UYEb>FTrNw)B1C=2g z@ivHa5cF2HT^{XMTk~3x2SHSH zkKqR@GZ+^*&mU3u_SN6DWp?#bXIf#ATbC1C^Hi0QC#144e%T)9qS|0e-t z6K5hngu&_XcdYqGHPs{lwB{N9FL+HoYgwAj@Xc%?iF}r)-sG6Lohs#zXAB<3Ob<0K zJ;+EwlC}`S6hi4E2qFeXo~kgFd*0Aa@K(^_B5s|bW~9h=P;~_{$hpnC*n5Oiq@qdh z^5XWPCNi!EnF6hi6tM$R2DD1O#F!Z92$rrvZ7rx<0zdb+O!U+Ysh|~OY^rSv4wb+^+U8U|xPR;27$B50#2|si!J9G0kiDL_|1)Mm`+L`W3II?KI_tYm6LiEb; zV+t?sYI}0$jfueSHbRHtMG+rCQ8yPNsll;=OcIyhBrqAXv?@U*Venw zicHF^@K%B^fw{-!ItOErujKl8iWw#+f>NdCQ5RfNlaVrW8Vr8+VZ7pQ4%@jwe*qK~ z)E4E_CF{wB1|wfNM-}Gi9L%CcP!31tjK&hc(Ttgh!<_90hR_QS-&lgOu+O znBtWeelFDd=z3Pn_J(oTmBqa*&_fU}Tj*p0&0TK?8}D1Xl$z5~cbW1XMN;|z zO_?hdvF0Ppv(m_J9ba?FikEC3+M~%*l}OqQyJ{!Jqfr}iZwmovE~v;gJVe^=TMZ&dqaUv7RQUINnIkaF_>^D=S}0} z6mg2z#M|(}j?vX9!;f>NW2v6C`BP=LsMkXm0<(=6#|wZgM+d?#|JN zjE1p)nD`{^0p=P*DpwybH^-QzhiW%OL1w8zf!|P&>3vnK`K0B4H(@{LL22G*#f{VL zc)LDkxb6+AaFX75ukO=d*?{z5NxM^xe)>RTKcbDkx1ua9)APjgf@?$QSTEy_iE9Bg z+83XTde1*jLCU_)8C5h-Pm88d^0}6fi2^=G_FU2;F+ys7RRPnvYsBIrZ`llWtLt)tabf>1vfLnBv)*(AKaJ^kC+Z<*n`(ixeBemc-2A& z&mwA8hfEvnc*A>M)#D`RXuAF0D%%t<#hR2Xd5;qLOJtY3#oU-AcSLbl%g73*c;YA2 z2g`jk&&Z~wbYmN{nB2n8hQ9w|gRV%6@-lh$gNI7hB<9%Sz3=>7K{o{eBpHOX?b@Xa zp6jRP*kxsq%}7`9QPwf}y>sqPjYwWr2;xj%J|v6j0iJ-dKE_s2BIm67maB^D#iavd znZ(Xizk`_3q+@KgLp4LN`^?G0de&Kh#l{s3M!4M0XHJ_8I!c8iJH3K&mV*U;?{)a*goA<4 zy+OJ#N`jh|C&cb00we%iAsp*;gEnY?x<9+BdhSX&2fwsy;*Ax1-|KqyLZ1uI8K8z* zu->jSfp88vbEH7XXkIu;xVG`*wAHaiwK`TuIC8(AWrZ%Zz~#d5pNW||a&If;AwUf} tHOHzT7p%nwj9sl8; z9UY!aq4WCdV0Wy0Dsvq3Qf z2!1`2sc)=Oe#knXz>F#%V|I|ZuNm!zEm!l*bw2ZpugEG)ZqXx%IQ3oJmug$~&RdRn zTI2wND{O!X^lI#;#1G-|3Cycr%)Ka`kEp%wIIx_{tc9wf$C^}P1x{22iOcLYdBSF6 zS=Yll;<7Y7oET1!a^~p?s(x3aL*G?fIw7T5QA>GOzN^NLeXk4^(Hb`FOtM%2p{45>Gq)5zVCxc}24r%@8Nu%`&E|3#R)j6V$e@ z-BTWLBhIS$mcUavqi}t&GOzeW{>rsP(~`V?>MD@vIF|0}csOPVSls^3N3&%_kLm&i z6NyR-F{Sd@nswa+_PW+VMoz(hl#ghW)UOmznis)g${nhv?NN3_eOFkw*JGHKal=fs zfD&4Uelr#5V^n49{JJUZ*V%ojlNNl6?=FAb{)(;zgTa5lznCvLOif+s8WGAb!pKjo*p$2ubftRrO8H@OoX393g_0EfgRzuhTT$n zy;l*tw?FyV=kaT{M;+{!UNryhq9ZTH7KPzb&`FgKb9i&+?1<*Yxo2-w9nvvAqm{~MhjQzr)XsWvubMii9&jiXG&Xu_Pe zMfGg$U_(TLWpbc}r9nQxWWqonyhH&Ab@S5WV=7UXv5>-Wu9F6p=E094!yZ6Js@w9-4=cXyFmK>+yxTehksjS`M(6((c6Dotv`JyB zAO7qaG0I+GXbJEzD?OtOIKeW)u4{5YSPL1~4L$%fAHopbh*1iV)lMR*hi%ywx1MSf z$adw!S(v|)o0r58_FTkrW8`}Za7}!F62Xgd=|Ckg+o1y43R?X_fkvyyjhYPgsN$fl z%%ZkV(#D=wwR5COC-VXhr}Mv}Vx}?eca_PbL6I=gGl)(aaL*bp`cx0rCTPaD3bp*V z1ZvFO*M2=;atOvkAgX55M5xe=|287PdTFN3`(0y0uOfR$(fK|rnaES*0n?}BMRRtj zp_%0x=#<&Qco)>%f2ks+ckyzFSuS<5BTYP_J!>{3vEqjqoT#!dAr_d{NSOA#gWI8e zfdiW(9XQ*4tqxRj!!|WK=mwVZm<@U0oWyvTR`v$!fSTZ7TM&MS64P6xtQag7CRsBc zPFmKtF2qw8Zvi%$z9$fXNiAOC$vjFLw#s0s51_p1K-6 zLpv114UjB3L5M^z#t_Bt+7K0?-F+m`&n%yn`TZYH0eA77_e7fUXqYBYwdi30A_YP| zXXX=Mof!U=!|42LXU}pQgUa|Dmg6RsT>^JU@@=JnQadrJ+RY~HVXwUqu5rZr)tJ-1 zjdn(&Yqg2i7)O7z*p3|qS~x9AqnE)W^v-W^^<LaS0kCeSWHl5&XG4u@H)1!i^zDv@c%Iv*Kj* zmzQoLi%%^(3W-C}j))4JVnSTV59xlnO!hMy!W!Mjk-I>2Y5rQER-1)Du+?cTZEa9% z#jtErJ^j!e6{XiSX^6$&#hp>#SF{SRL+D#7(HJG)n(S1c zSRn2-eT)QQu>v`^)djH1Etq~KWyQ)F{xzDC=7eR2<_XS|pR)@k3dP@86lbB>;rT8Wh4CBP&qH-5jp+EA#b$rsexr4uqoIm!J0knqB8E=$92 zE<_fnDytS3UGcspZ$=`L(M@(JLMwPd{m2#1cRrmJqCwJb_cUdXwhA{R8Xe1-`M#59 zBzP~<-vkwU)Z?tBap4(&enpf7$~J%(YPEHQxON*<@JY#kq$B6g^z>G7jfk*D&xoGv%o zx$<}I5i?BP$%d+};Na}1cb%G*4~3jfo?!akR}-#1%nJf$>c4PI zo0|o1OIQ_X_bCMRh<)FR9?TgL6tBz~twS4j91lW^If%S{oy#AdfhM z|C4I)B3sGz@#yX_IzM+P*6XpcUmrK(@OD2<32pqCXSqvG&|Y#zWpj@0lC9wFxcU2_ zv)i4Ja>R4k&alYm{k;{qqRTH*%32p_dQ^H+{$$)nM4Jl$0?@E0cl2=J4!|22j1yOF z%;o+(omhD_hnsyIEqfWVdA-9srdaqsa7lFuU2VGl`|WOje&7v z%R29}Huh!yu1E|Ja7Xqd>{eIS)gE!R<+u@*c5WazS++7a)+twhSuzjSD6G55g==(O dO>E>VYdQ;#9Ne~N%YB{II~ow=U+;^$@=p;Q2c-Z2 diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextFullRowFieldRendersOk.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextFullRowFieldRendersOk.png new file mode 100644 index 0000000000000000000000000000000000000000..7cf36f895521cebda982d75ca2b7ddeed97e7d4b GIT binary patch literal 6755 zcmeHMYgCeH*QRMEo5{54q(y2?Q&y9b)sTfkO{L>hT5ku<6Qy|;i40K@Xlj}?Lvx%w z6BUg*Su!2~0}-bbEDz+UsNf@xq?8Dx1gHqlN4@W#@B8`w`_`IY&sz6-*4letd++Ps z*S@ok`};2aV(k|Y2xO_>_lN!kfqb$90$Gr_c#-wwuhZAa5XjnXeuoa6N)1;J#XWWl zJL~$c)$92;jE?+{zqWm{)6vhSWJme^V+T2vR~CPDZ}-|n+j}m(_9g4TIP@mx%I>(C z{YUc`$$mO;0=i@U&c$u>JH=acw+!i_r=Q|gze|;6h~|T)_7~bF7I>OvcofrL9ekQ~ zpCz%ZfsF8uTD^L7WC3J9ek%l0>HZl6()Sw#a*w+b0y$Oq3FOLz)!XA?|NQh11pidQ z|Bptf2(2~cQRfqZr@RD0J~eH_un`WO<@6BZWicGJJ3o&}W0LPuj~tbxHOyR~(X(#K zEWqedL1c*PaEgf<6(a(a3;bVqn(5dljiiz^wML;@)%7F#jiugXrl$SP1$_5RV=J`1 zZ1He^4xt%^HhY~6c#DM30)36XDRi1wbR>}fh^_v66A-m$I=<^Yg3TH}!@fL3avnJ} zx(&PpoaCX3%3-@Yz38r)=y;P&efH%*X`6u7bW(;iC9P`?6_|Vod`$@u$g6T2r*L_Z z1S5Qrhe{vt=r6XosW%L_kvaa+W2bMgd@dTa`Wsy`qb{)Dfx9{*(&Scv7HPcY8rL50 zkdhnTiFi4@K<&UIT&6sI$?WFW&`eEU4OF8k)Hr{b+{;F>sVk;qqyq(e1?k3;R#jmN zC+G=}qZag$?i2A)j0*u$*Dv-QoIh=xh5Nr3)D{`v!I8RIJvId;NF{C7-?ETvsJ>rJ z6>V9xl~XnzRzVc+HkY|uk{W`Hx1pRGRLjUnnEF&$*JauBFs?%iEGhDyo+t{%GGQl} z1Wrwu$IPv_RqhhRDKWq4C%##Cn}L+^wLzZm$wXBvWHV9~$eNmEY8$WfNtWYb5WCXN zhDAH3jIT7&n057v*DH0S0(!h+Hf3G&@Lsok`8nC}0yqEldtzsAYBKbj>>8&KH&f+f zb!Nse%v6p_9bFWr@53jNr3lbsu8JyL^J7s-vwH^+62XG zM}5|OIpA8J=73=gb4tc($Gqvo{AwZwVg59guDJuKrH+}x_vSqk`ShgbEbtj%K3JLQI$ql5EUPfiKJB9Q98l z>r8v1TIbvM*~lMp5m<x`7}vVSMqQM1EosOt^{jDP^Bh=lM&(kA-(QLWenFy1 zSygJ!V&T2>v$E?4wS+>=vFs?c9Kh5J7u%jAHxgTSJJ}eREQS3!!`vDTVCKN3IaP|W zT(`*eQ&^r0hCxpzm+Kq9GY-T3--#0$K03wEju#Gv;0Rm&gK#kuUsmZkEq}f?1YxX3cnx^-R?qHU;Ez? z)e&}*&l!J)J1^{LieXtc;Pw-xKF(~rUzAm_Laf4&UKS*8Y_sR1*QJ8#9x%H(V`;hK zr7k}^&B0w#iouuyQYbr*iB2b%EzU(;8B{6lIk@Xk*VmPP+X)q|wF0R(gX+7wT?C5> z7FYfmvYN@D+8piazJbMyY2l)K*y_OzxR`GieJSU8XcO7q$mgDM)iSU8;rmS;>_t0# z`;wWk^H|X9yUW4f_HrRT{T`uTyqLUhIq!v4xGPyQlT=VU%-T#&1;lk|(l(=?C!Y4u$UKK3~dLs8USs zfrFv5Ou4F3Z)^){m!2E_l<#$5J`7>Lur3!eED@e2cqOBUAE16H8wnp0_GuKWXX&h|E$fr~d}Yb> zE?@NMxwV8Nqd(}L!O4@JVrz|$er>S4SmBVC8V^NnBN3sld3s1RR;JjMng85I=D5-+ z29jJ!pF&b(LN=dg+W*1SsDGQ}j-j}BmluFfE9w)OmK~c zDD&I^HvdZRWNVkM%?Y*=N}Y&3H7G(ht{YnSNEwc{Q`1E?#z759l#?#t>mwk`3FQ&A znW0D!El>_4DV6S!8^4Xb9{s`766mU$NBsSel!e$_)3s^OxYO9bFd&$yd5JOYS?Zhh z%|QNp&@+cv5!vpiS~Gfqr8i|QBQPa_deJHZ?tvOlZYxeQolw#I(9ir-X>gOW*t67_ zz2Mbn&{@_ zZe5#uKPlnw(^Ys)H>uWoO?4f%jP#|0yWJ3C$`4S|QUR~+c~ANL5kPT9*LygucdR!9 zf5HL3_i)&@-rqpoTTKoC$Oeki#-l3w#TsO)^apS#sSglPzZ_b~%VnQrJozStQ&i5l z=Aw0H2ZJwq_EGBF+~p(|^^@yIn3A**=;6$_rS8+Q#Bk*};2_3nqSNoNrZ?UPe#4 z4+_;4TUy*I(og_DqGr;U%R6Q@5q}oH=404VrQF1mg&5@{cQw*X4@}`CC{~|3D$2yn zM*FTBuiy%>k-zSV2~>v<2r+c|SvL^HqsK;Ww8Z9#H}dQ`-7n}N9ob(-tlaE#pZ>;j z(F42Hhhhwl3ebl4^VziUddE(FWJ%6d(T(NioBb0z%lpPoRl83-aDVD@AnX$AD)%+{ zr{vRxhF2DGJ1;O`NmD(sC1UJi<&HfG3Q3RCnY6|ex5~nM`Q@~=zXLUW;j%kD(4=_h19A%j!=wIR4o=xQc5`5l`G5I3Dloa;TXtFg}4P2F$t z^Pb9sn3bx9Km`{)7zE2;Q@<0wC-Igz=tc|vx)#`uVo|B+=o&Zd*+%j~Yk&TH+9~ z+redj;z%uwgN>{wSSfwSN~jA)tYZ!dZy5i84`VGS^0-zH${u_`ePX$8Ti+Pkk`;33 zOP>>W>w~t=)8TjbwxT=0;;p$~o}4G)&o_DNU8FPDaVvN2GeJ)_8PKw~oN|p^2o9+> zVup66x5dx8a;6T_?Fr(bPM$Axqp*R`BGZ+usUs8buJ-NJCMwQ`-TJD3WAK0a$%?f9 ziNY`N#hWAQFJJG8E~7c-wPvaxKy`Lm+;!;PBwjM{i}Ex43*A-jW92`>`oG^TSU`eOQwVvjGl$k7UwLPEXq^F9o*1tk3Nj|D`_#Af#y4M^(tv9^_I&F8?Yx6lPaDNNcsnVZWpwlr79p>zwI zU0dFVl}8z+xj+7Cf3&BriomooP#ht8vI!Y(tD7-*eUzJMWWG=msv6agqU z4o|5x^HaXdNP;~Q&I6Y4U$aLuz*~*0z^p7Qgoss`Q}{9 z{!NP(PK9fW3)1|dCSa+|VtJalYnn2V^h&t#w*gc{bNZdWOUh^AfWZLrwI^)PMaa;7 zKHdd{2NF}-1)`e%!jkMh$=8OXl>H%c#=*VEU+k`F`YL;2df7$A6(<``gPv3u7ryQd z`60EcQ?^|)7$3uSZeAA;4r0nCM?xqbyl&7dv|e9)hy$m?u8YP;Pk*wVES zR#zlsS#J2KaRH8qv}^1(E^{4u13Hzz^~AM){&lrfu?^XB?(d}-0X@&x3H!=l@Cou1 z{Rvt4!b4Nt!nk#Vg}Yi}vx8`s$D<}zQ|xKszWm5RzQHKXLIMfFnnGC+m~zs(F`O^d zPy%{3_#eupmq$WYTq}qrI`@_x`EW-HM`E3i0~N$5C@E(};WwHt8h?r#Mze7Ha~F2c8MmlXqE!nz?i*lo;hpoL8>(f}c$EJ=u!*{G zG~-|1fi~5Skc=kkf$u|4gB4o^M~vmImzY|OM98RZU@Q+*<1P^|7;nWDKOuLinApEv z9*NJOC?7?lT1YEMgVgnbd;=qC3XyZtxh(iDiW=0J4I{ z4+Bj9o^Bu8PYPToyt}*PPv(u(vFN}z!!qwGVl+z2pR?$=58P1IhKTF6cP7C$3B z&CJS|oY#_!b9)8hl-!(`KmJgjrC;E7S0VC)*)`T_i^p3RSjClRgCMP@>kOh!4;eph z3Ve$k5Wd)vw7{j0Y-=mYjUJuw@L#P{EeSzh^v1Bd&NO9ws=J~wV?uuvzSyf_ceJ%^OAjw7ZH+M$w5kRQDtq{{ znJHazg_r+OP2y3lnm#o=H4tZMd`^-L7{~i@%PH?h^-@0*c$*!@VHiNYaf?CVc&cOJ zm4^Hk>PfZI+FqBz;=&L_oReXgz@+O`RsyYDS9zf%Q>H^T7JV65PRCS`m!owGt8 zQeBWfDV=b;>6*##59mZQ%|&FKu@qo(PTKGfs! zG{(|kHjoX@yS%v6{EI__nG0VV*|-Gn>Y+$t#6IU$EvHFG<*~tpD*8vrN$j~a8r*Kg zBQ>*Xd?v*HT!C4hK+zuhqu*LW9!{=;hFx_-U3{}rhzUIa9yem8Gfu+!E!!6D@Id*O zdBg_Uz3w{W6`U>Fgd==S=B?DOVo?vg?B^j^Q;u)HQTLvUN&s(}H#qlslheJk@egPN zHW9_v)d%~r30H2INa?i*EY7V;2MPfjiLxArVzmE3>MT}VEG5eM_(5d@9@USj zG9NS#t!-W>rI0JAE~cL=wolJYjvpA&aUHgg)0T8cCkAG+BX6%t%V?su#Tkl`P7p?Y~Nf-V~J7R6F`VaJDElZ>@W;s3+uZ%JpbWaT83*cS{JHGY| zN;$@E^1X5C-Y+XJ;PlIFRI~WdzC$T5s8Qk;t~vSbOE++lB9way0fIL|U4Iwf@&99T zGL%IbO0iR;aC@T7neSv9{DTUCHiccww4I{(CY$jDPp+QqQ$I9OY Date: Fri, 2 Jun 2023 17:34:54 +0100 Subject: [PATCH 095/263] Make images more self-descriptive when you read them Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../testConfientialTextIsRedacted.png | Bin 5874 -> 5873 bytes ...erentColumnsAndRowsRendersInStatusArea.png | Bin 3812 -> 5206 bytes ...tInboundTrueRendersInboundInStatusArea.png | Bin 3826 -> 5340 bytes .../testOutboundRendersAidInStatusArea.png | Bin 4172 -> 6158 bytes .../test/resources/testTextFieldRendersOk.png | Bin 4546 -> 4943 bytes .../testTextFullRowFieldRendersOk.png | Bin 6755 -> 7320 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testConfientialTextIsRedacted.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testConfientialTextIsRedacted.png index 35c737a2434724aa0de791b76723b561838f85d4..4677c45ed9846dacc8939001544559d77a0e0b42 100644 GIT binary patch literal 5873 zcmeHLTR0nNyN!B&^LJXMhhJ5S>ECwR4oXl}g3gp0Q)RTJ4kb#RN~8`E5u_cR#@V#m zh-pcOQPUEKAVH8G99q$2QUr-4tuzfHNeP0ScFexod*AJSvoGfMd%oxS-gm9_u4lbp z!H<64hF_X}2><{LeZKd+003;U0|4}r{%N2)c^88BLahz=H83jnAr%eMe-&g*LV zFZGQ!_=b{Y3LNNd&*%*Q`)c58NQYE@SQPtDCr2Xds58QbV9QOE1aIFFulB@$wZWI zappnD<*xWHqj_G-J^YYSI+b(}a-Y^keF#TW?=h-Yapo64C4_rcen{-DhnIzgI3d{L zVt9p|?KT+L>%rsx4k$&iONH0D@XJf`$;3mj(VUMz}rHY7-zT*~N< zgTrJNC&Ems#@Z<8 zuVueVJI>+ovE}qL+qY|4mE&_%YEG+~2coRp*Cr~4Gv>gLE`6#d$ZuSz44Zg&zT2ZZ zM=OyYG~py0M$%KOBwTNlg3lw~&`ROl#BL0IsaO4TuQHzI6O&w38{HUAK~1PaDkKu4 z)%qkR>ecC{vY^fr~dO-PpO%VtMw|YjS1yf5XxQv+- z4=f4qadEaTx^+oqaKMc0s(T=YA#s0Nl5=~_{KdBV7-qp)ebbdb`7%-i%tMg_CQM&@ z)uz`UD`RN?gnxN>s8Dhya9vNvL`_k$kBr8L#Fspxa^=Js=W z^tMeTs(a!!5zWBM-Xb#NdSoT?iYSxa251 z1ZGOn;&k&A15SclO1NkgZAOMl1EL}KR|=gG z+>d?L5BStT@lNM+xy`7Vq;*+4X!mYIpY4%YPIJN8B@a$r{bHswWH& zl8pgT{3M@QDhqzelAR)H?yP5=41J@>4h8Dtoj>7`mDs8Q9x{K2`zjpwucFHPro|&< zh-)mfYoM_oW4#njn z;ya^yaq&r*lVCRi4Z?>sZZOvlJY8Lm_qNpRpPfjefLhhST=LTG{BcPiGuU4Fx7MqAM9e zDA83|q#ZvOIr7q$4BBlxWJ~8>y)%!qpIE5E^x7+$>P)lyt;!}fB*#m&)&Zz9vVB)hTsVz0itMXZ zPG<=9eAnJMRXbI1k~i7>6~Z}-Sw7en1A?n-oT`6>oFJsdx7S=PtDnqd7Yg~VoMc!? zW;hUDc4P+m#hw~DC2Gm0Cqd&CRIU!gk|53+{Nulu0S7AAin-dx%+q5lS$DZat zqW~L3r-*uM@ve#7k<5Pm7YAe4Lz>!j9wpOo!c6*zB?7I83*^*Yc0nn(=_tqQK%z5| zl5lxkxWQhlf9$t<;wPAkuH00s3o-t76PXB}zIJ%q;vt}a>jYRxEbsSy*Kv8Ny#M0- z)oyjFGlTzGdOUZ(SryOTqe%V;)0;SFAX%pBZ;k7vv!u1XN*HYF%KnEP8;ufK4`~?8 zIQ5eja^bm8)R!l7JAtytWV3}6n6s&s`g>uUB^q3Mu*Gke|LF*ql780TG2GrwKXZ* zYTb+Shk6j+l>zM&U8{t3@qWm-ktdzES{E8mh&qCnq6b#-ExI^bgcML)k{(qP7zTVuzAhX5@lqU1et?UFv?{iA$_q(m48|eWXIkV3;#rk zJC}Cr`V%8i3yu;0Xgu^3m7g=QyiVduf=I5cGK5k1n`YMFc80wNp<@Fxiq)=2h7BXZ z&_09$=cKu_ri!rQm?sjd17a8CTSrAgr!>fzTWyJ-wTlQHFLp2vqjU5K<62V@SN84; zgm#KsLrG9rO5Q!UHJHYaacfJy9ZBVMl_f>rFrRoM(&aYi5mHY(>izP%lNG1hdu+W5 zI(;!<)s<~pY&{VcYN168>G=lp>W>IdA5h4&i_ea0ylQvhVU9M%G0ozL(I#+w{@|Jr z3J%arCviJcqprJD|KM>W6ej%uP2UBB*1pKMjxbUuC>ppPq{Z}o>*v`=ION?Z}Q-zEI`_*P!nBn`{prwwiLF;h`j_KO%wd{!m zE+OlVWpeZ{j<#q?_5k3MkuJ;>9&+i!vG~vY*ZQQ8Zc%#*uSTEkx&w5^WXRfucG*uX z8`nB2tF$?yoiPI^{xy-XA7lDQf8_g5T*!GbxUOV__Y8`!Kvv$>A`mpEh+_jQ=K909 z!(mcwPv2t{b3vI#`Jz3As#>((4D{^P#WFo#m4p#5$Q+5QVM#}IwM(0C+!duHQo~lj z+5B#Qa_ZxIbFY>Ptj(5Bl9`d-0+Wk;OLv>1JJQ{p*&Zx)TL@PE6zWT`MeG-PW6Xqn ztO?OS&I70au4>k}p2Nv7fpf5w+UaM!-($Y`t zmGA27RMMPE5k2mOr5>d+AO#;9q6POgDc?>hW}j1AOT=J<`xuoiJM#f*tq-h884>U= zlR-C&HU`fO@p8I@G%Pio`9DA+eoH|B{m=Q!a>+`L^zJAzbEee5&8$W!GsOz~(>Ff& zWJsI1__uu?R0;}c=r=NXC3;x!#?6KLDl1VRXKeU6`(|sPwtN`ELN};x;H5rXS;yj- zi+1P7ApOq$&y&U-u)Y33|JRGZ_cV?MxlI_@C5o&J>_CZ2FP&nyNlyyHR@N7sH1yyj zE_ZOPr_xU+4jnLXWNyuU-A;c;)Wl86ex2=s5I>h&iOqXpK8{n&)Kqq?tjANd&pbALbEOe zy53Jb1apnjGWDS5n4?w(4wiP%w)RGCf`Vc#`zqpa|Mr*DHbE@c{6r~3w?yqo0nf;g zmldNIEzA*(Ks=d#Zo$<+%v`i2>IUV(q^`gjqenRq7pR*0dkISPS#8v93yWSoWN;1x zo^L@^4Xv2x6}|#|6`NY~h@ebwP!W{k8is(COP)ur_5Ee=het6uVi|q*vs<+PfwkAhrKD=n$Rd2nv=eM@5<6m7(Q&zCA$&LeOrIZQQAwQ_teEH6>CMMHXLSrp+T{ z9sj~EOqA$;bL-;9$KOVY9UIdR4QLJ+={;~@X?%rI)0RInHVl8wW$uOEspnfj~T8_ z+uSWKnivXu4ir8WAoJvMsA@2>kC8cFtRC2tIi|2X9o(Sx5jKyb398wJh_OLXW*|^I zI<*e?8td)7w{3SBPDs-M>qdQ6vIA6|A8l;v|H9}Yw5?HO$X-+XZ2$4Q?9yy;_JH*Z zOF#UX?Ve3I7Nmjkn-r8^G=-Uc{g+=Ok_70|jd|$`cgS}=R81~@#mW^8$$E01lq|in zC4t@-f}0p*5-4+>b&TU;tAN&~6$^52WR@&Lq1&xzEHYo-5BKvJJ1&tk+rS3Ilwt^L z@OhHVMd#LIAbRwE%;ai|l%3NZsNt#MI=6;V6IZ~E z#nOVapInL-LM1a=BLa4X`Uu;cK^N4_BU$o}AiTKg+Etlzf703Xf6}sP2|DNWRAVP% z^Y`ViZx@7kO$D&*saI-B6Px!$N1{xBF+XU~G7rX`BFf(hPbp6Mi*!heo*?8th zT(qyrM+;O(SJA%kZ@Bwz!B>sXZn)d-_cDCT*4oPr3A=WeonyEyLz?o4?Xjq@yNdqP z;qkVhAnvuO6gj33Kt}@;Y>g@t2cc)aK=i2^08OUC7s!@hAL)_wHFk4#CZNezXAIFi zIc)?wnzkPVYH(f$0*yTafqv@U1_GVG_X#L>-Vo)v$bbK)Ymw?_a>fC5g-tpdHV945 zm(xNPS=YY;ESVqjLKdgJB%U$MvdpM^K`~F!zZu34)nS7!tg&&iHyTI2!>$B~cEK~5k^cAJ7xzZXtGYT83MT9Q5h-mS;8rJf%$@kkH%2~aVv{qS8i$*A~8tq`u_QjLrwG^f!DLO?chf>6H z-6PB|31O+<(no21_|ngZ9wur2A@>tWdmTLCd{`=5F>#d?MO~k944pTp*-gRCMveOK zb#qaHMbIuKSq}s3I*|m0u17<=qCt39xFptADFK&z&Du>V$<9?Bck;Xa7e5=t;X-UQ zcsAK5nLnW;JxsHQU-}3YL7{r>yBEtC=0aew?zY@TP_DWbavwt)=?_CDMxG|ib8yRA zO9~K?K=~@S=VclR?I083FsxtlDEHD_WcIEsVA*n6Uh5QF-jh~Z+MX_xN2)9%No2?+ z=XLcOhWr6#Z#rb$f47Yo!AA+=A|_&1b@xzIR&+)CHbveCalaq~UdYhNVp$3?4GAQo z+|!lwlWmUczg60NA2%-dU;!1rotl4mEN_`Y{|)EkR2=BO<5>e>0LW2K$B_%E714*Vy2t6r z*O?q7MkDM*8<5znud&D=c&y)@oM>?vbWRN(x)U;=~NGB~qJd!<=l=-fGs&I%1HCm9>bbND79x=66pf zGbf&YJ_iS>)`@C+Tc!4IvFrr3OSh|q#io;{mnwv7E2_6+)UsOhPx7XR`xHt{)2#y7tg3e7}Xt{MkuFbbeSn@nqri zm)V+b#AlVT;Zx(uKRCc{X9Mw+lAK4oQg5KVs7R<(u{e;An5RL z5}DpliU&Ah%R}Q{0rl@FGcLWRNBlPiS{f5Gb`(EWw$6bcy1NTGG!IUklb@Z8Px?t;L5 zF%bD%>`Woc`KrQaVUy{M(1j4TGUyTW$<)e=9`E6E22uNw_Qxe|%Ohk=ZxMqmDeJe)6J&b{p7$daF+o%r=$IUHm1fOF93ZE?C(jy<4}|MBg>wo<>DP z&&2jb1IY)}`&rI#sn3aeh+aocmzm{AiMLj?$EoufCvEKhC{eP3&YeT!l!~eC;igBU z-!Y_R$jB)H!J3euVL; zA`Zjn-K)SA>Wa9(*X}O%pN%=d>TeG1*bMDZZo~AaID4NS{<|n+59GAZBl|jG>urN_ z>J?MWpE+|*s^TNlJ_`onjFaf?zIke(RQex+IWzUHX)G3ns~3E!Dogp>`MWn++k>Af z`$ZWhw6ROAp6+*8wokJ$fOx_!m-X8s^yuN}LH2cyEO+#G#RWM-|NVyhC;R(fzx%U0 zs=pBb3-Ld_jsO2hy2-`yF3R&$IZ=w&*f=1)bK$l~6vCy2j|A&z6m!J{7RlFdcX(&8 z0eZr{Zt+uRUdt;f)ZiHpn!ht4&rZPi(05F&QaPt`n%?QE4ychmO{xrg7%&%NcK#4{ z<(B-5EAQ3KQn~U` znr%bO>Sp6&bqT}I5U5nd3#?YWq49>&nX7X7mILY~0r7p3m|(l6C{(C>GR6$5f)&)-W=||(2AdJVF$Sj^5 zLP5_Zj%r~Pw~xg}Kz=HKLTv6FPnXk#RuRm!#X*$mdb3U^msxu^Y@cd~RA1nw53m8w zmuVF!Q~wI7lM_L&XBwTkI8h%veRP+(T(6vR*7?vIu008iiXh#}RBLs!aGxq#kntm)4G=4^ z$u>)B*_`HixRyL5exeUibAq&iHc%Rl=bJ@xO!z7ndU239Z{2yG9fz2-m{MWu(#Z4H zeckwDZ>VeCs_n)^@k224z#T*T7mjNLzgLPNXgZIPS!@=kI5J=wX4^UIs5dON>Lh%{ zn!?+!Y&-9KM18U?{HLvXH-zap&t{b|>MdY~(olz4C2MqwkgPnlzeQnnj^W6^uCHG$ zlk+;-TwUNa5Es$J3*d=dd?dTA<2-|SJ!%>Lr43@rK*C)I7dmuXL4rd(k61I?P$ z114YI2Rl~3tU0FFc$*VuD5mApmtF4lE$6aMkibZPC{?77-C^D4t= zp&voHw^WZYbT!nAK%0or%{j_u6=jY0MQS!&Z`8$>8#oxEey=J3-n$<_gha#0lAM#^`-*;!-?lu}0sEdrwP`!%8z60_3v*&7@VM~Q0hhwfxT^N*f zC7YVtz2+tttU|i+fooU+QTFbM-ftPxogE7_$;}1jMiT*K*A%O~UuUg8qztzWbkI~= z!8A>$M=6>LE-HnTDjItgurU3$=r`K61x)H>^aLZ#-gxM^Zp|ZV+P=?)fU{Mt0P9eu zlQn(H*X`))mU4O;E^;|@T%ZW?H5ZfRqs_Jr->tSKyaqqP*FTD$%jq`E@(1dW$^pAg zS?(uTVpm62;oLv_?=FmEdm)ureZPFSAnqERF|$6{9xCUk?YJeDJJmgp~Ycqb%U>MccNm|_woTseEe zw5zWkAMX~m-9Nx;sepfTmil2(`}3#=MzY6?J$taWlb{F+v=tL+g<(XZFI5G9(4*o) zxOzSxs9xyns1zj|;E50`F%A7oTX2dzp$^*{qT_1Q_>$y!I&8@&TigpJU;pXOTz|*0 z;u`^}iJXu2n3+1>o|rx1<SM~$qSuh#T zziZ`ax7g4>k!H_Bn|^6#oJ$-myiPKZW05RxWq}DWjp&Kwy@reJEjKPd;{YE5d)4*> z8E#kVA+j_~LD< z>2=bMntlLbauBuzX5QvDE3VChYh|u!x*Lv-&4UnGeCX#J7<(?NpI4uJ+H-G zX98RLt;$At*&vIlrNP~G$oQomlnv8q{dVPfdwq?uz}w8#W^?Dhp!_4`Aa013O%bcb z*+oRBqWd*OyF!NxOzFrGwCgu&f`_gGld2cAn1*miPDikDZyCeSscY}P7%IHqaB;8K zsJ9c>(;!lZ%pG3SqHXdR#C1i-zP4pQolv}CBnv4cAD%Ml8d7pg6xW~so9n4z01sKs zY}O`@soEy~1(H3VK@h{|mtJ!Q%GCd1pgtY|@RofgKul&othx3GixH2Yg~ zh}pAc0h07rzc$u6?ik8EzAc!kS}zF@uHc_%S1aFIYl`=OY*1XzZ41$N4n;TW!_^$V zF9nbIIOUox3==10!!We_4b}2P?t$zA` z#a7K#7lqw4D0aS8LByeEdPwzg5n{7tr#a^bKa(!Bt(?oy+b-=9u_%;4wZRff`?)z1 zrs6#0t-ty`Q)qR~&z>iV7g$lVm&#C;_e@9}PewB22-QF9jE!;eQwqSE z%8_s*!S;hC$@QQCGz7>Ztwd$T+(q(jqNGp(5PZT#6Fa!#vNO+}M$k zRmfQV=v#I5^J44r>0V6D4?TmQQ-UaK`s0mAZEM|hV`Xqeh_6dlA9p@wwA^vQE}!_S z!0ht2QDEw7>{@-9+F&TS@R`ulZ~;> zG*hHN6H_rYyrVWoW+YxfNbnY37(sAQkp$7h%sJ=l`FOsZcYoN=e%7-;to3`=TKm6O z?nSVV-Y(-^002Pm>={pg06>eWIZu79quFg)4~_!>`+#RXPY0&LB>c1wjzO7kWrST{ zTl{(`@8}`xYp?vN2_OHw{XChJy*JF)irf(FWyLc#*-Z)IpV{w$a2Roab#APrB)Biw z>-1L+-&>O**D@h*zVh0eeE3Q_rK0TQTE$GqB2EfVOUs?<-uwX>0gsm2*}<7*c8WD` z&n+_mAf#oV#ub~d0D!)8S^&VG8W#cG|1$lbk|>}1Q*f59U3%>D)l$KIe1;D)Nj3s@ z<8`%1nnwh-P8g1Vi)bT<&%k)rH@y5`o`3~sJax_-Z1$2~&gd#$xwhT?xedJiP{0%T z(77cR<;bhD4#E2)z2}m}Z*Jk^!$BDP6&v)*d|o}KOCG|eB-+Fq^?h&o@nqwkncNSL zhB`c&;N~-8j%AlIRYz_${%BpqJ5C75s7w8D@i};Qj$S~=h4BcqrM z5@#*)LeG6{<)z8M4C3d&tgB=r(1RSg?-vZ^^y!Ka4Kq^G0QL3#@)Mm1*EYPUHXFUQRV{cqDD*;=&GD#+ zE~GGy6u-AGI9JKWotFI?qE5f3Q&qape1GDx%J6Q4|Mt3Iihi5K1@euw%#@BQLB z&iqm$sL0CA{@BVv>Kss)S+n2W+ReG1^jhfPF@dc`Zbh-(-;I9o?}ZmOUKPIgy!kZx z!V?fxJ9}LRjN;7Iy@q=NAEPQHt&EZLinZclf@S5&V~D+^2yW^4D-Cc)9BNRe0kG9X+)>i`p$x&LwYp-MhSb+hQn;TjfS;X^gc`#( zPa9H^rn_sjAGpNPcn5W>rtUIw;@5Y{Ozyi{HIVcpTE3upha<|??vopv6LOVC1@sMC9 zFS@br*Rm)y*c^pKXp0mV@NM57;m7?3GlDs!N`By8aRGk0u6r4Az*(q?gd3c7k~B90 zAjXYSQT##v?X9D9%rDiIh+4+M|E@<(z|KkA;vckMf;=<7;1)N+)bsln0|@h1R)y6RbIUZp@ju%9+l1pvJJ*NgZ6@9mF^=-OAb zJl~updm~6dd`LW+Zs>|x<$R(S-_=FGM+X*Jqb2igMy|fEs~Sm+$_(IPnp10hhe^cJ~BMZe}*Sqi38q_n`l7<9>Gw+&8Ezac$+;P+7KM9Xt`Nx|$qg9x*S5=qhJ&vB1RKPP1?> zdaB^#3w4n^aZS!Mj|J6iNa~&B96=Y|ATQA|iiUQ8Pss7|*4vULOFETaM4X1_T^GI+ zAnA{am#v$W#;}hQ2_&#(!olv^fN2&ig6p2}Xs9QG!=Mg(2_seGSs@n(dJovOqup&R zwp~R5tOh7?Ag)GJY;$kmmmFILtgeB#6FhlFl!DS5{;q_-T6>dJiJAISnGqK-jesIc z!h7L|B|oPtuP1N4+4r`|l5YbCBHs9#JZ8aW zytL`j{JW~CP^5%aU__Dx@5~Y1a+e4_fs7aJyMoZDCaYkB;Mi9Y1=ysO@_IhMNC!OB z{HhQJT^dvk_6tjWriKS{hMQ+zN-jVMKT@|$>^8$dMHbt&&gP;E#LyR)BO0^hfiGUG zm1Ms>OW*Pqi5O4;kKI@39@^FAo>Etq)4>WKsGR=RE~97 z6DKCq=vjNj7UlfmT6$4l9?5jTISH3y!M$1J@&(Os3D^iDWY&I+w=lxnpi+(Zq{}P# zJGNZL_>9CS%ynrTx!x*}6c1C}2KH>G@SCh@=<32xa}c;?Clp4zlF7v_ie?Z70;b1G zcLz41ghp&N*Nc6!VDsL<#`>-c;BE=(WNaSx@Y7bdeno7g!5y9rb*2|GY-wGdu^lK& z|I}F8)nn{Dt{e6pbwyP-*ec1a`5>90`XwtE(MjsZOnQVLCqQ)~Ed(uTae}=I=FFHF z^2~v#l$j#lA(U+0cmB0U8Tj`|()3A*Y7yYnW7iY!@=j5E zTw$nvMMb=r0w5RO&qXHeFv4u0S#4&Sm_~d%wvd<28iyB=<(nxo!Mk1zRpMJ|Otpj7 zP_*J)0%Euri4TLaP1`s`Tl)z!y(sE{V1ad7rzNxL^s?R8N9+A>s#Ay0E4U`kL2%SO zcb`oxXT}20->Jyp+>o0e&!Sb)dR%IhiU;HtD6q|xGnFaaSmD)lMeycAZMa1--jv(c z;kpe9_omf=QUrk}`=w62qPJV}73)G3Wa}pVHqr4VcTW^{tou-`SIx>?x++GOX)qwF z$yEGE1Re@^gZe#+Nn-sY;#H4vN%TEe193RyWL$H2df4z?Y!hDzgk<1WH|?5i`%9v9 zz*EQmNB@P)jJIIIQTlr++&)sMcgA*a%QO&RQ?#nV>$YVjAsslOHy+=qV*Zt) znBIJTTM5X3Viqv52~k}KO%`M>g{dB*yF*&H%i$r{Y#!_Apni#cO6oF*ihYX3_OyTg z{c8C%j+Y%^{zscRf&cCCSlu(F!{Y%?w1kbNjf70@?Au{Ua*SiONox0|w-P+m`gT~< zUHBw})3?bSgo8k$MKkwAjp_{WdyNIIDFtN^*V+#31|`q<>Go3Ydd|6Ox^hHbiz)-uU06 znmR$RB);5pb|>|GUywF7e=C!Rt46OkZc{+ydW`90+U3Au&Nc*oK0qO^cXF{6HRTh= zPnfzFBhm=unNap)4W!*xFNEGP zvt1`*%ONHKz0Z(K*W;0Y>+zWjm;d#y-LK)bf~*FmZYT{sT_tp@<-Mtr=Kf_nDsmyqWZ-QE?flW9IO`WIP2CB~kb1D<41`Zr^{SH`ExJGN=D?sOA zZ`Qr8u)iw0L0xI|%nW+If_HRAeL3JApG2vYcK&fT(2qQ)9Pr8XN2x|vBRu0PMAuTL z*n5le#QDS5)ix@@Kg_>pF zc8Q|7u`!hnp*}ox^~ST%+Mc!d0+S}J1~`<1aHnVzxP492Ra?oG<)7xs+J(|4JHz=- zsC5BvLi8+nAVqKyjbn$FZ>x`qvQREAqCWHmHZtw^m(pk@gDmj?m(SD04ka4m+P4aW zgrV`5_=Vz56{RhU>qcFcmJZD-o0_&jP1tBRuG>^<(<8aU|K3uJS3&YteT{KcR|yDni=UO)B{d}(bdhXKC z5Qp9hekV96DCn)jA0PNUC}^2#X*a&Ua%ui;=sF}QXbtD^fe(%sVeEQJ%kFg4s^_h* zy;f$tyf=RP*jLJB)&>YrqKyAy>z}~Sl*|pc{o%nM4EzrRndxL(@>y_*#}=-W3>=)ui_#X5jgPXmmZI+`V(dJC<@}Vyf-ZKE%yo95^uD)b8Y_~0 zKWx`%w)GOQUC%CcUQd=%Q63&XGrMX0MhS`W#3+1ZV%H^>#5rh=i%AXM4n=k0u;Y7m zUTkvx&HGYJGz!IP+QQtW4V>Aw(tp3`@@@TsZyK%Z%)OKfTHc!lwV7Kg!NRV(h)Ltf0P;{i&<~J@Bic5MWeXsk@`FGpH1g|mN}n{% zs_|1YKZd+e?xX425_#rJCqcbQ(ev}Z=5qihYs5p&;lP-cx85%Hu?ibjuK8Z=I2Wo&hcRvAX(f~Q{}q#pZV506 z7DSX^!Bk!>NK93V&;=bG)zzqVc9wvj59f~-^6GBITi)9xEY+fjR)F7c<(+M;GiN53 z*lHY7Zl$;{&HrTiLId6O1UTZEf<|92`lMCJ)XIqHcdEU)y3UNmcI<55bGVqCCe$zX zLF+%n8kGmSvf_}nd~A%4Mn`x|Mr}cdFePy?Aj4ZG8YiK+l%7nFh)agNEzkW{0#s_V83rRRJz}g#@zuuaUor3y0psxkdl4%LWhac< ztdmrcLr>!_Iv?&Z)5-RJOqSxoOa?yjN4a3m)pQ=KQ8)M}8t2trixY;YW?RV*f6E&Pg!|j+Jid!a(dQ47$JOPe@ zR%`~xU`o5SZP9CbN;-(Mj~%zIg~HJ6YnSO$ZDD4HR>(NyI))E349)Ead~#?o1cAvs z4H-<;%PehnYcvZ7Kc#n(CxFEl(~dY+2T=O;PF>*I845KHhOC_xLuOi7xE{*Ko-O$9 zG3qBCOTTB#*+5UV?vMrqMzjF(K368zBEp)AbW|BsmF3F-tBOc}J{b4`8oXD?bH}YL zW1h!7IkAds&LjPoyD|wHjDn+`@^qIKgMVoyi(}3$II{Ayt|HIk-e-Q06nW2H-Pc`= zg7Y(73|@GTi5OpCSmSbDRMfoe?%OBxLrKfgg&a^^$I?dBC$|Y&#U;HpoCCxPj)E6#n`KENl-^shFFe z){Br1deNwK(rTiV7BiPkToH$y#XTt%&#>zb35iwP%UAE3?$eg;2~LWX1@MjV5_eqW zjn4f(J~a9tF$9a|OO2Wh;M8bMfL-T`n@IR+u}gP5-m@6mKl|H-V<4n~++K|zAgxdS z$vX&jzgz#eu`loHq-<82$;Lp1@ClCiumnQM;=c03mf=T3WMPIPD1tQe09qf7)hKtV zcQPIFt+Wgf^1KsL2Ud;r=GKfO36}U4D?!Z%n05x;xnLFLoi9jStmQr)I)v*ts zSeL5J($G;XjjN5$D4ZfTEBR@jZm4puvn!+b>3-MdiG{HdKdbJ{7s+2hAo8snR){X? z&t$DTYe+Ib1qLTzRQu!5?65n?QCfY7Jg0su$M+fBa+g_N>;-bX?B~O3CtWdgJoAA~ z(NSiuXlixkzljMk)2d3HtDr2)G$h*Za@y@Z^3CL*XA>qe#7I2up9#;@66c>+YzmB3 zy%h9cG&H2z<$rP;c9dVP1TbLL#wg0m@ha%_1rAV&Kh@*2A545pz5?sIpA#5yqFk~Z zuu#vbX0tew(tI9V?~vb_d0N;OJ|QY|u16L@-a8o4IKWJ}_lnnUZGatq%4i}sSLx3I zwMJeg_}{JM(NTiy9@KpX2)kmbTs4;_MS`kvN2axS;Tul*zH;1J?aNwTl|6vdb#53| z%La=-fYGEqG&+t}@#tjTOugnKn1+NFU^Uq!NsE4UTiELN z)f;==fvKp~v%!%G61o%(TZo92XE}@Yo%0d*PS17%-<;92>qui2SG>PL5jlqUxHju@ z{=b&+n5}J8JUT`ju=+I{AHW^qW$~r{*TD;dvXop&$n_W85%^CLvvW8CIJdWZAgwK_Vd#z9^P3n_O^<&p8O;w zf=??30cOO2}0wx;W(%CCx<~GVw;Dd!EBg&3; zrDw%B{h92g+$9maEfcm_yn%MGusQjcL~JcNklX*^RNB;oe*M)z{EOB4BFW1(XgJG) zI`ZaxN(*rnl?u8l!e1bOBUPPeEplabubYH0TvZg3g|jfEvBmpn`hFZMWSk0A(DJr6 z3z@GOHVn7gPk*5Hu1|k+6OjzUAK)h!JhGsMx0L6dXwxL=Iv+Hi440jT1Rc^dbV^R! zyb=Gi;_oxf&|vOlHVHF^*gO51)}D9Xf)M0@Yh;|tv5K!FRT=BX8ugD#cdt~9$mWeX z49j*V9p0Ta-^yl{=-_Ue-36bM6mB=aLfS*Hux_b*O`iWsyqpb6Y!DD zjNv3+Ws`8;gT?!J2V39VR&!DoeM!W2^F?70}2= zp=jEz<4x|V;n>Ebj$1}V{@?AtRWCFwwoH^erx?3eq#IffK)5UmH?mD^KkrrU^*Hw~ zy;YD z)58lSwM`oZvt-*o`0xz}BRJ@}FY!)gz%*VXgwJAur6Otto4%2ocUXN#4+RH(b>ja} cPhdH}VrR<(bbP{6dks2#5OIL};mOPY0l^$j00000 diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testInboundTrueRendersInboundInStatusArea.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testInboundTrueRendersInboundInStatusArea.png index 81794e895010e673b14f12fdd43e4d013e5a9b7f..b14b8e56818f2999b5ada3d85a76f92489e1db03 100644 GIT binary patch literal 5340 zcmeI0do+4J$woT+Ta2LnZ$24Gp@Y(;aVmLw7vY;;X@%Q;Yv{|cW-Fu zrawDay)1RH;#OU+;ko_RT@ODp+aWo>Z}ZOw;9I^w`svMoZasG9?qloz{keP0Zo7UH zbY}Y=haT1z_m}48&!DE}n>Wm*p8i4Rt*fa{R}YH^5(W?~pMn;4H5^wxCpukOjX}iK ztlERxWA|+Yfd(r;pocBnL7}`vyv>4I!x~0+3ra1CV#am;G}V=do$& zt6r5YyS-7HTqb1bl?|@0SzfLz@#@HrcsIWC0kcIRc`OGHp4GR0OAr^?dWJhWD3Y#{ zF6eI8DE<)Zfnj`vx&&~Anz`IdPEbOW;jMHPQ;ck>Z7TDp%oiuCMazcwDvV@7u=GL; zB;eFB{-cgRfs%rC8kLRs32eUke5lP&%!XdPig85hPIq`b& zM1~Sx5-7c3pM-!8^@!-|xI)33i!{guWeViO{gl&n`Z>|o;f$A$-S1O%oduJ{wo)PISd+@Rrvjh@s&*A{;eO>`e| zG244mx+z~fnI!6uNHt`H+o*06`qG1RW7wisi=5Or;m6qc$#3Z>{z0QWrH?}LI&WRT zQa}4k@+i*d-jHyRhaZgUJEx}{usBan^NFmpLx2++Zapt@+NhB4H@&}{e#R#AEdlGj zG`A1VPpP!0D*6QPzIQ0hO~qnazgt9&(=DPD?pe7=e^)4+-5i-j_-U-h4kXuNaseL^+WDVVmuuU!+D}?)_%=N)+BnX)4a=lKxA08!o z3{G!rY-;=T+O1~c7)|OhB>Wd3)c4^>PiMQ6YCA)Vn&f4qDY3gcsqvyi-Q@~pDi9)I zFC(3Vq2{M1UyX>o&K5JA$bILCGfjlnA+ofpu2CIGu5<=3racjfY_>~ z7FRm@fFZ^ZypmV;t_!l4>Zr*1M=EW(Rl*c|4CR(4;HDL;4${`CssV8=nyZ(o0>vIJ z2=3E#A4{}jW%bty(stkO+ysJOVYD5FMv22g<>9`;3AGKf5S#>Xeur+3324K> z+}S@1@#AXDfVfqU@rHqxztL1tS<-=<}0AO2d^)4TR8IH z@QGgt-LE`s(32pulTcQWD;ONdy_sr7u)-t6XPn^0`HV6xaj^SY;Pfw6O&6}X5LvOh zH5FYv3`ohT$qxNHS#+QgwM15nV95_6lqJ5=9nJFnYYzz~`2Q#eO4O&ldzKA`X&EW+0+E=V4O&=Kan`df0y->Vi)?&uO zeMIl^LIL_*%=m|Xi9nYyBUdU`Z^$YnwutGm*Q*`P+&fTeEmI4G@VD(H<0!)^^sP!5 zZ&3_{;Yw}qtvrF*=3DP68EmVu@c75)e?*dCy*CXcKuDjsd#W+t`b_7*ZKbkwzrLy9 zw7BG||IKYe!kzvLM5YD!R7RDgUxn&U)odi4w}JEZ@lV~6yo-P-Gs*_u#-W#q&On=X z3U9D08_UXXLYJMpQ?Vx3-}}T+$YhtETypvsA37!{gJziBBasF8yvZ~)b7>~r-QCkA z{n?A^@j?cWEcywgErGR0tarc^$OAy5p=>eYi%V5&w`!>zBZkT_zPz!FLXww=Q0Pdi z%P_`%EPI?Qs*qiyBAyO5k;(ZQXo6GBlZFK+L(?d3C72) zG_V({L>eKIdRk$hvl4XM(9PEowIMUSVZjROiL_~4>DxLDjV>(iY*+gMe(JTS7Se?l zbhAsq*ON{!LeZXTgzYdBZ&MP~wXIqi`I(j0GuU*C)*GlWKDx8+;gcGll?vu}N7c$3++ zAi|R8B~aBAbZ2E{-h0u?SvVV*V>*YUMZ{k82Mb)^zwVYk_HP^?8T$la+i9C0A~@P? z^zyA_^JkMgdS{yaMzc+x-&u{fArCHiK~&QCj4^!7s^kAmh2|(6-XTj8r5@pY7BRbQ zOQ`k0_)AGbS0L2}UVjE(MS1l(_^9FQrxt`XD*_?D@wD%#s)Nzk zO8Z4o2DL$qkp!=xB@3bG5!Fol`E+9voQ3n)!>dH^C4Rv=O@9r`WNPWjnS?=YO4k6T zwlUK0a=xR#rsoSYr}cqsw3w||ywnvsKGvN?3e|`uRevj=**`U;P^WYA(=rO zhrK;ypmX***)1znfSF3-C>8iolb~}ckjot!O4!=|#nLa0Sr91IBzr~V47roLkivIo zca!_R^eFsDsDwd=G-_vGi3bD(88z9MwB14|(6)2t(>F z!*Lrj>H5_l&3ks`Yi&4RnL%A0@)XC=){i?MDtgc(m6h~~*dvCn)CWNbO36SrY&#-8 z+&9{>r_7iJbg44URDbl)zX;p8C7%dJw^@otrA)b4iO){16Rr-inabKUu)ER%_fyBzmJN=hU|1S@vu zT2t04)QPY%B_$w#k{B{)mv_aTR0wa1h>eutD-t1){Ccl<_nvd_-}k?JPX9jVdH(sF z&-3}7@9BM+X`w43R{#JIy7z-U*#NL?8vq0yes1~F$-NvF69B^c_wIT3U`3&If_9bS z#ejBH^JjOnTU+x|Lt8iXw0YBzv&x1S-nuE8XsC&AZ+Q9Qo^QXsvMKVw`Hh>-e(=Tu zYIo0SN8BH_jF+J=a7tb;IpiDsh-e<8R_l_~V`_%jfwA8{m)ku;m&je?M3F;J6fr8n zwWewS5H~&t0EScm_-*SlU>9{Y0Lab&z@36;fD`jC13>wjAmE3Ar&peGc`C!xPx7=3 z|0g;8Lg>6>8BXv7Pk*k_A6|fe?SK%ORT7fH9{(+WZj(?Gn9_c3B;W0;7Fa|H9;6jM zzH=BM!8g^J;p`AKRmM%rA|=`zYR%C%z=iSJz^+Ay<(5YEzSz7uenyeQkK+^vpmO&@ z|9Z#7*TWvZ3r8t%LH+PYgA@;Jv9&37(&iSf%NxmNqXQ-+Zpfs^sQHCbPhCskZamK+PJvjB)LYPP=yxjT2m&Yz+2*$>$u>5beNLFf%i3{t9egt-%l1Mzk3>vlHw@A% zhmsf`E+IGW#Awbwk)E1q9LQ8yl|Je0N16|nk1yu37>ut<3-0pZlWPIVaG=9N);abP z7Jm>qMf?=&L%Yc2df7apm~I9iUo3!~_iMo&6~8XC_Q~rag$v*0;A2i$o!CCzS3^ zS0`6yhsIaOa)#U>d&YpvTy%AEqoSBh$l`9}^8!qdrxyaUSr0yJOJI8o?HKBtteN!! zG+sZDt~ma-TAhK~=BmdJ7JCGiT(IkgDd?eI8GApPxmDf3EUUbWUH-@x>6PF#IK3#d zh)HV}|3H?NeHleZF z#?UTI9v2Ukp?Sp?KB89QqDP6H_lw$i!zPWvh@q4^#8rK>?O35?ySMNY9 zLz8IHJ(-(fJ7PvP4VHPjI=R=PJi37FGo-MGCmnXDE8;kkfv}h&{yYAASe+>O3Q;zH zZIpnHQtgEt;NuNh_3kkZid{?}h0-YR?E`-?rl<70g;mQFpOB2<&WUwp?r8hb@lvO6%+Z% znMg|D>^MNFnJsV9)zFRzlAgc9Cnh?*k1lsk{FUav{)Bj$3?Wlp;H?~#`o~1wX-!c7 zpg!(^oJtaLdW}Ssysd6 zx}|~XOa6+bTopr(N96VhmN8o8i5j;Y!^ONr0b4S|N^rW^6wj&OjUXK{=P~`l&5H>l zO-;B{` z*V9jW@fc3Tsomboori_PYUcwcbXP4HDL`1N4KcZloxx^o%q*uo^vfDPd|S9&=lQFc z56?Q^BCPZAulIqq#V-hHZVvhA2#}5N5;>dYP`VAn2|p=g?GIKGz}QESDek$^O5Nkh zYQ}tO@XscwkcDj5E&dZj?jU%?MsfG)?a!yT>+R~nq5v7HCMDA0>h6Ct=+;@XncROz=W=lub zD{E6qBs+FHFXS{|_ANbwEgD7L`k2k=?+0m~FOQjqWpyYBk9@Mj^S6nTnLPf40I#B`Y@-w zDs-Z?O$hBe>RVYTJry4Oa}(G#2i1AQk|-+Qq!!xX{9aJ#c#*KKh?q!MNi0cw+l!%` zzl83QmM!ac%e2xyeY0sWW}9<}Y{T}Mbv|iV0H+$mA@bjmEKM=}ueF55yq3OSR=icombYZ?>}rck|9Sv<TDB+j=bYr n;2!)1_~_2y|6#}JaVcKwrVXvx*M?o%Wr4k^nR~?V6`lGA=(Nh8 diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testOutboundRendersAidInStatusArea.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testOutboundRendersAidInStatusArea.png index 3ee19f9e2c0512d87f29810dfde71f858a0cd183..bdcb520d54fa9c330bb7ce9a4d04d4191d6a497e 100644 GIT binary patch literal 6158 zcmeHLeO!|F-lp|Tcbc7AR+J`g$DQoOG*4!}kgS!ut(BRT`G%!4HAO;ELPR=io0)-Y zz4(%1la-bEuArb$Q=y4Ls7Q*y6!lJ#n;`)r0uS3c&-4HDInST__xHI!zu)(JeXq}T zU)Q(z#PRU8Yh2bqAdt16e|F>~1oF;a2xL{}dk*%Kq0?6jArPqe^CO2&T}G-W@CzYv z3GTmLeR@*=w|n_UE_6K2173Q5)IUb8*de@!4Yf_r*fFu9Ar zHD&30@=9wKXvG+_Ty=NphSGXW0?#1$b;N|fn{g}n*2d;Zh?3+HSk3-ph!#R9lq6c!hsECY z^>NrMIv>I@*Mk*NA?9u{f+gv|tP+|;2KkTXJ75t@!qASSbqSg@)>guKR}~WXS)94> zW0%szH09${e$NtH%W-3^+s1YQ&^(_E+VPrU%ORHbx;I6P^SVpU4nb*6w^%?PVqDhx zq8G^H$Sf#18;C zb2oIK#vg40v((hq7o~J4Okw%N73fpsDVUX<)TWS#Y6*cd{&f^D53Pt83ofG!WS^=D zR|Mx$)pusR3<6NGC}rV^^jRes9pGQUdCw_2Wy3`xipVyqE{$~-W-Ne6pni7}Rg!*w&G zZbPH&n#B)fvN}zuqc5U@nHfXLyrXkvq8F$lBHERVETG`E|Fy?uno$wLX(cnOIj($C zq$@8lh&7W>J4E`5AHf&2u8W(2|J~u7mT>Jgm<%;V5|M8UDp0xWQ^z<53BZw+?K`X? zZ3KbiR3bscZdtUB;?4S_f5MIZl~mP;Ks zdJur2%zCfMMkaY4#l>Wg7PlW8?d@E(=fHhHjS5 zv+K#ZylUObh|=JF)ahK(-lY*RgBh{F&hfQ*N-uA4CZ{=_n}xePM}Q&C1de}@fDt>m zF0RSknC$-PgvFZadiA>*jT2>FR}1hn>#ueWTGiFgzMq-QU_+fyEB%gC_#NK&y<*Qp z2(bn08X;k0D{<{TCRS6rGN6gy1)L&+ZbfacFTPJ1#a~pEE>s_FYiRw3wme~$Kh`ar zvJa-ZrmZ1E$DF^l=H#=T5f_#3R3U8f#;wCx_}P95Pw;;a}XK>7gtEO zLdQy=d@dbv!QQ?+(qnNas(X9!+?)HfFH_au8;;buX_o zfU5p8ahKW!G$JBJ6JKf9KRXUY%?Lj4iB~vXARHU*z*j8ac%Bc>Em-;+?T3w*23YOB zwYDoDQQEn?!aX=l33E$~_tT7pId*2fn(|HYbK-k>cP|k>bwzwi$aR$#<1sC~-KA+8 zVMAen3%_byF8bEBXsdDBl<+LmVh!S%iS&gj?=$P_JO z{BnFx)~nhmvdIU{uzY}a`X&pdeCI~47st7Df8u`AqPV+99eS13eJPP%4xK8x+0vju z(;`ET7GXbz89D7_;^j~yK^>NiBb22CUcu)ZF>3ni^4}Knq@L*?g$N_qKkre~aSCnw z9*XoHQ<2Fa-X@C8>(^o@`nhfwN9H7ZW~-kFOR9X@0w}`t=>S@Dc7O6?zCY+jLE5cw?kDn9$7cYs_vXLzK zL(Z;s@)v@spn>e^P&GHBxIWunEUp#fh;Jg}>rMqF(gnp^e(Jl$ZOE~v$xn{FJcFmx zaWUa~)7@riB>V2qB?UbwikA@ z(3SYYIF)Gt^x2-s(pK+L>AQ1`MXvmWGKE^+V4k-B2ktS;u(s^vv66BLN8qD^N_PN3 zh|{DTJnR+M>U}UR+4KOtV0~n61C7zTQJ(g;&f9JQVY~2Q#>!vzK}{S`zSmSm*6cZW zVcDv{awL}e{%+Dx58bQ-asF&V3~pMLU#*baU15|y^1;f9UO%lwCVfx=Fp$E-tOI$a zpuES-^7kIn8%IY~fw|`sJGy>cx(%98eoRrt5zn4nUI9`fT7R&aEZ7yqE_ymEYha}- zgWFQ@)-4j74Qp)#xmLa(z6Qq6};RJ0h{f~ah)9VLFX1q#zb%1|OrTx#oT$2u7L%^kg$mV$*w_mK1TNMJK*u8SKXX*<6fGXj z3CSBMQ>`WNd|lqylS1P`>UhB~#WO}q@|QIXm|;Gr-fA4cpRR3G!YR=X7-WB!+tq&- zgxL876d;x%t~T~)3smhY%JPxg&WnOH~6S1g$YeYpqAZC zh;cQq2gL5}+AqB3r-C>0`%Sv`^nA@q_lw*$IMi_8vS5eHC?cIUc_VB)>=1|N=i@!P zE}eEWk<*mW1n5}qaRn5I*%B7+A}zUGr+6bLY4JVO9fwzld9G`T@h>#5!vblmOR@{! z__?h$$(KD!IT0Djq@>^$O4_t??hE)2wzugOc!+apJ}vS(Z@NWxwy>#Cz_Rw}k5nMC zW4&E|S+Xi07BpEo40EmjJUnPVuyh7CmPM#zMN{$Cd`KH35iRBBTM5RPJvLYpaa(VA zyY^lM4wd|2OLtD94+pm`dAVEPe7YuFPdX*2|4qZPiMXn7@DM`;s|H2O6n(_Q!p|4u z6~o;7yO9U`LmDMUAEs?AjM%55y;)KgSd<{^z+KLb;N{#Nc}>akcmBv91-y?PVzq(P z6aBv$Q4eR5PPmvi3=;q#v@xnPjE8FHm*_W zkI)PrB|^jqF-D5MW*Bu|o3QfN6ghGNf3StjdX<>qWjrb?Vp#OyFb=d6xXtM%)c8|B zUKzX{+6#?{on7^%-x1CPSElwn&R-D!i(PovrgYl*dq$5;G0DsBZ5{J8k}#lSW%9y^ zqV@d5ZXukM0cq<<^mW4xMPw-N^w*E0gvEM{le?H0?J6y0fitB6628WbR~~{sm?;J# zE$(-6_6T%k4RAtoSB%q&HQMOT)MP5Ru^*HF8ZhtyPAZ!0$6Kf8f<;@|wPepNsvz?5 z;Q5_F=A~__Vx2w`1^*V03N9pL<%TZ!ftpAO zr3C>D`taI>`0kw5n{Wj!)Hhd<-Dkb&dS4XDLRfpw=@d0MMRdQ<0IV9+JzP;r-`rOo zzw~c<^<}r9MHMeql_)XE@0vYSJVBQ~1O#4BUAaArgF1%8-Z*oISG1qN2Su|2nZ#|h zDs7*KgJVlmi(p;w*+NYK_bpy^zCOe_Z#xwzncBpqMZ?%F6JGOgB+wd~6Q;1=AfK?* z?JT7b8ikJST93IcU-j4Do}tsO-k^{KAxtu}5)tlsnLni)$MbDJ+>-A+zLv~-Q7Ub?W;1{#f+Z*H&`{Ve?N&5+}HVR>g(%5Oqu1r zf6(LbFJs`_$z1=tvN$2D9h3TYmCQ`Xc)H?BFuvSn+9Y1+?>(Jzn1PJA?O~<9;#SYs zOV8r4N!o8dcA*!wi}v=d^yoGFvFq+FzUhV`_Hba&zPUVMyG>6-00}mEeo~N&HVp#g ze%rHbyAC=^$)vkxi!9oQ&B)qf9M~sBs36-Z&yyc|fp3+aUWvfd(&ULq_PI)S7g_D? z=%BKTm@;(!e?aruO`Yvi{qU%bk){0QM0e};Lj$hT*P}|NZ8*#640V{8V0@cLiz?CC z{*HnNo^3?1omHly;eUwccrCGI%3AP^M4wOco=<}~H$^3{Us?8dcz)BZx@NLlvU8&2 zm@{S-_glkao-({UB1_rv$;3`>vM>#+k%uL3!F4m}qWj*_ogGwkmh!-VO>QkovCk!i zR8Mv&7<<(qafask{m}BV^I2JS27Hkup5{YMqsz2I@%~t!dyD1PhyJ5(xGvGTu)`nV zI)rgv?rw3Jp7zdu*RB_gQD@VcB385wQ{;kc)MYc;U2)AA+&2BvLw~yN=}yHip+y>S z-1o!xeBJaMMq=csq(d9)F|C zKIePrn$~)3IJ>dTjM>UxH8?C?ioUFaY=^UChR?YtT-4PFs4HrARf$J2-2?gW+3S{PQ=^@3gRGl8=W8>!UY1KaMhla&*3YapFB>>|$k2})P5+Hz^rNyxL5zTxLfvVkDS#*_c2?RdJ)ow*IV W#HFg`_B}u3^U&i*8b3Yv^?w6UjILb( literal 4172 zcmeI0TU1k59)}NQDvk=Y)6RGUV(U~oodTwKg8jR=AeH6$?*2n?;- z5y{x7L?Jmih?Hw87(##$Z7XRACL$z9Zi$sZgky+sNMf#MXgjl3U*~bw@^!EMu-Etd zegD1J{%U_rr00rtD*yoSjQZQ2H~@HMGXS_9U%qT<wM%12NpPo)NjMJY} znc>oT?|`rCE-jx)q+Se9VJ@|BM;8qT@_q@@g3%)_ilc1 zM3(&S2XDtw<8~NB^aDjs1zc@(cF)=Ea{FBIKsalq5NTV8T`S%#OAyqpaGC*$yh zy%W)ysJ7e$B~!~SE~JAp0@aow66+-iuu)94%@$PZz1ZEx{6K2`y$!CDwH`vujMA7Og2>_==qv zo4S>*&<#;awfC2fRNSMb$g z3=v^WV-`V^A8UU;^vu7E`jD}|j4%3ab1GMEGV!-nbP?7c3O~dWpI-P*RvW|nwCo93 zPT%Ob$UbJ7Mt;xM^TI46?AWV4Bf2Dir+$+$tU@2}PRM;83p(IV(^^>1qCa4c=+0lE zZb7$$4u#I&KL~>)=|b;sk8x!z3}BU{@Dlpy!fC=oerZ?WWUGc!|OA4|1Am?22Zxxe0rwn0QK(d~>1x%jyCfsb=)y6|>>M$)RhR2X` zAiCijD0OIpG;WKwWYN`9p~vP(BYdGR4AgQMiXSCs9~DD&cK>Q9*kbrE zz-KMW^J?@XIel$!&O#N@74lg)V1F(PV$nyk&mI=SEB1z)by!TkDmK>SCq(Qz8HPnK z8dgRMCizBKyRVm-X@gJJlAtjQxuy5m0RDO_80DL#a&~=~;2|M(MkjjInNnxXgBB#Y zBfe7?=dm@pB z(pHyOMv*uaDR{(De#o>O>C#?fJlMfwnrwxoxB#b>P4h)Af034)?8%_iWrUYBls*+o z8C3hcd`l#(AGc!eXBJ(kET^ZZXd_2b(5?Fn-)IUK=7<_P*Y(rU7RgZQ{LjoRUg>5{ z;zVokjI`Y9e}46a6sCU%NVI+{vs|#6;AZn z{swpEAmy<|&o*)yN{-}v+IqyR^GdCvBj;?Q7Ksd0HgJDh*~fU5*d3EoPkF(Hh`oP^_ZWc_1m}Cf zsd2-bd3o{+hC6YRdMKuQ*&S8Y`z+PYak-S%SQ#dcxket>&XER z4^wIm4|DqNZ<VU0H3Bl2j5A7)oXc^iD^GP@A7wtsk^WMo*>k zyROCKD~Cf1o!GRsjbQWahN;WM;uep6F5=;kL-c;#`b{j~L~6Fl$y9LoKGg~dFCL*+ zWn3GbfieYziX6&+WDN{0X#nHl4KJpM5zAYtzk#(rJvU2cyfw!iKOs`T zv*bwc!VTkn$+91YO6TZ%`D5A-rs+^po+oGP{^2CUP|QufZ;Cjk<*e95o^v!A@7LQj zUY0B;v^JY7Y8?t^91baKX`f7H@z)`6Sn*7uoXo;9V<?IFIXC_V#7-t5Fz3&}B)rO|#%th8(WLtdVabD+bdHzNcRBxOtsP?-P zMjb%^s9DO6w2w^R3rO5uffjHm5o$A_ZVyV>YSNokHZa69`^=h zODPs^Y9@|0GNV_Zd6PY;`>i$tezhpeC8R_^Z7$Z~+hM|lqD_J@0eK>VdPLlKBE?Wt zQ7Q84*Vyp15M_eLC$xzf%BxQn`=I?(AS zEVmlJ=7pHO@07@2b1Q)lBznNcgB`w|(f`9MdK7g#J^Us6-SzYvOTPp_)JHLUT0czx G`@aG48IzR& diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextFieldRendersOk.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextFieldRendersOk.png index 869ababd7b0a0a66f00d28d693fa5b8d02e1de62..cd50cb9ce78358f276e77ae07334484caa34039b 100644 GIT binary patch delta 3395 zcmZXVYgp2Ww#IR4vdOfWaVDMcR!uq6nCaM{f=YI?wvJi3yLcnDBtta3p`rfW$MM!h zrfu7t5-AgheqcmC?~K3!KY8#F6@iF{BcK)(-%oLp${%!hevJs;ppD;Zw`dg_Z;&1 z!TIy8+Yb#DZyH)#17Cl=V)edV4L^7sYg)_rEcDX#EgtveF9*)5GwT1yml|uP6V2~$ zZur9(?1xMloY2>=lvEPM`Z;KMWA$gC;<;lWP*gnm*5`=NfC4|lsH9*s{DC-^rcUpQ z%1z9?rYdLf_)CqQ@8&U}W#W#(Kt+Ns#? z;JW1$`XK;YT51Y#6GwIr8;43gorIFaBoWpP8CHV7Xi!WjsPPs&7{qCQD3;O3OHQhfK$?q3J2{^2~ zY7nhhRs3XZ#vE_D;^1A=4*d!7z|RfNqyqN%@ArC1(~-AHP+?qQod2NNQMN?N?H7u& zMDjP7NP);p^vO;FrXQh9JZ(P>t0`$y-s0w{XG4Und&Wap1!0L|E+u7+?XW{BGox^y z)iJ-hc&mZ)=wg}Vr$t^vqgXr4(6?$;P{0{UzO|ztss|6f}KlJK| zX`G%dZoe>T_BrY{^0`#%`#Vsgu#6jYL|qRT=aL3F%VbrNogoJ2mR*;4|5XDCJ}mhY z7ZsbX_yxs%oP(yB4(e|!P1LKhYkXVf%8;r3+ryQawYt>-`9Hqh&FaRT14ApC^uaZg zu@#Xjo@84eU#&5YgQzsv1d<K!`Gj269hLKDXMx&7EkSw(s z2<3iPBbtYzyBvlBrENQD+M1^1aXK}&3R*l4EhjyGd5q!G9BdPrur6TdVx#-6+kFGP zC+OJ$EDu18mW8cFs3%7Ui4WK(VB~6C*h;#hojM@!r`+8dh-~qSquZC1=N;MX78qeD z5qA)2SoaKM_v%Z(&j!evh65%gPU*tAtAn~%=)CC6MF=y^R6$Tu=Yn1ksqf6h{BA*g zqB6h}h1PXK)~`$2{z0=7yMPi@P2WK=QUEN-an&;h#n09UWweWxcl>>$Ks0^lKfZZB zQZSK2q(tRLFCw)2S-!1VlY0%JQ+Y{IzI?oF_gs*DSm5CDk!ro9`PN@20DEy%>0Xhw@c++y-x4nE=NoJQzls*lEhbv4eltUz}icAyaFx) zi9PclaQzwrjFq{+C8lz^yC+#sjN_#__@oCwy*sy>Zgnw#inO>(>^BPFKOV{8ggnbo zzh}QLO#fI>s?3#~ov`pEY%H98Tql!w()n0*{FtswAVTv@#wUEe`un;*JreQ1q7ZZ5 z#J@y&s@AYcxP$sSjNy%)*i`^9EekJIw&E!47)!=Jge@Ka6ze9Y0%uwrra~kr(d*L( zJWYR4gN8fWt5wBq$ z%_14Fi|#~8JhL$1i=cb!=Pdb1v45@}e6z)7Acqdj7M(@1WS6s+lfZ6w_ZxfnY+JMH zQ9A$@8X6&Sd<9Lb=#E9cw+<7A%fkLfOy?A9caXJ_&te$yETfTN%Al*$6;i%)Pwx|U zv%T^W%uzcFiBkvQmnRQUPgsw3!##mSG#kYYEKK+W6ZPBZ{JjU%E{(Fve}raxEpBx= z{?UIEZ_3sHL3jOB&qn;*j{MoZCvDWqgk<+GuAMT##1BW^wY{>^ds`#0GE9NI(@$MY z(}8E;9YcYA^M4EK&x-;>@1=qq@l{jivOMOOu3;mr6IKcr?H*86rK!jPgmZ{i&#DiR zvP*arM@QSFX;Lg*ks$EA&Cmuep66R!85%wkY=0s0jXK*pQucIc_nl8KRsTW<%*;9` z2d12ANK??ujk#7)ndS;NY-llz0Wgi6QY}82B$DCRqyEaE&JL0mao!DdG}bg(gr77mzjc4CzE5SOpN zuKFT*Tp@nF*t=oIRCpslxY__pX|?dE?;Ieiv+|ssqwcQeBb0aLxH(hHW5YKVK@rDf zt80_|)Hi+4KP9HwCV~lGtbq)yo5+eok}S(l@%jM3+qX^Mt?EOwER;*lg}raLLYE}D zr|8~8A1tGTP+;8rrpqO#*W(PWF~L#GOrF`WQE)r1&A3O8lVmY~R8AvvcCD-+iRuAW zcVz(!U9SW=_(4DD!0fy%Ys69MM)vo$(^OK;&Z$xv0!1r% z;*}4{-@9$=UH`02vGbw7;e$#EBg*0$2t^I{yWrNv+AyxGqHjr*gD>PJx6CfL%nzdT zIw6HsktPd_DAxsBY&)lOuZ&kad;Oa4!Ul_`is<`%L<)tZLQ(yA^RMyzZPEL&3 zSOhd{XLRWD|6_yAZd)gkT0B&D;KD%w<6AFBknFK$B!2uC@$2uN(^1-pnN_tbC@>t5 z9H)EIG(a6~PKpGPDbkBv2ou0OTFhdSzk?4|oa8^P7vvjG)U@H&_fH*_$hiFKvF&q)Dhy#ZLKZi}#YCf&8%uuc^2P+S zTkVA?nyemx%RW74!#aV)HFF&FJy=y>%0iOIf)btg+c(oFt=ee*gUCNh`nLwE16aM3~!DwB1G!WUx94u(Dj1^{CDI4o%8DF^Lw&) z4~6!o^|WHCSMHlMqSqne+ORN+_^aL#^T!f)v{iudwm(B{<7H6Zos%wnBm}Mb))!PU z4gX*%Xqo?hKLL}ld9Et-#QVh`=7-VFOw&>=DPHd!_niGD*vzQ6Fe~m2cbO&V6Yx5?Fb0a<&p?IA#trSn7TwnY~@*os(~* zLnl_i@XcAw&2I_)9|Kk0TVSX}Nn@=L2pvbVPmU!^ULGC=#x7CY!Uy^W+*$EoHgMl%ND==lw#YU$e7(=c_O9O%k9S(#`N~+UKri2|#MOa3J*&T3 e4RLy7*&u}~#9p!g#DP}g@PWwvZF|rB*M9?(vT11m delta 2988 zcmZuzdpy&N8%D?JbP*L%Yc0nqO3IF3OLJLD$*Ghsq{$_@gfGTyc80GmbX>C2aT-oo zQFL;R&G2jgY|vin|hwPbZEQT zN&T!F>vJw0(%(_Mexs(t46)u_XIE~DtBcKW*QrZZE;3^ylW*c%^7DyUdABnxE~rj= zXX#%QG9Mi>*j+S2ttJn4UyG>J9MEak>i(F6UUeI6AAJowd4IYr8*{3GxLwVSRPq6z z*SaY;AHDw)=dOI0%JrfJzRsD^M7#bC*GF4=Wb5pHg@9Am3ftG||!RSi<^P}r@ zYIf=mG0g5X_>cpYZwX&Yt+~iorVzgBZ-zuRlm?{cY*Iw`71q}ZT#EXQZFOQM9=)F` z8Ub4%=qdC>eVoi72!fi%{;*NU!Eu{r+G;AvOJbroDVHqn`P2}sD8(2bGA~8h;>DWF zi%5e7|?iwc}9+Ekrf)S zj+a~G)$Z6#)z~BXso!N>mxepbnpnL=*FHoN<%>JkO$t{lBLH?%s>jU<=I9OGt2 z7R}&=7(_-o-)7JNTAf#kKOR__axl#Qu(9pz(&R`9JF`H*3D_x+W{_)#m16*?^FsTA+P`E29^Lhm9$Rb_2pU~Q$5&p>;S&$|zNU5X2z<8+6o-<}u(JH1sH0WN z`@Po1*b6($o6Ze%Yi#(9kJKMt1Y6Hs#&hR8IK2IQ9Eg!;!)~VBXv$B@KV&bh6+1yx zWQXBL8Y>X*KP~9jbavI=Mzh+wX%mgG*saZxt9`6ayCLA_o&Y!dWLTD&vfn?Dpb>D zxA`&KP$Owq0=58+Osd2lDF+&5o)T;nv%SMgvF04kosyG=<_zOXzTEH5ylVC>Aejy@O4-S}ek+&;_BuEC-E$(ZI4(Bs^tpX-m+MXG3f}A(Z zF);=51k`L}W@NdhBQZI<0~{o==i`2EnRnvdTOo-qxafEA7-wUu3vth^#nvOA$q4aF z!%s>4mJDclNXD|bb z^QsGT8PcW1f_44togxad^>${^!>GH%vj?Jy;6U0$*zPCE57gxtNgOc?jkMT3^oAhgt|m(mb!b-Qg}1hg+E4$^qSlvGSQ#7Qk+M*TcMHsRK;333HWbPj zZ|JHVnV2&jW|5IXackMZqbOf+z3KNyi`8No8_JE>_NCz|{p(+;)BA5sH4D2m=|U{j zLnRjV2ObMu&gMdU8T#jqCAN$(DB3~_Y4IHCgKVlwmDTI-Xt}?Tme3{!nSsPz*{_+S zW27;DJ%5=8yUI4EoG{Fj4JLb3=Z=-!j7`zp*~mo+5(L|^;;HRB+1tcN-4u4f)UCbw zm34#vYT~o31DIk4J^Auro*iYL8mwCv0huQU`2R>nrgoKcrW5ABug87$gUX`Gnir$r z@@{F+aLEf)& zpr3RB`ttl`0|PvUsQS{orOuAuxA|o)UV4(Q-|eMFCwVFtWfbWLl=!k#ey&}@i%K|- zC~9lyU%(cP{DS&uwQb@lWlJ%`)Yd#Ir{F8uAHJ&xd1K+0r6r2YyZI{hD0bg$)(Kx1 z&`k*d3G0HIOic7ocGI%$GSVpKk;pRt}lKMj8z4VG(?a5%0q?joKK^Lno}ij-3iwg!MgSI0AEhSM*N2t@kb zmwii*frj6*#cPYtWuS_t_DrnSe!>v#72gi=R&n)0$~Bg(haDN#g9!_ERcCweFUw@f zOLwF9n`gdj$2p`@X*EE;WQpZZ9S2L^l+k=7RAU!3)(CluXoTJpGaK1r*40*QzzMC? zOg))Ix~zpy;}#;Ma$YY>FJy?KVqqL5h`o6t&-1RjMgw4lOIgi2XY6tR99aLW-JH#BC)3WB^wt8f}WOQjI&%;>Z+K;9JDUR%t{LCO!yyny6|-4qRw);AN6ppIvjB0 Ezh~)n>;M1& diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextFullRowFieldRendersOk.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextFullRowFieldRendersOk.png index 7cf36f895521cebda982d75ca2b7ddeed97e7d4b..d487ff51bdea6088a29343aea10a3092e833dbb5 100644 GIT binary patch literal 7320 zcmeHMX;f2Zx2961tqOcn1(75UpCZZ-0hKYSWvYN6BBKm4hLlN=fCLD&77@{)l}V;3 zG|YoQ2nd8&14J2;k`Mw!K!Sh-LV%D!2uW_Vx8J>Yt^4cVA9t<0`s2LktoNMr?!BM= z?Dg)w-;B#nc6-0k{6;}RVeiEstgk32>;Nk$d=c^0F8K`2?G8#oLCgQ5^@Xdq{J0b0 zFV1>+X|L=*{KdZSkAA88mFic_!)3PLMeRJh^9kEq(Oc2zXu^drvoGxK*|C0S>q5=p zZ?eIzv4`w8zw@%%Tj}QWEka?pwf>G+71jFNVP9=17%s*jmV7jjyXHoQ|zD;#uYl@t`9!E(L+==fGaVO@Wxf&#(e3x)4^e^335#NV9w{}&3s zm$+7A{N7|SEo;Q?tzH`H>=dg1n+8V@Mtjz>k8k)9jJeCK1yEaMF0rlmdI`ujYf(yK zznE&oijHzacNJu|H+V6bWOo@;0xm)9}JCzu$_H?F4h5iSE=~6-jybBxgBavnC>UOt_ z6wXLvfK*6Kpl!*UU2Kp3EoJU+oCkj`nck>)Gn3Q77_2$uF;yQ0J}ArKEHidu5rK1j z&{gL}$d)Z)BCYd$x&*B^*jlHkCTt#5)EWS!EGm)_oFa;SG@sp03Oj~P7-8-^=v z2JgjsF0mI(bE09Qht(U|Wd{90_DRGB_lANGtP#lq_UxOyT)ch|ip1eQVMbRjg9{TP zCsG@>yajk#E@4V}z}vK}QPja%qiJsWV;&?0!ZD)Ft%Mr?f=-BIiftm%Z~S;#o8z~| z+5EdPFb@#uuD^Q^RZp8A6&nR-S;Z+syoH?E7mL7US3)_`7Y?X{zMD@D56Rft@`Nw$ zFQ#fh!VRa&w|q`Jc(Nep$An|`DdgAX8`laA%)qNo-x&k4>Ex}COYs|- zfaK1piM!LQsGR(0r2BhChO?tzIu=1h2@Dv;)!Ny@Nip|TZH|$}vvwq6k)}zm#Jq{V zmIBvEXrXb$Xj0ou6;<7xS3Bu~j#L2o5U}kIaKMlTYV`HCgP%9yH?!ugMjB<^8a0Yg zQPG-{$p3=$wO~XeeTLp0E#ZPp;@e~J?;kP>tEukPf*=>ompD5`IqhYuGPk7djcQ+h)8r zJjrd&+M2VXSmqq-YVOb#rO<0BQK$OHg)axkVdmaj=(I>)tFeFZRG}jX!#xJ0>qhcf zf4QuAL<3riOn~QoVGA`ZOnox?oN)b!ii7!EHMiWw?0BT5=E%mSwM#s8^GPD+L1wYk zDt+2ytuxqgx%6#v85SWEaj5c{AJKPj5CQouvC^w>ySAajcE#Os8~KjnLPn;2NAMZK zcI@cZ1G8JQ4+!0vY0{1CX)&WeojJ5{Xffi6N%Q{Vdmvwp1dBx=CcwCW9}-m%?doOg z0LYINymZffflrBQ7LK8FyMh8(V!c6iuedfcI@pIMP8&0JU~S`(UyMd*n1m^vK;viP zZZ37Q1zxkGht9QT(AQI4$6dI|?`TeI*4eYaH6?s~ILhqdu5-C9TuGpIY9hQiCv2e0 zTSzgsohxFH&~Rz46DEMG2P= zM$b!1731cY@e>yr zf&;Pd-?Ka7TGF(H!>ONlE$@Qs36{Shodu0)F&!KyhI)0hJEp#*4LqpdjzA>Br=C;Y zoxSoy^L#tDf(1?Tk3Ql!Vzp@B{7{bxV*77fKMEeFt#*7oGds$iowBc~5XE&=Ncn&6 zUfiGf)*bW1G!7fffF0=NRhzr3oaRQ5j#X3D?JiEYGXQs|M;ntH+qYiFb#Pu{BTqMY zYP4q7yQXyD(2i{*uZ=r6cd%zi&m^fgZ zG4L%KP4mYoObE5wujLW%Hzj83l&5J)53W-uLb|aMI z93oO*fKeV2xZoz1d&|EOj8cCHyUvcCnXmTu$q!ZU8SDS}s@v_hfm>=5c(6Xx=&Fj( zn*`bn2O3>H=|0hnv=aO#vNm^A3LWFxcR0qj$`L(<)&%(y@W`Z?U;vx84$U5U%eXzJ zCWz?;YbiY*3d3}QC+ahVCn=m>x1Tm4Jp{1+F|H{QM=ADiJ7`gfEBx6H@+GetXod+( zUw9RK{uH-q=9qf#kUrFQe%WvLO#C3fCevZ@kDg0Y{`IJofOcQ?4VDcox`bD-*^`lZ zqG8HMxST$%H2a#c&Z~A+5Fg5Jh`jzNwJ!yH3SeO9tf1E*%Kr6-W}X zDHUv)+}CsE3}F}V* zb606=5>oT)B@e9&7MO zSaq?Zb!#QXX>ADskrNCD${pm}#LEVzDxBl<7YH9LD)Wkz1cuc9xpdQd%Rg?=tt3&t zc<5-|IUJDeq7I{ZVQevNxg#>0-bMiSGP-%R(+Z_v_mt zX*mP@h`0~Lv{-VJ^fFOmF}nPcWYLfx9K#fqD;3pQeh8=Esb}+UCbzaHB4%j0Agamz znDeJ2CG2R!ZvP|bmDN!hfR0S zC~V{hKw#Rhe)QQ9v7e4LsmMlKW1&ktnVO! z{1MUHWS}ED;y<6~9y4_3P&2*8`Ko~q_uxLBUJ~ygmdq^oXsxx=_Toq64LLqG1Y`MC zsV>-u{8LO_VANIoCovYMmi_ewc?wOWNNmb2=aXDXZ{hvnOu4+I&m-q}ui&bIOzK>8^gj61tm%`dul=** z2X#<^+cW7FNXJz^H)C~un3^rI99=%&*H}>wbUz1uzw|Oha>RebU{TJ}5O~6sbPsB| z=m$8HQ>t#t8>;@~YM~sWPh%dC6QXf%lD0s8U;-IBmI-7r4)jLun>9%~0xC9hG@`a< z0Iv<0Q)k8}%44hZEc7e?+e_5;cPr+9-+|he@k$seHLN8gqG8dMV&Wr%F=tcWrwSK( zO8ZBViwd(SBtcJmj!^Cd9N>rVnG+QlsW%M?s%!K<*acKgDj%K8LYB;H_hpQulmod* zxLifT!Cij-#Ray&cgd!_nl32+d74NV-nG5b6T7sAA%Lfb4Lnl4Btwuj%<0IdQ#I1( z$nA)dJEK=Ag>D%CeAwG7rt=W5apldE{m`@esU@JSscL=DHsznP?-9$d*X?E#u>`wY z(toDLBF5gsck?ez!1HB=jEWjfJR^;N1qfR;a-|P?ygH0T+^vJ+|=DU$5W1GEvHBTytQJ*&P!a zgrxTSH&qpByTNn^nnV34FB@;0^sPAq5Q=d#oco+k4xW)=X7Y4{S7WC_3R0R|;s6)~Z91UAGrb{CXlf&| zwmWX7xatQ2l_z?^SrdBwTS8Oc&<`^AV%PEG*ilF+2`L$ivkR!39Kp+4c=GfraAL~a zJH?S|J=n^BGm@K{&z(P6OW=8%l9>)uWtU95ZuM3B-E;Is4* z)s8D0;ItqxIME=X_ynsvy}E`^K>@Atpvl)Z496i0L)-%dFA87B`J zOhb7{)$*nWTG=tqJ8&$hV(uj21ri1?E^D+Byyxg)b4)dR<$VEg6kT`_=q9-dUsTV_ zDxJj(wf8xaF4dJyu zz6FD)p4-f***QelPF_vHBS*l?JbTu2GCB+e?MpT-OH>M_uQj-iKMv43Ldk2vZHIj) zy9qb%ZgjD%26)6N=o{3j?XzRZ5N~*{gapHhj%smEe3dSxvfCxeILf)+&)Bi~DkVlL z(%HTwkUwGSCN1`mV`m)uM{j$bl8vvGO|l{AC+Q0iZ;7XuzjQpdcjF$#&iF%+DTyXj zd$=qsapaG4&Zkd%+Q#iD-zzBaq(BF^sc8$g6&{#Mzbk|`9MxEV*2YR>Q4O}cbQOJU zLwhejVjNPo`hcsiDZT~h&p>81pN}~(_iK~LkanS;=pN0&%S0O|@x(UgAGa+6Q$SvS z0d#O4V;*Mt?^OCv5cMFo!`1`I=39^DGZ9vvdcrN(01g{2yV)lo)(Sk-p|^x-#9GJS$UXhgoX=oF7_M z^a*QMNo@{a-i&C=-Y+nYznplH`qwT8Cl!9s3TEXx0k2H^K1`DVzoCOz?@< zgz{D%(eQ*-gfTnoX=jOfmA z_h(Hr-H6vD@nfuoNN?#C^5OVj8@ERrC%SO-ema1uXy1`K&1n|RiExUlY(tW(L-;Q< z1GYM)uUwCPUjbePqWFIvcfRTaVV@QPU!E3LC+YNw)+o}5ce z&7WIl8}zjAmaS$Q8PNqkEEGkL`_-0qjqLJxipC7KQeHQ0hMAPn!Q3~1hBn-RJO}pD z5AQm@u{&UwEqRuEhPLrv8Rd|_RG;s*Ex_b_p7t@ zQ)CLH>yJh?^s)I&d)8xT^)_4)nD?qyPp0k={uTR&6-_KaVi{>jrL8f|cBw1VQI)v6 z@b;Pey{9xw^EVD2S~Dq-F23C~*)Of4agONcbl)ILOcd~k{dd; z(s>bxnHc>#IYhvD+g7I9|3L6f<#UlJljDqDvN*-A?%7s42dt7qOn|##F z-$1je4CfwQ_&K)Bz%IR;j-|lB$(V6DHgHk;7z!=#y!xJ+H<_Sqgt;oO|8u987NMJh zOa|DUeO%lG<^~MprDoTAtXXQ1SBt<_c>1nT!4*w6&<>I)q bFNS9AygTc literal 6755 zcmeHMYgCeH*QRMEo5{54q(y2?Q&y9b)sTfkO{L>hT5ku<6Qy|;i40K@Xlj}?Lvx%w z6BUg*Su!2~0}-bbEDz+UsNf@xq?8Dx1gHqlN4@W#@B8`w`_`IY&sz6-*4letd++Ps z*S@ok`};2aV(k|Y2xO_>_lN!kfqb$90$Gr_c#-wwuhZAa5XjnXeuoa6N)1;J#XWWl zJL~$c)$92;jE?+{zqWm{)6vhSWJme^V+T2vR~CPDZ}-|n+j}m(_9g4TIP@mx%I>(C z{YUc`$$mO;0=i@U&c$u>JH=acw+!i_r=Q|gze|;6h~|T)_7~bF7I>OvcofrL9ekQ~ zpCz%ZfsF8uTD^L7WC3J9ek%l0>HZl6()Sw#a*w+b0y$Oq3FOLz)!XA?|NQh11pidQ z|Bptf2(2~cQRfqZr@RD0J~eH_un`WO<@6BZWicGJJ3o&}W0LPuj~tbxHOyR~(X(#K zEWqedL1c*PaEgf<6(a(a3;bVqn(5dljiiz^wML;@)%7F#jiugXrl$SP1$_5RV=J`1 zZ1He^4xt%^HhY~6c#DM30)36XDRi1wbR>}fh^_v66A-m$I=<^Yg3TH}!@fL3avnJ} zx(&PpoaCX3%3-@Yz38r)=y;P&efH%*X`6u7bW(;iC9P`?6_|Vod`$@u$g6T2r*L_Z z1S5Qrhe{vt=r6XosW%L_kvaa+W2bMgd@dTa`Wsy`qb{)Dfx9{*(&Scv7HPcY8rL50 zkdhnTiFi4@K<&UIT&6sI$?WFW&`eEU4OF8k)Hr{b+{;F>sVk;qqyq(e1?k3;R#jmN zC+G=}qZag$?i2A)j0*u$*Dv-QoIh=xh5Nr3)D{`v!I8RIJvId;NF{C7-?ETvsJ>rJ z6>V9xl~XnzRzVc+HkY|uk{W`Hx1pRGRLjUnnEF&$*JauBFs?%iEGhDyo+t{%GGQl} z1Wrwu$IPv_RqhhRDKWq4C%##Cn}L+^wLzZm$wXBvWHV9~$eNmEY8$WfNtWYb5WCXN zhDAH3jIT7&n057v*DH0S0(!h+Hf3G&@Lsok`8nC}0yqEldtzsAYBKbj>>8&KH&f+f zb!Nse%v6p_9bFWr@53jNr3lbsu8JyL^J7s-vwH^+62XG zM}5|OIpA8J=73=gb4tc($Gqvo{AwZwVg59guDJuKrH+}x_vSqk`ShgbEbtj%K3JLQI$ql5EUPfiKJB9Q98l z>r8v1TIbvM*~lMp5m<x`7}vVSMqQM1EosOt^{jDP^Bh=lM&(kA-(QLWenFy1 zSygJ!V&T2>v$E?4wS+>=vFs?c9Kh5J7u%jAHxgTSJJ}eREQS3!!`vDTVCKN3IaP|W zT(`*eQ&^r0hCxpzm+Kq9GY-T3--#0$K03wEju#Gv;0Rm&gK#kuUsmZkEq}f?1YxX3cnx^-R?qHU;Ez? z)e&}*&l!J)J1^{LieXtc;Pw-xKF(~rUzAm_Laf4&UKS*8Y_sR1*QJ8#9x%H(V`;hK zr7k}^&B0w#iouuyQYbr*iB2b%EzU(;8B{6lIk@Xk*VmPP+X)q|wF0R(gX+7wT?C5> z7FYfmvYN@D+8piazJbMyY2l)K*y_OzxR`GieJSU8XcO7q$mgDM)iSU8;rmS;>_t0# z`;wWk^H|X9yUW4f_HrRT{T`uTyqLUhIq!v4xGPyQlT=VU%-T#&1;lk|(l(=?C!Y4u$UKK3~dLs8USs zfrFv5Ou4F3Z)^){m!2E_l<#$5J`7>Lur3!eED@e2cqOBUAE16H8wnp0_GuKWXX&h|E$fr~d}Yb> zE?@NMxwV8Nqd(}L!O4@JVrz|$er>S4SmBVC8V^NnBN3sld3s1RR;JjMng85I=D5-+ z29jJ!pF&b(LN=dg+W*1SsDGQ}j-j}BmluFfE9w)OmK~c zDD&I^HvdZRWNVkM%?Y*=N}Y&3H7G(ht{YnSNEwc{Q`1E?#z759l#?#t>mwk`3FQ&A znW0D!El>_4DV6S!8^4Xb9{s`766mU$NBsSel!e$_)3s^OxYO9bFd&$yd5JOYS?Zhh z%|QNp&@+cv5!vpiS~Gfqr8i|QBQPa_deJHZ?tvOlZYxeQolw#I(9ir-X>gOW*t67_ zz2Mbn&{@_ zZe5#uKPlnw(^Ys)H>uWoO?4f%jP#|0yWJ3C$`4S|QUR~+c~ANL5kPT9*LygucdR!9 zf5HL3_i)&@-rqpoTTKoC$Oeki#-l3w#TsO)^apS#sSglPzZ_b~%VnQrJozStQ&i5l z=Aw0H2ZJwq_EGBF+~p(|^^@yIn3A**=;6$_rS8+Q#Bk*};2_3nqSNoNrZ?UPe#4 z4+_;4TUy*I(og_DqGr;U%R6Q@5q}oH=404VrQF1mg&5@{cQw*X4@}`CC{~|3D$2yn zM*FTBuiy%>k-zSV2~>v<2r+c|SvL^HqsK;Ww8Z9#H}dQ`-7n}N9ob(-tlaE#pZ>;j z(F42Hhhhwl3ebl4^VziUddE(FWJ%6d(T(NioBb0z%lpPoRl83-aDVD@AnX$AD)%+{ zr{vRxhF2DGJ1;O`NmD(sC1UJi<&HfG3Q3RCnY6|ex5~nM`Q@~=zXLUW;j%kD(4=_h19A%j!=wIR4o=xQc5`5l`G5I3Dloa;TXtFg}4P2F$t z^Pb9sn3bx9Km`{)7zE2;Q@<0wC-Igz=tc|vx)#`uVo|B+=o&Zd*+%j~Yk&TH+9~ z+redj;z%uwgN>{wSSfwSN~jA)tYZ!dZy5i84`VGS^0-zH${u_`ePX$8Ti+Pkk`;33 zOP>>W>w~t=)8TjbwxT=0;;p$~o}4G)&o_DNU8FPDaVvN2GeJ)_8PKw~oN|p^2o9+> zVup66x5dx8a;6T_?Fr(bPM$Axqp*R`BGZ+usUs8buJ-NJCMwQ`-TJD3WAK0a$%?f9 ziNY`N#hWAQFJJG8E~7c-wPvaxKy`Lm+;!;PBwjM{i}Ex43*A-jW92`>`oG^TSU`eOQwVvjGl$k7UwLPEXq^F9o*1tk3Nj|D`_#Af#y4M^(tv9^_I&F8?Yx6lPaDNNcsnVZWpwlr79p>zwI zU0dFVl}8z+xj+7Cf3&BriomooP#ht8vI!Y(tD7-*eUzJMWWG=msv6agqU z4o|5x^HaXdNP;~Q&I6Y4U$aLuz*~*0z^p7Qgoss`Q}{9 z{!NP(PK9fW3)1|dCSa+|VtJalYnn2V^h&t#w*gc{bNZdWOUh^AfWZLrwI^)PMaa;7 zKHdd{2NF}-1)`e%!jkMh$=8OXl>H%c#=*VEU+k`F`YL;2df7$A6(<``gPv3u7ryQd z`60EcQ?^|)7$3uSZeAA;4r0nCM?xqbyl&7dv|e9)hy$m?u8YP;Pk*wVES zR#zlsS#J2KaRH8qv}^1(E^{4u13Hzz^~AM){&lrfu?^XB?(d}-0X@&x3H!=l@Cou1 z{Rvt4!b4Nt!nk#Vg}Yi}vx8`s$D<}zQ|xKszWm5RzQHKXLIMfFnnGC+m~zs(F`O^d zPy%{3_#eupmq$WYTq}qrI`@_x`EW-HM`E3i0~N$5C@E(};WwHt8h?r#Mze7Ha~F2c8MmlXqE!nz?i*lo;hpoL8>(f}c$EJ=u!*{G zG~-|1fi~5Skc=kkf$u|4gB4o^M~vmImzY|OM98RZU@Q+*<1P^|7;nWDKOuLinApEv z9*NJOC?7?lT1YEMgVgnbd;=qC3XyZtxh(iDiW=0J4I{ z4+Bj9o^Bu8PYPToyt}*PPv(u(vFN}z!!qwGVl+z2pR?$=58P1IhKTF6cP7C$3B z&CJS|oY#_!b9)8hl-!(`KmJgjrC;E7S0VC)*)`T_i^p3RSjClRgCMP@>kOh!4;eph z3Ve$k5Wd)vw7{j0Y-=mYjUJuw@L#P{EeSzh^v1Bd&NO9ws=J~wV?uuvzSyf_ceJ%^OAjw7ZH+M$w5kRQDtq{{ znJHazg_r+OP2y3lnm#o=H4tZMd`^-L7{~i@%PH?h^-@0*c$*!@VHiNYaf?CVc&cOJ zm4^Hk>PfZI+FqBz;=&L_oReXgz@+O`RsyYDS9zf%Q>H^T7JV65PRCS`m!owGt8 zQeBWfDV=b;>6*##59mZQ%|&FKu@qo(PTKGfs! zG{(|kHjoX@yS%v6{EI__nG0VV*|-Gn>Y+$t#6IU$EvHFG<*~tpD*8vrN$j~a8r*Kg zBQ>*Xd?v*HT!C4hK+zuhqu*LW9!{=;hFx_-U3{}rhzUIa9yem8Gfu+!E!!6D@Id*O zdBg_Uz3w{W6`U>Fgd==S=B?DOVo?vg?B^j^Q;u)HQTLvUN&s(}H#qlslheJk@egPN zHW9_v)d%~r30H2INa?i*EY7V;2MPfjiLxArVzmE3>MT}VEG5eM_(5d@9@USj zG9NS#t!-W>rI0JAE~cL=wolJYjvpA&aUHgg)0T8cCkAG+BX6%t%V?su#Tkl`P7p?Y~Nf-V~J7R6F`VaJDElZ>@W;s3+uZ%JpbWaT83*cS{JHGY| zN;$@E^1X5C-Y+XJ;PlIFRI~WdzC$T5s8Qk;t~vSbOE++lB9way0fIL|U4Iwf@&99T zGL%IbO0iR;aC@T7neSv9{DTUCHiccww4I{(CY$jDPp+QqQ$I9OY Date: Mon, 5 Jun 2023 09:09:30 +0100 Subject: [PATCH 096/263] More different attempts to load resources Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../dev.galasa.zos3270.common/build.gradle | 7 +- .../images/TerminalImageTransformTest.java | 234 ++++++++++++++---- 2 files changed, 193 insertions(+), 48 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle index c5bf98e3c..aa8c89d01 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle @@ -1,6 +1,6 @@ plugins { id 'galasa.manager' - id 'java' + // id 'java' } description = 'Galasa zOS 3270 Terminal Manager - Common Packages' @@ -11,3 +11,8 @@ dependencies { implementation 'com.google.code.gson:gson:2.8.9' } +// task copyTestResources(type: Copy) { +// from "${projectDir}/src/test/resources" +// into "${buildDir}/classes/test" +// } +// processTestResources.dependsOn copyTestResources diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java index dc9b9c49b..0dfd604ef 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java @@ -69,28 +69,11 @@ public void shutdown() { Character BLACK = new Character('k'); Character WHITE = new Character('w'); - @Test - public void testEmptyTerminalImageRendersOk() throws Exception { - - MockConfidentialTextService confidentialTextService = new MockConfidentialTextService(); - - int columns = 80 ; - int rows = 26 ; - TerminalSize size = new TerminalSize(columns,rows); - - TerminalImageTransform renderer = new TerminalImageTransform( size, confidentialTextService ); - - int sequence = 1 ; - boolean isInbound = false ; - TerminalSize imageSize = new TerminalSize( columns,rows); - TerminalImage image = new TerminalImage(sequence, testName.getMethodName(), isInbound, - null, null, imageSize, 0, 0); - - checkTerminalImageAgainstExpected(renderer, image); - } - + //---------------------------------------------------- + // Utility functions + //---------------------------------------------------- private void checkTerminalImageAgainstExpected(TerminalImageTransform transform, TerminalImage image) throws Exception { ByteArrayOutputStream buff = new ByteArrayOutputStream(); @@ -107,39 +90,76 @@ private void checkTerminalImageAgainstExpected(TerminalImageTransform transform, private void assertFileContentsSame(byte[] contentsRendered, String testFileToCompareAgainst) throws IOException { + boolean isCheckedAgainstTestFile = false ; try ( InputStream testImageToCompare = this.getClass().getClassLoader().getResourceAsStream(testFileToCompareAgainst) ) { - if (testImageToCompare == null) { String tempFilePath = writeTempFile(testFileToCompareAgainst,contentsRendered); - fail("Testcase logic failure. Tried to open file "+testFileToCompareAgainst+" but it was missing."+ + System.out.println("Testcase logic failure. Tried to open file "+testFileToCompareAgainst+ + " using this.getClass().getClassLoader().getResourceAsStream(...) but it was missing. "+ "... was hoping to compare it to image\n"+tempFilePath); + } else { + isCheckedAgainstTestFile = true ; + assertInputStreamContentsSame(testImageToCompare, contentsRendered, testFileToCompareAgainst); } + } - byte[] goodFileContents = testImageToCompare.readAllBytes(); - - boolean isSame = true ; - - if (contentsRendered.length != goodFileContents.length ) { + try ( InputStream testImageToCompare = this.getClass().getResourceAsStream(testFileToCompareAgainst) + ) { + if (testImageToCompare == null) { String tempFilePath = writeTempFile(testFileToCompareAgainst,contentsRendered); - fail("rendered image is different size to expected."+ - " ... image from the renderer is here:\n"+tempFilePath); - } - - for( int i=0; isSame && i Date: Mon, 5 Jun 2023 10:33:26 +0100 Subject: [PATCH 097/263] correct spelling mistake in test filename Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../dev.galasa.zos3270.common/build.gradle | 2 +- .../dev.galasa.zos3270.common/settings.gradle | 3 ++- .../images/TerminalImageTransformTest.java | 14 ++++++++++---- .../resources/testConfidentialTextIsRedacted.png | Bin 0 -> 5905 bytes .../resources/testConfientialTextIsRedacted.png | Bin 5873 -> 0 bytes 5 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testConfidentialTextIsRedacted.png delete mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testConfientialTextIsRedacted.png diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle index aa8c89d01..f05457750 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle @@ -13,6 +13,6 @@ dependencies { // task copyTestResources(type: Copy) { // from "${projectDir}/src/test/resources" -// into "${buildDir}/classes/test" +// into "${buildDir}/test/resources" // } // processTestResources.dependsOn copyTestResources diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/settings.gradle index cc562e746..398946c10 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/settings.gradle @@ -1 +1,2 @@ -rootProject.name = 'dev.galasa.zos3270.common' \ No newline at end of file +rootProject.name = 'dev.galasa.zos3270.common' + diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java index 0dfd604ef..96cf642aa 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java @@ -95,10 +95,12 @@ private void assertFileContentsSame(byte[] contentsRendered, String testFileToCo ) { if (testImageToCompare == null) { String tempFilePath = writeTempFile(testFileToCompareAgainst,contentsRendered); - System.out.println("Testcase logic failure. Tried to open file "+testFileToCompareAgainst+ + System.out.println("Testcase logic info: Tried to open file "+testFileToCompareAgainst+ " using this.getClass().getClassLoader().getResourceAsStream(...) but it was missing. "+ "... was hoping to compare it to image\n"+tempFilePath); } else { + System.out.println("Testcase logic info: Opened file "+testFileToCompareAgainst+ + " using this.getClass().getClassLoader().getResourceAsStream(...)"); isCheckedAgainstTestFile = true ; assertInputStreamContentsSame(testImageToCompare, contentsRendered, testFileToCompareAgainst); } @@ -108,10 +110,12 @@ private void assertFileContentsSame(byte[] contentsRendered, String testFileToCo ) { if (testImageToCompare == null) { String tempFilePath = writeTempFile(testFileToCompareAgainst,contentsRendered); - System.out.println("Testcase logic failure. Tried to open file "+testFileToCompareAgainst+ + System.out.println("Testcase logic info: Tried to open file "+testFileToCompareAgainst+ " using this.getClass().getResourceAsStream(...) but it was missing. "+ "... was hoping to compare it to image\n"+tempFilePath); } else { + System.out.println("Testcase logic info: Opened file "+testFileToCompareAgainst+ + " using this.getClass().getResourceAsStream(...) "); isCheckedAgainstTestFile = true ; assertInputStreamContentsSame(testImageToCompare, contentsRendered, testFileToCompareAgainst); } @@ -121,10 +125,12 @@ private void assertFileContentsSame(byte[] contentsRendered, String testFileToCo ) { if (testImageToCompare == null) { String tempFilePath = writeTempFile(testFileToCompareAgainst,contentsRendered); - System.out.println("Testcase logic failure. Tried to open file "+testFileToCompareAgainst+ + System.out.println("Testcase logic info: Tried to open file "+testFileToCompareAgainst+ " using this.getClass().getResourceAsStream('/'+...) but it was missing. "+ "... was hoping to compare it to image\n"+tempFilePath); } else { + System.out.println("Testcase logic info: Opened file "+testFileToCompareAgainst+ + " using this.getClass().getResourceAsStream('/'+...)"); isCheckedAgainstTestFile = true ; assertInputStreamContentsSame(testImageToCompare, contentsRendered, testFileToCompareAgainst); } @@ -260,7 +266,7 @@ public void testTextFieldRendersOk() throws Exception { @Test - public void testConfientialTextIsRedacted() throws Exception { + public void testConfidentialTextIsRedacted() throws Exception { MockConfidentialTextService confidentialTextService = new MockConfidentialTextService(); confidentialTextService.registerText("007", "***"); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testConfidentialTextIsRedacted.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testConfidentialTextIsRedacted.png new file mode 100644 index 0000000000000000000000000000000000000000..410a654224c0a546d214bd53486c7731f4a9bb4e GIT binary patch literal 5905 zcmeHL>s!+4+NGKq-A!fbc#701r*SgNG`E_fRwhgbB`3?u)Y44NkW>&6k(sHTCl0UW zu|jt;rKN^PNC|0Du`(sHz(AlRMMEGY{fQ`So4Mxw1K$09oUhOIe7K*r*1hg^KLv-w zV5?WIUkL(%R`36D-%lXW@*N=1vJ2*4EuFkPdMOtKvKijLZ%;&4jA{h)-231Ov$uPG z%m0^aVNJ~sagl4k;eRwcF!lRzNU!wpIwJHEJN}D(&0I@^Q{noQxIV|P3(alzk!yx` zH^uLv`nTRd@}w-o!!aBWvo%tBN&(>^F^PufQ&SmXDUFL3phqT;Eg(?c_Af!8*SA5S ze|LTZ0!5TB2mSnEsj$P*OI6-GxD2!#{r9E6A^2}qkO(j&Dxc{9rb^8$j^!#b$j;)} zQe{V%uOpIKOjqpUdH5f!RG_UBu9#sgRMMn)(Mv3SCnK7d0=T74&S;nQeg&9)7bnkc~SBTvg|>I1`S(p@xrYrHwB49MDle#vExiNYu70g4&T& zVMBW5jy4TLgV!Z&FUOw+@+3hh8Tv{x{l#J~aG*#(`p-wLo#I0>CkeX=7Y-&pX?dQ9 zk_ow8oHoOU-ZpoY@vfmXS>NjIRxRRYa*gy_gsS_en?LyX~LxOLA1X`?K4OV#xbn41G7!SHoWcyoRreD z?Nc#k6m&Ayx05n^(=|i0f!Zr*$DsydQA^Ogo!`Ig zU4JKiqUr@c5nOs9hms5=(bBP{lZNUx?RG*m_vAwhGKYec7i@MlM8+N>Fx3JHm=XS_ zxBe3LB(U|AruG^53B7Sa`AcOERM($gQcvvv;B;@v| zpSMtW1Q|O7;159(laKGcAY+SWmH)%WS1hK0NeVv;{#=ho)VZ|#HO&jZPU1vOK`=oJ@p|$JD9^Si&3AM-m+0_*=jd9HS2^i*HOk zXU~k{hCe(yHSQ;7QOIfzExDOM5OR$nCkU^&9=`2eO&BL?dc?SNmtRq13NUe9-fDnlpTGmuyv_cSj_JvqFRLo3A)m&ZRWvY@P(nXFeZXSn{y;?j3 zhX10=hv&PrR3m7fobF9Q*Jpq8t|E3dlEQ{v+EQqC7RmC0j4Hr~g^9_b6asWn-FM~6 zY?(L1JrLGw)TpLb9~?FW^hpEV%2{G)?)zxb#1aYwjnYfCi98tW^|ARrHo^`1Q_aqn zQ@P5D5V;M_64~^OcXGUnt-Ba8&TmKY*E~osUo1udLkJ=_SKy^e z!s}Y10R9$Of|^R}_w5{a_gj5GW~Dj*mx9`6yY;4D)hk4GhsP(i0j_QIWUMb99&uIc zHB&eQ*c~Igh~{!k-c{2zqlNmKmxR3D77vlG0I{kzD1M3aA_Va(UAc?4$C#gdGNQr5 za|aJxI@)b3i_eY_^v_(jQ03;#Z=l0Q_b)Uoz4AP=&r@a4?%C`03k?bCzsRJ&UR1@2bT<71H7l$Dz9(w}or!XCkPu))flVak zx8s!(?DeHqS)$Wn*U=?9JL_mE#+sqGWyQ-M-(B-uC8|3+3V_0&Hk8XOb-l3=DwpDE zY9R?%cx}*+%$by)_c`LSR@M{5bp;^h-zU;|tW=XDSi@UHr_oQAJ6Y z<37oy640_j7+|AY9i3D(?q`0>yeMo*R7SweR=e9vcPs$O>r8;Xj* z{@p~NC}T|a*fvo>|%qK|Zs=IC(L_maZate;scRH(eCTMNgW9xSEWdOwPy z8B?tudqncY&+*l3l1KH3Qk_8Jgm#}Y-X;~EW{;d;!+{ZXJqzbPEu4&L@-R)o#bd5j zjf*R51*}h7B=Agl%vs(<3}bqVl)yXBreY8s3z4$psk0l0Ag0%g$AECKZbQdCdCs#0 zA#3a(lGxCy2Ty`-;hw&~=2I4xU6iaRsEiGU;odfk%E&O}d8;WiE#)&i-ph|4WE86OD&lUM!A(aueWVKI>^h6^~HA~fji)S>T4l}B6@;+%{Axw zRYx=8Mnv?B=h-O~gby7gPu7*PT-uwFT79W^nSXtwis%_ng;xgB%TLU|P}_=) z21da0X2m_SZcBNzMx;cW-mp_K6!mS@$v$_#QHu|b0;tP5_SDN8?fgly^8E_&#H#1C zZM+YTyYO8+ZcF((@q!a#Bqe;7!{pna;4vA2Mt6!sMN=0XKK5w!$9yA2fzsNR!g9LA zULJP>IJg)VwsxbdB0= zTRf*(%<%CbruNnPYNs8chF9JUg>9{-_0KHsE!Y`Jj54${rR+sf6w)h#^NM>!6N{~Wy%KLAx2=F&L@Nh+%*PafwscRVEh`ffim{v zE5RZw(kNZDzCR67H)4?f3JngJj9D{cK9o0eEiz(+AcXdAC_TO^jidG2=Gw+gp%tGr z8RMe|{o6e*cg3WYIIT`BG0hGs>fXk(NC!SSi;u^a*y;xR@o=!Uwxwa1jBCFUv;|6A zOEdGhY~mwI?5*X}TW%+kxImhguQGAH*K2){@on))gL{iqIhMkb zP2@I4E8nsc!On$zEcuE@V4wNHL;im5@47pKlH^%^N?OvKe9jmOYy<0JxwYt^mO01O zbBS$fR9Ig6Ab~@Qe5eCvw3K*9LiH=C*>;AHBb2O`HBJL+dVL@Tr<8~X^#&=vvwVfm z<4z$vl zS6-C-@oqc1Lk?|KkwC_0*Zqn~&p?c};l!Icf3%#Kx*oyQPd`Q>O z$TV$IN-Rmh&d4roeAk`MLA6pqK1P z_#8_5=p1(Ax~MPS3$`x9CFoNcV9rUr-F>gs};Ne33}ixL>mu!q6c=m=xK zzUEBf8I>OAb;kl(yS1z}^K{KdqjoZ5Vf<0pw4qzZeQ{s|H}Sodk-@i}JRVZX+f|4kI$p3$H9__|ODL zox0SDj{6#j;5WzdQ0n##XiGVj&LA*E3J@Z^W`5}0%5(EGF_HrAspj|(=ACiG5A z5DR6eI|j2li8H;2F&8u=>+-|)ptg_R^>rQY_<RC?z6#;|w$&_~cC<$PmrJ6U!Yc zDjZiw6T_Bv3cCLeoLH|#c;##NZJ>5%tu(&x^;D`J9t3lO3f3IR=M`(HeRiAY^phF+ zs7*iE<;j=FevZ%W^|KHY^l3C6iG5D!H UPfK0;>IUr(3EOvn@9AIv0}zZ1Jpcdz literal 0 HcmV?d00001 diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testConfientialTextIsRedacted.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testConfientialTextIsRedacted.png deleted file mode 100644 index 4677c45ed9846dacc8939001544559d77a0e0b42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5873 zcmeHLTR0nNyN!B&^LJXMhhJ5S>ECwR4oXl}g3gp0Q)RTJ4kb#RN~8`E5u_cR#@V#m zh-pcOQPUEKAVH8G99q$2QUr-4tuzfHNeP0ScFexod*AJSvoGfMd%oxS-gm9_u4lbp z!H<64hF_X}2><{LeZKd+003;U0|4}r{%N2)c^88BLahz=H83jnAr%eMe-&g*LV zFZGQ!_=b{Y3LNNd&*%*Q`)c58NQYE@SQPtDCr2Xds58QbV9QOE1aIFFulB@$wZWI zappnD<*xWHqj_G-J^YYSI+b(}a-Y^keF#TW?=h-Yapo64C4_rcen{-DhnIzgI3d{L zVt9p|?KT+L>%rsx4k$&iONH0D@XJf`$;3mj(VUMz}rHY7-zT*~N< zgTrJNC&Ems#@Z<8 zuVueVJI>+ovE}qL+qY|4mE&_%YEG+~2coRp*Cr~4Gv>gLE`6#d$ZuSz44Zg&zT2ZZ zM=OyYG~py0M$%KOBwTNlg3lw~&`ROl#BL0IsaO4TuQHzI6O&w38{HUAK~1PaDkKu4 z)%qkR>ecC{vY^fr~dO-PpO%VtMw|YjS1yf5XxQv+- z4=f4qadEaTx^+oqaKMc0s(T=YA#s0Nl5=~_{KdBV7-qp)ebbdb`7%-i%tMg_CQM&@ z)uz`UD`RN?gnxN>s8Dhya9vNvL`_k$kBr8L#Fspxa^=Js=W z^tMeTs(a!!5zWBM-Xb#NdSoT?iYSxa251 z1ZGOn;&k&A15SclO1NkgZAOMl1EL}KR|=gG z+>d?L5BStT@lNM+xy`7Vq;*+4X!mYIpY4%YPIJN8B@a$r{bHswWH& zl8pgT{3M@QDhqzelAR)H?yP5=41J@>4h8Dtoj>7`mDs8Q9x{K2`zjpwucFHPro|&< zh-)mfYoM_oW4#njn z;ya^yaq&r*lVCRi4Z?>sZZOvlJY8Lm_qNpRpPfjefLhhST=LTG{BcPiGuU4Fx7MqAM9e zDA83|q#ZvOIr7q$4BBlxWJ~8>y)%!qpIE5E^x7+$>P)lyt;!}fB*#m&)&Zz9vVB)hTsVz0itMXZ zPG<=9eAnJMRXbI1k~i7>6~Z}-Sw7en1A?n-oT`6>oFJsdx7S=PtDnqd7Yg~VoMc!? zW;hUDc4P+m#hw~DC2Gm0Cqd&CRIU!gk|53+{Nulu0S7AAin-dx%+q5lS$DZat zqW~L3r-*uM@ve#7k<5Pm7YAe4Lz>!j9wpOo!c6*zB?7I83*^*Yc0nn(=_tqQK%z5| zl5lxkxWQhlf9$t<;wPAkuH00s3o-t76PXB}zIJ%q;vt}a>jYRxEbsSy*Kv8Ny#M0- z)oyjFGlTzGdOUZ(SryOTqe%V;)0;SFAX%pBZ;k7vv!u1XN*HYF%KnEP8;ufK4`~?8 zIQ5eja^bm8)R!l7JAtytWV3}6n6s&s`g>uUB^q3Mu*Gke|LF*ql780TG2GrwKXZ* zYTb+Shk6j+l>zM&U8{t3@qWm-ktdzES{E8mh&qCnq6b#-ExI^bgcML)k{(qP7zTVuzAhX5@lqU1et?UFv?{iA$_q(m48|eWXIkV3;#rk zJC}Cr`V%8i3yu;0Xgu^3m7g=QyiVduf=I5cGK5k1n`YMFc80wNp<@Fxiq)=2h7BXZ z&_09$=cKu_ri!rQm?sjd17a8CTSrAgr!>fzTWyJ-wTlQHFLp2vqjU5K<62V@SN84; zgm#KsLrG9rO5Q!UHJHYaacfJy9ZBVMl_f>rFrRoM(&aYi5mHY(>izP%lNG1hdu+W5 zI(;!<)s<~pY&{VcYN168>G=lp>W>IdA5h4&i_ea0ylQvhVU9M%G0ozL(I#+w{@|Jr z3J%arCviJcqprJD|KM>W6ej%uP2UBB*1pKMjxbUuC>ppPq{Z}o>*v`=ION?Z}Q-zEI`_*P!nBn`{prwwiLF;h`j_KO%wd{!m zE+OlVWpeZ{j<#q?_5k3MkuJ;>9&+i!vG~vY*ZQQ8Zc%#*uSTEkx&w5^WXRfucG*uX z8`nB2tF$?yoiPI^{xy-XA7lDQf8_g5T*!GbxUOV__Y8`!Kvv$>A`mpEh+_jQ=K909 z!(mcwPv2t{b3vI#`Jz3As#>((4D{^P#WFo#m4p#5$Q+5QVM#}IwM(0C+!duHQo~lj z+5B#Qa_ZxIbFY>Ptj(5Bl9`d-0+Wk;OLv>1JJQ{p*&Zx)TL@PE6zWT`MeG-PW6Xqn ztO?OS&I70au4>k}p2Nv7fpf5w+UaM!-($Y`t zmGA27RMMPE5k2mOr5>d+AO#;9q6POgDc?>hW}j1AOT=J<`xuoiJM#f*tq-h884>U= zlR-C&HU`fO@p8I@G%Pio`9DA+eoH|B{m=Q!a>+`L^zJAzbEee5&8$W!GsOz~(>Ff& zWJsI1__uu?R0;}c=r=NXC3;x!#?6KLDl1VRXKeU6`(|sPwtN`ELN};x;H5rXS;yj- zi+1P7ApOq$&y&U-u)Y33|JRGZ_cV?MxlI_@C5o&J>_CZ2FP&nyNlyyHR@N7sH1yyj zE_ZOPr_xU+4jnLXWNyuU-A;c;)Wl86ex2=s5I>h&iOqXpK8{n&)Kqq?tjANd&pbALbEOe zy53Jb1apnjGWDS5n4?w(4wiP%w)RGCf`Vc#`zqpa|Mr*DHbE@c{6r~3w?yqo0nf;g zmldNIEzA*(Ks=d#Zo$<+%v`i2>IUV(q^`gjqenRq7pR*0dkISPS#8v93yWSoWN;1x zo^L@^4Xv2x6}|#|6`NY~h@ebwP!W{k8is(COP)ur_5Ee=het6uVi|q*vs<+PfwkAhrKD=n$Rd2nv=eM@5<6m7(Q&zCA$&LeOrIZQQAwQ_teEH6>CMMHXLSrp+T{ z9sj~EOqA$;bL-;9$KOVY9UIdR4QLJ+={;~@X?%rI)0RInHVl8wW$uOEspnfj~T8_ z+uSWKnivXu4ir8WAoJvMsA@2>kC8cFtRC2tIi|2X9o(Sx5jKyb398wJh_OLXW*|^I zI<*e?8td)7w{3SBPDs-M>qdQ6vIA6|A8l;v|H9}Yw5?HO$X-+XZ2$4Q?9yy;_JH*Z zOF#UX?Ve3I7Nmjkn-r8^G=-Uc{g+=Ok_70|jd|$`cgS}=R81~@#mW^8$$E01lq|in zC4t@-f}0p*5-4+>b&TU;tAN&~6$^52WR@&Lq1&xzEHYo-5BKvJJ1&tk+rS3Ilwt^L z@OhHVMd#LIAbRwE%;ai|l%3NZsNt#MI=6;V6IZ~E z#nOVapInL-LM1a=BLa4X`Uu;cK^N4_BU$o}AiTKg+Etlzf703Xf6}sP2|DNWRAVP% z^Y`ViZx@7kO$D&*saI-B6Px!$N1{xBF+XU~G7 Date: Mon, 5 Jun 2023 11:09:36 +0100 Subject: [PATCH 098/263] kick off new build now automation has been updated Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> From 9e03f374ce091fd54a0e6eae6718beb88d89f7fe Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Mon, 5 Jun 2023 11:29:39 +0100 Subject: [PATCH 099/263] kick off new build now automation has been updated Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> From 635f91e3e28521e800ce41603768699ae46987f5 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Mon, 5 Jun 2023 11:42:59 +0100 Subject: [PATCH 100/263] slightly more detail in the differing size assertion Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../images/TerminalImageTransformTest.java | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java index 96cf642aa..e7e614fde 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java @@ -106,21 +106,6 @@ private void assertFileContentsSame(byte[] contentsRendered, String testFileToCo } } - try ( InputStream testImageToCompare = this.getClass().getResourceAsStream(testFileToCompareAgainst) - ) { - if (testImageToCompare == null) { - String tempFilePath = writeTempFile(testFileToCompareAgainst,contentsRendered); - System.out.println("Testcase logic info: Tried to open file "+testFileToCompareAgainst+ - " using this.getClass().getResourceAsStream(...) but it was missing. "+ - "... was hoping to compare it to image\n"+tempFilePath); - } else { - System.out.println("Testcase logic info: Opened file "+testFileToCompareAgainst+ - " using this.getClass().getResourceAsStream(...) "); - isCheckedAgainstTestFile = true ; - assertInputStreamContentsSame(testImageToCompare, contentsRendered, testFileToCompareAgainst); - } - } - try ( InputStream testImageToCompare = this.getClass().getResourceAsStream("/"+testFileToCompareAgainst) ) { if (testImageToCompare == null) { @@ -150,7 +135,10 @@ private void assertInputStreamContentsSame( InputStream testImageToCompare , byt if (contentsRendered.length != goodFileContents.length ) { String tempFilePath = writeTempFile(testFileToCompareAgainst,contentsRendered); fail("rendered image is different size to expected."+ - " ... image from the renderer is here:\n"+tempFilePath); + " ... image from the renderer is here:\n"+tempFilePath+ + " rendered image is "+Integer.toString(contentsRendered.length)+" bytes long"+ + " whereas expected image is "+Integer.toString(goodFileContents.length)+" bytes long" + ); } for( int i=0; isSame && i Date: Mon, 5 Jun 2023 13:26:06 +0100 Subject: [PATCH 101/263] Unit tests only run on a mac because of fonts Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../images/TerminalImageTransformTest.java | 67 +++++++++++++----- .../src/test/resources/README.md | 8 ++- .../src/test/resources/linux/README.md | 7 ++ .../testConfidentialTextIsRedacted.png | Bin ...erentColumnsAndRowsRendersInStatusArea.png | Bin .../testEmptyTerminalImageRendersOk.png | Bin ...tInboundTrueRendersInboundInStatusArea.png | Bin .../testOutboundRendersAidInStatusArea.png | Bin .../{ => mac}/testTextAOnAllRowsRendersOk.png | Bin .../testTextAtBottomRightFieldRendersOk.png | Bin .../testTextAtOriginFieldRendersOk.png | Bin .../{ => mac}/testTextFieldRendersOk.png | Bin .../testTextFullRowFieldRendersOk.png | Bin .../src/test/resources/windows/README.md | 7 ++ 14 files changed, 71 insertions(+), 18 deletions(-) create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/linux/README.md rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/{ => mac}/testConfidentialTextIsRedacted.png (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/{ => mac}/testDifferentColumnsAndRowsRendersInStatusArea.png (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/{ => mac}/testEmptyTerminalImageRendersOk.png (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/{ => mac}/testInboundTrueRendersInboundInStatusArea.png (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/{ => mac}/testOutboundRendersAidInStatusArea.png (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/{ => mac}/testTextAOnAllRowsRendersOk.png (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/{ => mac}/testTextAtBottomRightFieldRendersOk.png (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/{ => mac}/testTextAtOriginFieldRendersOk.png (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/{ => mac}/testTextFieldRendersOk.png (100%) rename galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/{ => mac}/testTextFullRowFieldRendersOk.png (100%) create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/windows/README.md diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java index e7e614fde..95cc0d0dd 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java @@ -85,13 +85,40 @@ private void checkTerminalImageAgainstExpected(TerminalImageTransform transform, String testFileToCompareAgainst = testName.getMethodName()+".png"; - assertFileContentsSame( contentsRendered , testFileToCompareAgainst); + String imageFolderName = getImageFolderName(); + if ( imageFolderName == null ) { + System.out.println("The operating system you are running on doesn't have the same fonts installed"+ + " as when the test data images were recorded and checked for correctness."+ + " As a result, this test cannot check the expected vs actual images rendered." + ); + } else { + assertFileContentsSame( contentsRendered , testFileToCompareAgainst , imageFolderName ); + } } - private void assertFileContentsSame(byte[] contentsRendered, String testFileToCompareAgainst) throws IOException { + private String getImageFolderName() { + String folderName = null; + + String osName = System.getProperty("os.name"); + + // We have mac images captured and stored waiting to be compared against. + if (osName == "Mac OS X") { + folderName = "mac"; + } + + // Other operating systems have different fonts, so the rendered images look different. + + return folderName ; + } + + private void assertFileContentsSame( + byte[] contentsRendered, + String testFileToCompareAgainst, + String imageFolderName + ) throws IOException { boolean isCheckedAgainstTestFile = false ; - try ( InputStream testImageToCompare = this.getClass().getClassLoader().getResourceAsStream(testFileToCompareAgainst) + try ( InputStream testImageToCompare = this.getClass().getClassLoader().getResourceAsStream(imageFolderName+"/"+testFileToCompareAgainst) ) { if (testImageToCompare == null) { String tempFilePath = writeTempFile(testFileToCompareAgainst,contentsRendered); @@ -106,20 +133,20 @@ private void assertFileContentsSame(byte[] contentsRendered, String testFileToCo } } - try ( InputStream testImageToCompare = this.getClass().getResourceAsStream("/"+testFileToCompareAgainst) - ) { - if (testImageToCompare == null) { - String tempFilePath = writeTempFile(testFileToCompareAgainst,contentsRendered); - System.out.println("Testcase logic info: Tried to open file "+testFileToCompareAgainst+ - " using this.getClass().getResourceAsStream('/'+...) but it was missing. "+ - "... was hoping to compare it to image\n"+tempFilePath); - } else { - System.out.println("Testcase logic info: Opened file "+testFileToCompareAgainst+ - " using this.getClass().getResourceAsStream('/'+...)"); - isCheckedAgainstTestFile = true ; - assertInputStreamContentsSame(testImageToCompare, contentsRendered, testFileToCompareAgainst); - } - } + // try ( InputStream testImageToCompare = this.getClass().getResourceAsStream("/"+imageFolderName+"/"+testFileToCompareAgainst) + // ) { + // if (testImageToCompare == null) { + // String tempFilePath = writeTempFile(testFileToCompareAgainst,contentsRendered); + // System.out.println("Testcase logic info: Tried to open file "+testFileToCompareAgainst+ + // " using this.getClass().getResourceAsStream('/'+...) but it was missing. "+ + // "... was hoping to compare it to image\n"+tempFilePath); + // } else { + // System.out.println("Testcase logic info: Opened file "+testFileToCompareAgainst+ + // " using this.getClass().getResourceAsStream('/'+...)"); + // isCheckedAgainstTestFile = true ; + // assertInputStreamContentsSame(testImageToCompare, contentsRendered, testFileToCompareAgainst); + // } + // } if (!isCheckedAgainstTestFile) { fail("Testcase logic failure. Could not open test data file "+testFileToCompareAgainst+" so we could use it to compare with what was generated"); @@ -130,6 +157,9 @@ private void assertInputStreamContentsSame( InputStream testImageToCompare , byt byte[] goodFileContents = testImageToCompare.readAllBytes(); + System.out.println("rendered image is "+Integer.toString(contentsRendered.length)+" bytes long"); + System.out.println("expected image is "+Integer.toString(goodFileContents.length)+" bytes long"); + boolean isSame = true ; if (contentsRendered.length != goodFileContents.length ) { @@ -145,6 +175,9 @@ private void assertInputStreamContentsSame( InputStream testImageToCompare , byt byte got = contentsRendered[i]; byte expected = goodFileContents[i]; if (got != expected) { + System.out.println("Byte "+Integer.toString(i)+" of images being compared don't match."); + System.out.println("Rendered image byte value:"+Byte.toString(got)); + System.out.println("Expected image byte value:"+Byte.toString(expected)); isSame = false; } } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/README.md b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/README.md index 7850daf46..b58bfd1e5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/README.md +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/README.md @@ -5,4 +5,10 @@ If a test fails for any reason, the image rendered is placed in a temporary fold and a System.out.println inside the testcase tells us where it was placed. Go look at the temporary file and visually compare it to what you expect. -If it's good, copy that file here. \ No newline at end of file +If it's good, copy that file here. + +Note: Recorded images on a mac are not the same as those of other platforms. +Each platform has slightly different fonts, so the images render slightly differently, +taking up different amounts of spacing in the .png format. +As a result of this, we have folders for each platform, not all of which may be populated/supported. + diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/linux/README.md b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/linux/README.md new file mode 100644 index 000000000..5b7039247 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/linux/README.md @@ -0,0 +1,7 @@ + + +Linux test images + +So far nobody has recorded and checked any test images manually. + +The test case currently ignores image-compare tests on linux. \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testConfidentialTextIsRedacted.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testConfidentialTextIsRedacted.png similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testConfidentialTextIsRedacted.png rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testConfidentialTextIsRedacted.png diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testDifferentColumnsAndRowsRendersInStatusArea.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testDifferentColumnsAndRowsRendersInStatusArea.png similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testDifferentColumnsAndRowsRendersInStatusArea.png rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testDifferentColumnsAndRowsRendersInStatusArea.png diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testEmptyTerminalImageRendersOk.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testEmptyTerminalImageRendersOk.png similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testEmptyTerminalImageRendersOk.png rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testEmptyTerminalImageRendersOk.png diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testInboundTrueRendersInboundInStatusArea.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testInboundTrueRendersInboundInStatusArea.png similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testInboundTrueRendersInboundInStatusArea.png rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testInboundTrueRendersInboundInStatusArea.png diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testOutboundRendersAidInStatusArea.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testOutboundRendersAidInStatusArea.png similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testOutboundRendersAidInStatusArea.png rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testOutboundRendersAidInStatusArea.png diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextAOnAllRowsRendersOk.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testTextAOnAllRowsRendersOk.png similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextAOnAllRowsRendersOk.png rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testTextAOnAllRowsRendersOk.png diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextAtBottomRightFieldRendersOk.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testTextAtBottomRightFieldRendersOk.png similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextAtBottomRightFieldRendersOk.png rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testTextAtBottomRightFieldRendersOk.png diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextAtOriginFieldRendersOk.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testTextAtOriginFieldRendersOk.png similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextAtOriginFieldRendersOk.png rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testTextAtOriginFieldRendersOk.png diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextFieldRendersOk.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testTextFieldRendersOk.png similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextFieldRendersOk.png rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testTextFieldRendersOk.png diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextFullRowFieldRendersOk.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testTextFullRowFieldRendersOk.png similarity index 100% rename from galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/testTextFullRowFieldRendersOk.png rename to galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testTextFullRowFieldRendersOk.png diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/windows/README.md b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/windows/README.md new file mode 100644 index 000000000..6b905ca1e --- /dev/null +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/windows/README.md @@ -0,0 +1,7 @@ + + +Windows test images + +So far nobody has recorded and checked any test images manually. + +The test case currently ignores image-compare tests on windows. \ No newline at end of file From be810e15b74b98e406cccb0da735b2b13d9c77e6 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Mon, 5 Jun 2023 14:10:07 +0100 Subject: [PATCH 102/263] update common manager version Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../dev.galasa.zos3270.common/build.gradle | 2 +- release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle index b8a4eb53e..fc6761cc3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS 3270 Terminal Manager - Common Packages' -version = '0.25.0' +version = '0.28.0' dependencies { testImplementation 'com.google.code.gson:gson:2.8.5' diff --git a/release.yaml b/release.yaml index ac4f061d2..09ebfd010 100644 --- a/release.yaml +++ b/release.yaml @@ -486,7 +486,7 @@ managers: codecoverage: true - artifact: dev.galasa.zos3270.common - version: 0.25.0 + version: 0.28.0 obr: true bom: true mvp: true From 649b50f6eca27701bb26396f75f6f7af5c88434c Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Mon, 5 Jun 2023 14:14:06 +0100 Subject: [PATCH 103/263] Removed commented-out code as per PR review. Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../dev.galasa.zos3270.common/build.gradle | 7 ------- .../screens/images/TerminalImageTransformTest.java | 14 -------------- 2 files changed, 21 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle index f05457750..08c30633a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle @@ -1,6 +1,5 @@ plugins { id 'galasa.manager' - // id 'java' } description = 'Galasa zOS 3270 Terminal Manager - Common Packages' @@ -10,9 +9,3 @@ version = '0.25.0' dependencies { implementation 'com.google.code.gson:gson:2.8.9' } - -// task copyTestResources(type: Copy) { -// from "${projectDir}/src/test/resources" -// into "${buildDir}/test/resources" -// } -// processTestResources.dependsOn copyTestResources diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java index 95cc0d0dd..01dedabe5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java @@ -133,20 +133,6 @@ private void assertFileContentsSame( } } - // try ( InputStream testImageToCompare = this.getClass().getResourceAsStream("/"+imageFolderName+"/"+testFileToCompareAgainst) - // ) { - // if (testImageToCompare == null) { - // String tempFilePath = writeTempFile(testFileToCompareAgainst,contentsRendered); - // System.out.println("Testcase logic info: Tried to open file "+testFileToCompareAgainst+ - // " using this.getClass().getResourceAsStream('/'+...) but it was missing. "+ - // "... was hoping to compare it to image\n"+tempFilePath); - // } else { - // System.out.println("Testcase logic info: Opened file "+testFileToCompareAgainst+ - // " using this.getClass().getResourceAsStream('/'+...)"); - // isCheckedAgainstTestFile = true ; - // assertInputStreamContentsSame(testImageToCompare, contentsRendered, testFileToCompareAgainst); - // } - // } if (!isCheckedAgainstTestFile) { fail("Testcase logic failure. Could not open test data file "+testFileToCompareAgainst+" so we could use it to compare with what was generated"); From 18255192a7962bd64326dcc1a402fc64e4072d90 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Mon, 5 Jun 2023 14:20:33 +0100 Subject: [PATCH 104/263] export the screens/images and screens/json packages Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../dev.galasa.zos3270.common/bnd.bnd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/bnd.bnd b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/bnd.bnd index 2da9be594..a50a3e7fe 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/bnd.bnd @@ -1,5 +1,7 @@ -snapshot: ${tstamp} Bundle-Name: Galasa zOS 3270 Terminal Manager - Common Packages -Export-Package: dev.galasa.zos3270.common.screens +Export-Package: dev.galasa.zos3270.common.screens,\ + dev.galasa.zos3270.common.screens.images,\ + dev.galasa.zos3270.common.screens.json Import-Package: javax.validation.constraints;resolution:=optional From 2b7a584c2efe87bc2ab40facf671d421fb6eebb5 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Wed, 7 Jun 2023 13:51:03 +0100 Subject: [PATCH 105/263] Add CPS property to set 3270 code page (#877) * Add CPS prop to set code page, refactor unit tests Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> * Use TerminalSize instead of ints to set terminal sizes Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> * Deprecate changed constructors, update copyright Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> * Bump 3270 manager to 0.28.0, add valid values to code page CPS prop Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> * Add codePage param to RA order constructor Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> * Fix copyright Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> * Deprecate changed constructors Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> * Undo change to deprecated constructors Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> * More copyright updates Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --------- Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../cicsts/internal/CicstsManagerImpl.java | 4 +- .../galasa/cicsts/spi/CicsTerminalImpl.java | 10 +- .../main/java/dev/galasa/zos/IZosImage.java | 10 ++ .../galasa/zos/internal/ZosBaseImageImpl.java | 10 ++ .../internal/properties/ImageCodePage.java | 36 +++++++ .../dev.galasa.zos3270.manager/build.gradle | 2 +- .../zos3270/internal/Zos3270ManagerImpl.java | 10 +- .../zos3270/internal/comms/NetworkThread.java | 20 ++-- .../datastream/OrderRepeatToAddress.java | 12 +-- .../internal/datastream/OrderText.java | 12 +-- .../internal/datastream/StructuredField.java | 10 +- .../datastream/StructuredField3270DS.java | 9 +- .../gherkin/Gherkin3270GivenTerminal.java | 9 +- .../zos3270/spi/BufferCarrageReturn.java | 8 +- .../dev/galasa/zos3270/spi/BufferChar.java | 10 +- .../galasa/zos3270/spi/BufferEndOfMedium.java | 8 +- .../galasa/zos3270/spi/BufferFormFeed.java | 8 +- .../zos3270/spi/BufferGraphicsEscape.java | 8 +- .../dev/galasa/zos3270/spi/BufferNewLine.java | 8 +- .../java/dev/galasa/zos3270/spi/Screen.java | 55 ++++++++++- .../java/dev/galasa/zos3270/spi/Terminal.java | 25 +++++ .../zos3270/spi/Zos3270TerminalImpl.java | 58 ++++++++++++ .../commandcodes/ReadModifiedTest.java | 93 ++++++++++--------- .../galasa/zos3270/cursor/BackSpaceTest.java | 21 +++-- .../galasa/zos3270/cursor/BackTabTest.java | 17 ++-- .../zos3270/cursor/FieldOverflowTest.java | 9 +- .../dev/galasa/zos3270/cursor/HomeTest.java | 17 ++-- .../galasa/zos3270/cursor/NewLineTest.java | 27 +++--- .../dev/galasa/zos3270/cursor/TabTest.java | 21 +++-- .../EraseUnprotectedToAddressTest.java | 6 +- .../datastream/GraphicsEscapeTest.java | 6 +- .../zos3270/datastream/InboundTest.java | 52 +++++++++++ .../zos3270/datastream/OrderTextTest.java | 5 +- .../datastream/QueryReplySummaryTest.java | 5 +- .../datastream/QueryReplyUsableAreaTest.java | 5 +- .../datastream/RepeatToAddressTest.java | 5 +- .../zos3270/datastream/VampScreenTest.java | 6 +- .../extended/ExtendedDatastreamTest.java | 25 ++--- .../structuredfields/ReadPartitionTest.java | 10 +- .../zos3270/network/Network3270Test.java | 6 +- .../orders/EraseAllUnprotectedTest.java | 45 ++++----- .../zos3270/orders/GraphicsEscapeTest.java | 15 +-- .../galasa/zos3270/terminal/CursorTest.java | 21 +++-- .../zos3270/terminal/EraseInputTest.java | 37 ++++---- .../galasa/zos3270/terminal/FindTextTest.java | 19 ++-- .../zos3270/terminal/RetrieveTextTest.java | 33 ++++--- .../galasa/zos3270/terminal/ScreenTest.java | 55 +++++------ .../galasa/zos3270/util/Zos3270TestBase.java | 55 +++++++++++ .../src/test/java/t/TestColour.java | 5 +- .../src/test/java/t/TestInbound.java | 5 +- release.yaml | 2 +- 51 files changed, 648 insertions(+), 322 deletions(-) create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ImageCodePage.java create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/InboundTest.java create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/Zos3270TestBase.java diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java index 1ba0094cf..4aa58aef7 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java @@ -46,11 +46,9 @@ import dev.galasa.framework.spi.IManager; import dev.galasa.framework.spi.ResourceUnavailableException; import dev.galasa.framework.spi.language.GalasaTest; -import dev.galasa.ipnetwork.IpNetworkManagerException; import dev.galasa.textscan.spi.ITextScannerManagerSpi; import dev.galasa.zos.spi.IZosManagerSpi; import dev.galasa.zos3270.TerminalInterruptedException; -import dev.galasa.zos3270.Zos3270ManagerException; import dev.galasa.zosbatch.IZosBatch; import dev.galasa.zosbatch.spi.IZosBatchSpi; import dev.galasa.zosfile.IZosFileHandler; @@ -237,7 +235,7 @@ public ICicsTerminal generateCicsTerminal(String tag) throws CicstsManagerExcept CicsTerminalImpl newTerminal = new CicsTerminalImpl(this, getFramework(), region, true, this.textScanner); this.terminals.add(newTerminal); return newTerminal; - } catch (TerminalInterruptedException | IpNetworkManagerException | Zos3270ManagerException e) { + } catch (TerminalInterruptedException | ManagerException e) { throw new CicstsManagerException( "Unable to setup CICS Terminal for tagged region " + tag, e); } diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java index a40fee506..e26246719 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java @@ -13,11 +13,13 @@ import dev.galasa.ipnetwork.IIpHost; import dev.galasa.ipnetwork.IpNetworkManagerException; import dev.galasa.textscan.spi.ITextScannerManagerSpi; +import dev.galasa.zos.ZosManagerException; import dev.galasa.zos3270.FieldNotFoundException; import dev.galasa.zos3270.KeyboardLockedException; import dev.galasa.zos3270.TerminalInterruptedException; import dev.galasa.zos3270.TimeoutException; import dev.galasa.zos3270.Zos3270ManagerException; +import dev.galasa.zos3270.common.screens.TerminalSize; import dev.galasa.zos3270.spi.NetworkException; import dev.galasa.zos3270.spi.Zos3270TerminalImpl; @@ -31,8 +33,8 @@ public class CicsTerminalImpl extends Zos3270TerminalImpl implements ICicsTermin public final boolean connectAtStartup; public CicsTerminalImpl(ICicstsManagerSpi cicstsManager, IFramework framework, ICicsRegionProvisioned cicsRegion, String host, int port, boolean ssl, boolean connectAtStartup, ITextScannerManagerSpi textScanner) - throws TerminalInterruptedException, Zos3270ManagerException { - super(cicsRegion.getNextTerminalId(), host, port, ssl, framework, false, cicsRegion.getZosImage(), 80, 24, 0, 0, textScanner); + throws TerminalInterruptedException, Zos3270ManagerException, ZosManagerException { + super(cicsRegion.getNextTerminalId(), host, port, ssl, framework, false, cicsRegion.getZosImage(), new TerminalSize(80, 24), new TerminalSize(0, 0), textScanner); this.cicsRegion = cicsRegion; this.cicstsManager = cicstsManager; @@ -42,12 +44,12 @@ public CicsTerminalImpl(ICicstsManagerSpi cicstsManager, IFramework framework, I } public CicsTerminalImpl(ICicstsManagerSpi cicstsManager, IFramework framework, ICicsRegionProvisioned cicsRegion, IIpHost ipHost, boolean connectAtStartup, ITextScannerManagerSpi textScanner) - throws TerminalInterruptedException, IpNetworkManagerException, Zos3270ManagerException { + throws TerminalInterruptedException, IpNetworkManagerException, Zos3270ManagerException, ZosManagerException { this(cicstsManager, framework, cicsRegion, ipHost.getHostname(), ipHost.getTelnetPort(), ipHost.isTelnetPortTls(), connectAtStartup, textScanner); } public CicsTerminalImpl(ICicstsManagerSpi cicstsManager, IFramework framework, ICicsRegionProvisioned cicsRegion, boolean connectAtStartup, ITextScannerManagerSpi textScanner) throws TerminalInterruptedException, IpNetworkManagerException, - Zos3270ManagerException { + Zos3270ManagerException, ZosManagerException { this(cicstsManager, framework, cicsRegion, cicsRegion.getZosImage().getIpHost(), connectAtStartup, textScanner); } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosImage.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosImage.java index 3777ff51a..c2939bce9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosImage.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosImage.java @@ -3,6 +3,8 @@ */ package dev.galasa.zos; +import java.nio.charset.Charset; + import javax.validation.constraints.NotNull; import dev.galasa.ICredentials; @@ -49,6 +51,14 @@ public interface IZosImage { */ String getClusterID(); + /** + * Get the code page of this zOS Image. Defaults to 037 + * + * @return The EBCDIC code page, never null + */ + @NotNull + Charset getCodePage(); + /** * Get the default host name for this Image * diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosBaseImageImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosBaseImageImpl.java index 11748c739..c04b8d9f7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosBaseImageImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosBaseImageImpl.java @@ -3,6 +3,8 @@ */ package dev.galasa.zos.internal; +import java.nio.charset.Charset; + import javax.validation.constraints.NotNull; import dev.galasa.ICredentials; @@ -12,6 +14,7 @@ import dev.galasa.framework.spi.creds.ICredentialsService; import dev.galasa.zos.IZosImage; import dev.galasa.zos.ZosManagerException; +import dev.galasa.zos.internal.properties.ImageCodePage; import dev.galasa.zos.internal.properties.ImageSysname; public abstract class ZosBaseImageImpl implements IZosImage { @@ -25,6 +28,7 @@ public abstract class ZosBaseImageImpl implements IZosImage { private final String sysplexID; private final String defaultCredentialsId; private final ZosIpHostImpl ipHost; + private final Charset codePage; private final String runTemporaryUNIXPath; private final String javaHome; @@ -42,6 +46,7 @@ public ZosBaseImageImpl(ZosManagerImpl zosManager, String imageId, String cluste this.clusterId = clusterId; try { + this.codePage = ImageCodePage.get(this.imageId); this.sysname = ImageSysname.get(this.imageId); this.sysplexID = AbstractManager.nulled(this.cps.getProperty("image." + this.imageId, "sysplex")); this.defaultCredentialsId = AbstractManager.defaultString(this.cps.getProperty("image", "credentials", this.imageId), "ZOS"); @@ -92,6 +97,11 @@ public String getClusterID() { return this.clusterId; } + @Override + public @NotNull Charset getCodePage() { + return this.codePage; + } + @Override public @NotNull String getDefaultHostname() throws ZosManagerException { return this.ipHost.getHostname(); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ImageCodePage.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ImageCodePage.java new file mode 100644 index 000000000..492c89b46 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ImageCodePage.java @@ -0,0 +1,36 @@ +/* + * Copyright contributors to the Galasa project + */ +package dev.galasa.zos.internal.properties; + +import java.nio.charset.Charset; + +import dev.galasa.framework.spi.cps.CpsProperties; +import dev.galasa.zos.ZosManagerException; + +/** + * The code page for a zOS Image + * + * @galasa.cps.property + * + * @galasa.name zos.image.[tag].codepage + * + * @galasa.description The code page set for a zOS Image with the specified tag + * + * @galasa.required No + * + * @galasa.valid_values A valid java.nio.charset EBCDIC character encoding (e.g. 037, 1047) + * + * @galasa.default 037 + * + * @galasa.examples + * zos.image.[tag].codepage=1047
      + * + */ +public class ImageCodePage extends CpsProperties { + + public static Charset get(String imageId) throws ZosManagerException { + String codePage = getStringWithDefault(ZosPropertiesSingleton.cps(), "037", "image", "codepage", imageId); + return Charset.forName(codePage); + } +} diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle index 12efdc146..59c4287bc 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS 3270 Terminal Manager' -version = '0.26.0' +version = '0.28.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zos3270.common') diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java index 5d2a24c71..c4970b50d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java @@ -35,6 +35,7 @@ import dev.galasa.zos3270.TerminalInterruptedException; import dev.galasa.zos3270.Zos3270ManagerException; import dev.galasa.zos3270.Zos3270Terminal; +import dev.galasa.zos3270.common.screens.TerminalSize; import dev.galasa.zos3270.internal.gherkin.Gherkin3270Coordinator; import dev.galasa.zos3270.internal.properties.ExtraBundles; import dev.galasa.zos3270.internal.properties.Zos3270PropertiesSingleton; @@ -150,11 +151,14 @@ public ITerminal generateTerminal(Field field, List annotations) thr String tag = defaultString(terminalAnnotation.imageTag(), "PRIMARY").toUpperCase(); // *** Default the tag to primary boolean autoConnect = terminalAnnotation.autoConnect(); + + TerminalSize primaryTerminalSize = new TerminalSize(terminalAnnotation.primaryColumns(), terminalAnnotation.primaryRows()); + TerminalSize alternateTerminalSize = new TerminalSize(terminalAnnotation.alternateColumns(), terminalAnnotation.alternateRows()); - return generateTerminal(tag, autoConnect, terminalAnnotation.primaryColumns(), terminalAnnotation.primaryRows(), terminalAnnotation.alternateColumns(), terminalAnnotation.alternateRows()); + return generateTerminal(tag, autoConnect, primaryTerminalSize, alternateTerminalSize); } - public Zos3270TerminalImpl generateTerminal(String imageTag, boolean autoConnect, int primaryColumns, int primaryRows, int alternateColumns, int alternateRows) throws Zos3270ManagerException { + public Zos3270TerminalImpl generateTerminal(String imageTag, boolean autoConnect, TerminalSize primarySize, TerminalSize alternateSize) throws Zos3270ManagerException { // *** Ask the zosManager for the image for the Tag try { IZosImage image = this.zosManager.provisionImageForTag(imageTag); @@ -164,7 +168,7 @@ public Zos3270TerminalImpl generateTerminal(String imageTag, boolean autoConnect String terminaId = "term" + (terminalCount); Zos3270TerminalImpl terminal = new Zos3270TerminalImpl(terminaId, host.getHostname(), host.getTelnetPort(), - host.isTelnetPortTls(), getFramework(), autoConnect, image,primaryColumns, primaryRows, alternateColumns, alternateRows, textScannerManager); + host.isTelnetPortTls(), getFramework(), autoConnect, image, primarySize, alternateSize, textScannerManager); this.terminals.add(terminal); logger.info("Generated a terminal for zOS Image tagged " + imageTag); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/NetworkThread.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/NetworkThread.java index abf2f3276..8ad3b7129 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/NetworkThread.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/NetworkThread.java @@ -846,13 +846,13 @@ public Inbound3270Message process3270Data(ByteBuffer buffer) throws NetworkExcep AbstractCommandCode commandCode = AbstractCommandCode.getCommandCode(buffer.get()); if (commandCode instanceof CommandWriteStructured) { - return processStructuredFields((CommandWriteStructured) commandCode, buffer); + return processStructuredFields((CommandWriteStructured) commandCode, buffer, screen.getCodePage()); } else { - return process3270Datastream(commandCode, buffer); + return process3270Datastream(commandCode, buffer, screen.getCodePage()); } } - public static Inbound3270Message process3270Datastream(AbstractCommandCode commandCode, ByteBuffer buffer) + public static Inbound3270Message process3270Datastream(AbstractCommandCode commandCode, ByteBuffer buffer, Charset codePage) throws DatastreamException { if (!buffer.hasRemaining()) { @@ -861,12 +861,12 @@ public static Inbound3270Message process3270Datastream(AbstractCommandCode comma WriteControlCharacter writeControlCharacter = new WriteControlCharacter(buffer.get()); - List orders = processOrders(buffer); + List orders = processOrders(buffer, codePage); return new Inbound3270Message(commandCode, writeControlCharacter, orders); } - public static List processOrders(ByteBuffer buffer) throws DatastreamException { + public static List processOrders(ByteBuffer buffer, Charset codePage) throws DatastreamException { OrderText orderText = null; ArrayList orders = new ArrayList<>(); @@ -882,7 +882,7 @@ public static List processOrders(ByteBuffer buffer) throws Datast order = new OrderSetBufferAddress(buffer); break; case OrderRepeatToAddress.ID: - order = new OrderRepeatToAddress(buffer); + order = new OrderRepeatToAddress(buffer, codePage); break; case OrderStartField.ID: order = new OrderStartField(buffer); @@ -920,12 +920,12 @@ public static List processOrders(ByteBuffer buffer) throws Datast default: String byteHex = Hex.encodeHexString(new byte[] { orderByte }); logger.trace("Invalid byte detected in datastream, unrecognised byte order or text byte - 0x" + byteHex); - order = new OrderText(" "); + order = new OrderText(" ", codePage); } orders.add(order); } else { if (orderText == null) { - orderText = new OrderText(); + orderText = new OrderText(codePage); orders.add(orderText); } orderText.append(orderByte); @@ -934,7 +934,7 @@ public static List processOrders(ByteBuffer buffer) throws Datast return orders; } - public static Inbound3270Message processStructuredFields(CommandWriteStructured commandCode, ByteBuffer buffer) + public static Inbound3270Message processStructuredFields(CommandWriteStructured commandCode, ByteBuffer buffer, Charset codePage) throws NetworkException { ArrayList structuredFields = new ArrayList<>(); @@ -950,7 +950,7 @@ public static Inbound3270Message processStructuredFields(CommandWriteStructured byte[] sfData = new byte[length - 2]; buffer.get(sfData); - structuredFields.add(StructuredField.getStructuredField(sfData)); + structuredFields.add(StructuredField.getStructuredField(sfData, codePage)); } return new Inbound3270Message(commandCode, structuredFields); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderRepeatToAddress.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderRepeatToAddress.java index 60141a74a..d4a416a4b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderRepeatToAddress.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderRepeatToAddress.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.internal.datastream; @@ -12,7 +10,7 @@ public class OrderRepeatToAddress extends AbstractOrder { - private static final Charset ebcdic = Charset.forName("Cp037"); + private final Charset ebcdic; public static final byte ID = 0x3c; @@ -20,7 +18,8 @@ public class OrderRepeatToAddress extends AbstractOrder { private final char repeatChar; - public OrderRepeatToAddress(ByteBuffer buffer) throws DatastreamException { + public OrderRepeatToAddress(ByteBuffer buffer, Charset codePage) throws DatastreamException { + this.ebcdic = codePage; this.bufferAddress = new BufferAddress(buffer); byte[] charByte = new byte[] { buffer.get() }; @@ -31,7 +30,8 @@ public OrderRepeatToAddress(ByteBuffer buffer) throws DatastreamException { repeatChar = ebcdic.decode(ByteBuffer.wrap(charByte)).array()[0]; } - public OrderRepeatToAddress(char repeatChar, BufferAddress bufferAddress) { + public OrderRepeatToAddress(char repeatChar, BufferAddress bufferAddress, Charset codePage) { + this.ebcdic = codePage; this.bufferAddress = bufferAddress; this.repeatChar = repeatChar; } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderText.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderText.java index f21bb8e31..6a1fda07a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderText.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderText.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.internal.datastream; @@ -10,14 +8,16 @@ public class OrderText extends AbstractOrder { - public static final Charset ebcdic = Charset.forName("Cp037"); + private final Charset ebcdic; private StringBuilder text = new StringBuilder(); - public OrderText() { + public OrderText(Charset codePage) { + this.ebcdic = codePage; } - public OrderText(String newText) { + public OrderText(String newText, Charset codePage) { + this.ebcdic = codePage; this.text.append(newText); } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/StructuredField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/StructuredField.java index 4d9ae5d1a..327e77158 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/StructuredField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/StructuredField.java @@ -1,10 +1,10 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.internal.datastream; +import java.nio.charset.Charset; + import dev.galasa.zos3270.spi.NetworkException; public class StructuredField { @@ -15,12 +15,12 @@ public class StructuredField { protected StructuredField() { } - public static StructuredField getStructuredField(byte[] sfData) throws NetworkException { + public static StructuredField getStructuredField(byte[] sfData, Charset codePage) throws NetworkException { switch (sfData[0]) { case SF_READ_PARTITION: return new StructuredFieldReadPartition(sfData); case SF_3270_DS: - return new StructuredField3270DS(sfData); + return new StructuredField3270DS(sfData, codePage); default: throw new NetworkException("Unknown Structured Field = " + sfData[0]); } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/StructuredField3270DS.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/StructuredField3270DS.java index be4751a59..6ab26773f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/StructuredField3270DS.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/StructuredField3270DS.java @@ -1,11 +1,10 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.internal.datastream; import java.nio.ByteBuffer; +import java.nio.charset.Charset; import dev.galasa.zos3270.internal.comms.Inbound3270Message; import dev.galasa.zos3270.internal.comms.NetworkThread; @@ -16,7 +15,7 @@ public class StructuredField3270DS extends StructuredField { private Inbound3270Message inbound3270Message; - public StructuredField3270DS(byte[] structuredFieldData) throws NetworkException { + public StructuredField3270DS(byte[] structuredFieldData, Charset codePage) throws NetworkException { if (structuredFieldData.length < 3) { throw new DatastreamException("Structured Field 3270 DS length < 3 bytes"); } @@ -25,7 +24,7 @@ public StructuredField3270DS(byte[] structuredFieldData) throws NetworkException ByteBuffer buffer = ByteBuffer.wrap(structuredFieldData, 3, structuredFieldData.length - 3); - inbound3270Message = NetworkThread.process3270Datastream(commandCode, buffer); + inbound3270Message = NetworkThread.process3270Datastream(commandCode, buffer, codePage); } public Inbound3270Message getInboundMessage() { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270GivenTerminal.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270GivenTerminal.java index 04c348117..2b5cdc45d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270GivenTerminal.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270GivenTerminal.java @@ -1,3 +1,6 @@ +/* + * Copyright contributors to the Galasa project + */ package dev.galasa.zos3270.internal.gherkin; import java.util.List; @@ -11,6 +14,7 @@ import dev.galasa.framework.spi.language.gherkin.ExecutionMethod; import dev.galasa.framework.spi.language.gherkin.GherkinKeyword; import dev.galasa.zos3270.Zos3270ManagerException; +import dev.galasa.zos3270.common.screens.TerminalSize; import dev.galasa.zos3270.internal.Zos3270ManagerImpl; import dev.galasa.zos3270.spi.Zos3270TerminalImpl; @@ -47,7 +51,10 @@ public void provision(IGherkinExecutable executable) throws Zos3270ManagerExcept Zos3270TerminalImpl newTerminal = this.gerkinCoordinator.getTerminal(terminalId); if (newTerminal == null) { - newTerminal = this.manager.generateTerminal(imageTag, true, 80, 24, 0, 0); + TerminalSize terminalSize = new TerminalSize(80, 24); + TerminalSize alternateSize = new TerminalSize(0, 0); + + newTerminal = this.manager.generateTerminal(imageTag, true, terminalSize, alternateSize); this.gerkinCoordinator.registerTerminal(terminalId, newTerminal, imageTag); logger.info("zOS 3270 Terminal id '" + terminalId + "' as been provisioned for image tag '" + imageTag + "'"); } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferCarrageReturn.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferCarrageReturn.java index 77c1342df..d203357f5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferCarrageReturn.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferCarrageReturn.java @@ -1,10 +1,10 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.spi; +import java.nio.charset.Charset; + public class BufferCarrageReturn extends BufferChar { public BufferCarrageReturn() { @@ -27,7 +27,7 @@ public char getChar() { } @Override - public byte getFieldEbcdic() { + public byte getFieldEbcdic(Charset codePage) { return 0x0d; } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferChar.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferChar.java index d9e16966c..fd7b7f436 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferChar.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferChar.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.spi; @@ -9,8 +7,6 @@ public class BufferChar implements IBufferHolder { - private static final Charset ebcdic = Charset.forName("Cp037"); - private final char character; public BufferChar(char character) { @@ -39,14 +35,14 @@ public char getChar() { return this.character; } - public byte getFieldEbcdic() { + public byte getFieldEbcdic(Charset codePage) { if (this.character == 0) { return 0; } String value = new String(new char[] { this.character }); - return value.getBytes(ebcdic)[0]; + return value.getBytes(codePage)[0]; } } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferEndOfMedium.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferEndOfMedium.java index 60a3e4ed8..8a54030ac 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferEndOfMedium.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferEndOfMedium.java @@ -1,10 +1,10 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.spi; +import java.nio.charset.Charset; + public class BufferEndOfMedium extends BufferChar { public BufferEndOfMedium() { @@ -27,7 +27,7 @@ public char getChar() { } @Override - public byte getFieldEbcdic() { + public byte getFieldEbcdic(Charset codePage) { return 0x19; } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferFormFeed.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferFormFeed.java index 32e689b61..4fc83f9b3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferFormFeed.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferFormFeed.java @@ -1,10 +1,10 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.spi; +import java.nio.charset.Charset; + public class BufferFormFeed extends BufferChar { public BufferFormFeed() { @@ -27,7 +27,7 @@ public char getChar() { } @Override - public byte getFieldEbcdic() { + public byte getFieldEbcdic(Charset codePage) { return 0x0c; } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferGraphicsEscape.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferGraphicsEscape.java index 80a8e6b76..912711d50 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferGraphicsEscape.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferGraphicsEscape.java @@ -1,10 +1,10 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.spi; +import java.nio.charset.Charset; + import org.apache.commons.codec.binary.Hex; public class BufferGraphicsEscape extends BufferChar { @@ -35,7 +35,7 @@ public char getChar() { } @Override - public byte getFieldEbcdic() { + public byte getFieldEbcdic(Charset codePage) { return this.data; } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferNewLine.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferNewLine.java index c194d0b88..87b046cf0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferNewLine.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferNewLine.java @@ -1,10 +1,10 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project */ package dev.galasa.zos3270.spi; +import java.nio.charset.Charset; + public class BufferNewLine extends BufferChar { public BufferNewLine() { @@ -27,7 +27,7 @@ public char getChar() { } @Override - public byte getFieldEbcdic() { + public byte getFieldEbcdic(Charset codePage) { return 0x15; } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Screen.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Screen.java index 15f1c7b18..b45b071f0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Screen.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Screen.java @@ -5,6 +5,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -25,6 +26,7 @@ import dev.galasa.zos3270.IDatastreamListener.DatastreamDirection; import dev.galasa.zos3270.IScreenUpdateListener; import dev.galasa.zos3270.IScreenUpdateListener.Direction; +import dev.galasa.zos3270.common.screens.TerminalSize; import dev.galasa.zos3270.KeyboardLockedException; import dev.galasa.zos3270.TerminalInterruptedException; import dev.galasa.zos3270.TextNotFoundException; @@ -81,6 +83,8 @@ public class Screen { private static final String CANT_FIND_TEXT = "Unable to find a field containing '"; + + private final Charset codePage; private final Log logger = LogFactory.getLog(getClass()); @@ -112,15 +116,31 @@ public class Screen { private boolean detectedSetAttribute = false; + /** + * @deprecated use the {@link #Screen(TerminalSize primarySize, TerminalSize alternateSize, Network network, Charset codePage)} + * constructor instead. + */ + @Deprecated(since = "0.28.0", forRemoval = true) public Screen() throws TerminalInterruptedException { this(80, 24, null); } + /** + * @deprecated use the {@link #Screen(TerminalSize primarySize, TerminalSize alternateSize, Network network, Charset codePage)} + * constructor instead. + */ + @Deprecated(since = "0.28.0", forRemoval = true) public Screen(int columns, int rows, Network network) throws TerminalInterruptedException { this(columns, rows, 0, 0, network); } + /** + * @deprecated use the {@link #Screen(TerminalSize primarySize, TerminalSize alternateSize, Network network, Charset codePage)} + * constructor instead. + */ + @Deprecated(since = "0.28.0", forRemoval = true) public Screen(int columns, int rows, int alternateColumns, int alternateRows, Network network) throws TerminalInterruptedException { + this.codePage = Charset.forName("Cp037"); this.network = network; this.primaryColumns = columns; this.primaryRows = rows; @@ -139,6 +159,30 @@ public Screen(int columns, int rows, int alternateColumns, int alternateRows, Ne lockKeyboard(); } + + public Screen(TerminalSize primarySize, TerminalSize alternateSize, Network network, Charset codePage) throws TerminalInterruptedException { + this.codePage = codePage; + this.network = network; + this.primaryColumns = primarySize.getColumns(); + this.primaryRows = primarySize.getRows(); + this.usingAlternate = false; + + int alternateRows = alternateSize.getRows(); + int alternateColumns = alternateSize.getColumns(); + if (alternateRows < 1 || alternateColumns < 1) { + this.hasAlternate = false; + this.alternateColumns = 0; + this.alternateRows = 0; + } else { + this.hasAlternate = true; + this.alternateColumns = alternateColumns; + this.alternateRows = alternateRows; + } + + erase(); + lockKeyboard(); + } + public synchronized void lockKeyboard() throws TerminalInterruptedException { if (!keyboardLockSet) { logger.trace("Locking keyboard"); @@ -220,10 +264,10 @@ private synchronized void processReadBuffer() throws DatastreamException { } else if (bh instanceof BufferGraphicsEscape) { BufferGraphicsEscape bc = (BufferGraphicsEscape) bh; outboundBuffer.write(OrderGraphicsEscape.ID); - outboundBuffer.write(bc.getFieldEbcdic()); + outboundBuffer.write(bc.getFieldEbcdic(this.codePage)); } else if (bh instanceof BufferChar) { BufferChar bc = (BufferChar) bh; - outboundBuffer.write(bc.getFieldEbcdic()); + outboundBuffer.write(bc.getFieldEbcdic(this.codePage)); } else if (bh instanceof BufferStartOfField) { BufferStartOfField sf = (BufferStartOfField) bh; OrderStartField osf = new OrderStartField(sf.isProtected(), sf.isNumeric(), sf.isDisplay(), sf.isIntenseDisplay(), sf.isSelectorPen(), sf.isFieldModifed()); @@ -321,13 +365,13 @@ private void readModifiedBuffer(ByteArrayOutputStream outboundBuffer) throws IOE BufferGraphicsEscape bc = (BufferGraphicsEscape) bh; if (fieldModified) { outboundBuffer.write(OrderGraphicsEscape.ID); - byte value = bc.getFieldEbcdic(); + byte value = bc.getFieldEbcdic(this.codePage); outboundBuffer.write(value); } } else if (bh instanceof BufferChar) { BufferChar bc = (BufferChar) bh; if (fieldModified) { - byte value = bc.getFieldEbcdic(); + byte value = bc.getFieldEbcdic(this.codePage); if (value != 0) { outboundBuffer.write(value); } @@ -1927,5 +1971,8 @@ public Highlight getHighlightAtPosition(int pos) { return currentField.getHighlight(); } + public Charset getCodePage() { + return codePage; + } } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Terminal.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Terminal.java index d34bb31ea..f3771fa5d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Terminal.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Terminal.java @@ -3,6 +3,7 @@ */ package dev.galasa.zos3270.spi; +import java.nio.charset.Charset; import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.List; @@ -24,6 +25,7 @@ import dev.galasa.zos3270.TextNotFoundException; import dev.galasa.zos3270.TimeoutException; import dev.galasa.zos3270.Zos3270Exception; +import dev.galasa.zos3270.common.screens.TerminalSize; import dev.galasa.zos3270.internal.comms.Network; import dev.galasa.zos3270.internal.comms.NetworkThread; @@ -44,20 +46,43 @@ public class Terminal implements ITerminal { private List deviceTypes; + /** + * @deprecated use the {@link #Terminal(String id, String host, int port, boolean ssl, TerminalSize primarySize, TerminalSize alternateSize, ITextScannerManagerSpi textScan, Charset codePage)} + * constructor instead. + */ + @Deprecated(since = "0.28.0", forRemoval = true) public Terminal(String id, String host, int port, ITextScannerManagerSpi textScan) throws TerminalInterruptedException { this(id, host, port, false, 80, 24, 0, 0, textScan); } + /** + * @deprecated use the {@link #Terminal(String id, String host, int port, boolean ssl, TerminalSize primarySize, TerminalSize alternateSize, ITextScannerManagerSpi textScan, Charset codePage)} + * constructor instead. + */ + @Deprecated(since = "0.28.0", forRemoval = true) public Terminal(String id, String host, int port, boolean ssl, ITextScannerManagerSpi textScan) throws TerminalInterruptedException { this(id, host, port, ssl, 80, 24, 0, 0, textScan); } + /** + * @deprecated use the {@link #Terminal(String id, String host, int port, boolean ssl, TerminalSize primarySize, TerminalSize alternateSize, ITextScannerManagerSpi textScan, Charset codePage)} + * constructor instead. + */ + @Deprecated(since = "0.28.0", forRemoval = true) public Terminal(String id, String host, int port, boolean ssl, int primaryColumns, int primaryRows, int alternateColumns, int alternateRows, ITextScannerManagerSpi textScan) throws TerminalInterruptedException { network = new Network(host, port, ssl, id); screen = new Screen(primaryColumns, primaryRows, alternateColumns, alternateRows, this.network); this.id = id; this.textScan = textScan; } + + + public Terminal(String id, String host, int port, boolean ssl, TerminalSize primarySize, TerminalSize alternateSize, ITextScannerManagerSpi textScan, Charset codePage) throws TerminalInterruptedException { + network = new Network(host, port, ssl, id); + screen = new Screen(primarySize, alternateSize, this.network, codePage); + this.id = id; + this.textScan = textScan; + } public void setAutoReconnect(boolean newAutoReconnect) { this.autoReconnect = newAutoReconnect; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index a2782479e..ba1b61bd5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -33,6 +33,7 @@ import dev.galasa.framework.spi.IFramework; import dev.galasa.textscan.spi.ITextScannerManagerSpi; import dev.galasa.zos.IZosImage; +import dev.galasa.zos.ZosManagerException; import dev.galasa.zos3270.AttentionIdentification; import dev.galasa.zos3270.IScreenUpdateListener; import dev.galasa.zos3270.TerminalInterruptedException; @@ -73,12 +74,22 @@ public class Zos3270TerminalImpl extends Terminal implements IScreenUpdateListen private boolean logConsoleTerminals; private boolean autoConnect; + /** + * @deprecated use the {@link #Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFramework framework, boolean autoConnect, IZosImage image, TerminalSize primarySize, TerminalSize alternateSize, ITextScannerManagerSpi textScanner)} + * constructor instead. + */ + @Deprecated(since = "0.28.0", forRemoval = true) public Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFramework framework, boolean autoConnect, IZosImage image, ITextScannerManagerSpi textScanner) throws Zos3270ManagerException, TerminalInterruptedException { this(id, host, port, tls, framework, autoConnect, image, 80, 24, 0, 0, textScanner); } + /** + * @deprecated use the {@link #Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFramework framework, boolean autoConnect, IZosImage image, TerminalSize primarySize, TerminalSize alternateSize, ITextScannerManagerSpi textScanner)} + * constructor instead. + */ + @Deprecated(since = "0.28.0", forRemoval = true) public Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFramework framework, boolean autoConnect, IZosImage image, int primaryColumns, int primaryRows, int alternateColumns, int alternateRows, @@ -127,6 +138,53 @@ public Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFrame logConsoleTerminals = LogConsoleTerminals.get(); } + + public Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFramework framework, boolean autoConnect, + IZosImage image, TerminalSize primarySize, TerminalSize alternateSize, ITextScannerManagerSpi textScanner) + throws Zos3270ManagerException, TerminalInterruptedException, ZosManagerException { + super(id, host, port, tls, primarySize, alternateSize, textScanner, image.getCodePage()); + this.terminalId = id; + this.runId = framework.getTestRunName(); + this.autoConnect = autoConnect; + this.cts = framework.getConfidentialTextService(); + this.applyCtf = ApplyConfidentialTextFiltering.get(); + this.terminalOutput = TerminalOutput.get(); + this.textScan = textScanner; + + getScreen().registerScreenUpdateListener(this); + + storedArtifactsRoot = framework.getResultArchiveStore().getStoredArtifactsRoot(); + terminalRasDirectory = storedArtifactsRoot.resolve("zos3270").resolve("terminals").resolve(this.terminalId); + URL propLiveTerminalUrl = LiveTerminalUrl.get(); + if (propLiveTerminalUrl == null) { + liveTerminalUrl = null; + } else { + try { + // *** Register the terminal to the UI which will own the terminal view + HttpURLConnection connection = (HttpURLConnection) propLiveTerminalUrl.openConnection(); + connection.setRequestMethod("HEAD"); + connection.addRequestProperty("zos3270-runid", this.runId); + connection.addRequestProperty("zos3270-terminalid", this.terminalId); + connection.setDoInput(true); + connection.setDoOutput(false); + connection.connect(); + if (connection.getResponseCode() != 200) { + logger.warn("Unable to activate live terminal due to " + connection.getResponseCode() + " - " + + connection.getResponseMessage()); + } else { + this.liveTerminalUrl = new URL( + propLiveTerminalUrl.toString() + "/" + this.runId + "/" + this.terminalId); + } + } catch (Exception e) { + throw new Zos3270ManagerException("Unable to create the live terminal directory", e); + } + } + + setDeviceTypes(TerminalDeviceTypes.get(image)); + + logConsoleTerminals = LogConsoleTerminals.get(); + } + public boolean doAutoConnect() { return this.autoConnect; } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/commandcodes/ReadModifiedTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/commandcodes/ReadModifiedTest.java index aa71b1255..d52b6b68c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/commandcodes/ReadModifiedTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/commandcodes/ReadModifiedTest.java @@ -29,10 +29,11 @@ import dev.galasa.zos3270.spi.Screen; import dev.galasa.zos3270.util.DummySocket; import dev.galasa.zos3270.util.DummySocketImpl; +import dev.galasa.zos3270.util.Zos3270TestBase; -public class ReadModifiedTest { +public class ReadModifiedTest extends Zos3270TestBase { -// @Test + @Test public void testGoldenPath() throws Exception { ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -44,7 +45,7 @@ public Socket createSocket() throws UnknownHostException, IOException { } }; network.connectClient(); - Screen screen = new Screen(10, 2, network); + Screen screen = CreateTestScreen(10, 2, network); screen.erase(); NetworkThread networkThread = new NetworkThread(null, screen, network, network.getInputStream()); @@ -53,16 +54,16 @@ public Socket createSocket() throws UnknownHostException, IOException { ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("1234")); + orders.add(new OrderText("1234", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(5))); orders.add(new OrderStartField(true, false, true, false, false, true)); // Modified - check we get protected fields as well - orders.add(new OrderText("5678")); + orders.add(new OrderText("5678", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); orders.add(new OrderStartField(false, false, true, false, false, true)); //Modified - orders.add(new OrderText("ABCD")); + orders.add(new OrderText("ABCD", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(15))); orders.add(new OrderStartField(true, false, true, false, false, false)); - orders.add(new OrderText("EFGH")); + orders.add(new OrderText("EFGH", ebcdic)); screen.processOrders(orders, writeControlCharacter); screen.testingSetLastAid(AttentionIdentification.ENTER); screen.setCursorPosition(0, 1); @@ -86,18 +87,18 @@ public Socket createSocket() throws UnknownHostException, IOException { assertThat(bb.get()).as("SBA Field 3").isEqualTo(OrderSetBufferAddress.ID); assertThat(bb.get()).as("Field pos 1").isEqualTo(new BufferAddress(6 /* SF + 1 */).getCharRepresentation()[0]); assertThat(bb.get()).as("Field pos 2").isEqualTo(new BufferAddress(6 /* SF + 1 */).getCharRepresentation()[1]); - assertThat(bb.get()).as("Field char 1").isEqualTo("5678".getBytes(OrderText.ebcdic)[0]); - assertThat(bb.get()).as("Field char 2").isEqualTo("5678".getBytes(OrderText.ebcdic)[1]); - assertThat(bb.get()).as("Field char 3").isEqualTo("5678".getBytes(OrderText.ebcdic)[2]); - assertThat(bb.get()).as("Field char 4").isEqualTo("5678".getBytes(OrderText.ebcdic)[3]); + assertThat(bb.get()).as("Field char 1").isEqualTo("5678".getBytes(ebcdic)[0]); + assertThat(bb.get()).as("Field char 2").isEqualTo("5678".getBytes(ebcdic)[1]); + assertThat(bb.get()).as("Field char 3").isEqualTo("5678".getBytes(ebcdic)[2]); + assertThat(bb.get()).as("Field char 4").isEqualTo("5678".getBytes(ebcdic)[3]); assertThat(bb.get()).as("SBA Field 3").isEqualTo(OrderSetBufferAddress.ID); assertThat(bb.get()).as("Field pos 1").isEqualTo(new BufferAddress(11 /* SF + 1 */).getCharRepresentation()[0]); assertThat(bb.get()).as("Field pos 2").isEqualTo(new BufferAddress(11 /* SF + 1 */).getCharRepresentation()[1]); - assertThat(bb.get()).as("Field char 1").isEqualTo("ABCD".getBytes(OrderText.ebcdic)[0]); - assertThat(bb.get()).as("Field char 2").isEqualTo("ABCD".getBytes(OrderText.ebcdic)[1]); - assertThat(bb.get()).as("Field char 3").isEqualTo("ABCD".getBytes(OrderText.ebcdic)[2]); - assertThat(bb.get()).as("Field char 4").isEqualTo("ABCD".getBytes(OrderText.ebcdic)[3]); + assertThat(bb.get()).as("Field char 1").isEqualTo("ABCD".getBytes(ebcdic)[0]); + assertThat(bb.get()).as("Field char 2").isEqualTo("ABCD".getBytes(ebcdic)[1]); + assertThat(bb.get()).as("Field char 3").isEqualTo("ABCD".getBytes(ebcdic)[2]); + assertThat(bb.get()).as("Field char 4").isEqualTo("ABCD".getBytes(ebcdic)[3]); assertThat(bb.get()).as("End of stream").isEqualTo(NetworkThread.IAC); assertThat(bb.get()).as("End of stream").isEqualTo(NetworkThread.EOR); @@ -105,7 +106,7 @@ public Socket createSocket() throws UnknownHostException, IOException { assertThat(bb.remaining()).as("Should be nothing left").isEqualTo(0); } -// @Test + @Test public void testWrappedfield() throws Exception { ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -117,7 +118,7 @@ public Socket createSocket() throws UnknownHostException, IOException { } }; network.connectClient(); - Screen screen = new Screen(10, 2, network); + Screen screen = CreateTestScreen(10, 2, network); screen.erase(); NetworkThread networkThread = new NetworkThread(null, screen, network, network.getInputStream()); @@ -125,16 +126,16 @@ public Socket createSocket() throws UnknownHostException, IOException { ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); - orders.add(new OrderText("12345")); + orders.add(new OrderText("12345", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(5))); orders.add(new OrderStartField(true, false, true, false, false, false)); - orders.add(new OrderText("5678")); + orders.add(new OrderText("5678", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("ABCD")); + orders.add(new OrderText("ABCD", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(15))); orders.add(new OrderStartField(true, false, true, false, false, true)); // WRAPPED modified field - orders.add(new OrderText("EFGH")); + orders.add(new OrderText("EFGH", ebcdic)); screen.processOrders(orders, writeControlCharacter); screen.testingSetLastAid(AttentionIdentification.ENTER); screen.setCursorPosition(0, 1); @@ -158,15 +159,15 @@ public Socket createSocket() throws UnknownHostException, IOException { assertThat(bb.get()).as("SBA Field 3").isEqualTo(OrderSetBufferAddress.ID); assertThat(bb.get()).as("Field pos 1").isEqualTo(new BufferAddress(16 /* SF + 1 */).getCharRepresentation()[0]); assertThat(bb.get()).as("Field pos 2").isEqualTo(new BufferAddress(16 /* SF + 1 */).getCharRepresentation()[1]); - assertThat(bb.get()).as("Field char 1").isEqualTo("EFGH12345".getBytes(OrderText.ebcdic)[0]); - assertThat(bb.get()).as("Field char 2").isEqualTo("EFGH12345".getBytes(OrderText.ebcdic)[1]); - assertThat(bb.get()).as("Field char 3").isEqualTo("EFGH12345".getBytes(OrderText.ebcdic)[2]); - assertThat(bb.get()).as("Field char 4").isEqualTo("EFGH12345".getBytes(OrderText.ebcdic)[3]); - assertThat(bb.get()).as("Field char 5").isEqualTo("EFGH12345".getBytes(OrderText.ebcdic)[4]); - assertThat(bb.get()).as("Field char 6").isEqualTo("EFGH12345".getBytes(OrderText.ebcdic)[5]); - assertThat(bb.get()).as("Field char 7").isEqualTo("EFGH12345".getBytes(OrderText.ebcdic)[6]); - assertThat(bb.get()).as("Field char 8").isEqualTo("EFGH12345".getBytes(OrderText.ebcdic)[7]); - assertThat(bb.get()).as("Field char 9").isEqualTo("EFGH12345".getBytes(OrderText.ebcdic)[8]); + assertThat(bb.get()).as("Field char 1").isEqualTo("EFGH12345".getBytes(ebcdic)[0]); + assertThat(bb.get()).as("Field char 2").isEqualTo("EFGH12345".getBytes(ebcdic)[1]); + assertThat(bb.get()).as("Field char 3").isEqualTo("EFGH12345".getBytes(ebcdic)[2]); + assertThat(bb.get()).as("Field char 4").isEqualTo("EFGH12345".getBytes(ebcdic)[3]); + assertThat(bb.get()).as("Field char 5").isEqualTo("EFGH12345".getBytes(ebcdic)[4]); + assertThat(bb.get()).as("Field char 6").isEqualTo("EFGH12345".getBytes(ebcdic)[5]); + assertThat(bb.get()).as("Field char 7").isEqualTo("EFGH12345".getBytes(ebcdic)[6]); + assertThat(bb.get()).as("Field char 8").isEqualTo("EFGH12345".getBytes(ebcdic)[7]); + assertThat(bb.get()).as("Field char 9").isEqualTo("EFGH12345".getBytes(ebcdic)[8]); assertThat(bb.get()).as("End of stream").isEqualTo(NetworkThread.IAC); assertThat(bb.get()).as("End of stream").isEqualTo(NetworkThread.EOR); @@ -174,7 +175,7 @@ public Socket createSocket() throws UnknownHostException, IOException { assertThat(bb.remaining()).as("Should be nothing left").isEqualTo(0); } -// @Test + @Test public void testUnformatted() throws Exception { ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -186,7 +187,7 @@ public Socket createSocket() throws UnknownHostException, IOException { } }; network.connectClient(); - Screen screen = new Screen(10, 2, network); + Screen screen = CreateTestScreen(10, 2, network); screen.erase(); NetworkThread networkThread = new NetworkThread(null, screen, network, network.getInputStream()); @@ -194,7 +195,7 @@ public Socket createSocket() throws UnknownHostException, IOException { ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); // make the first line nulls, should suppress - orders.add(new OrderText("1234")); + orders.add(new OrderText("1234", ebcdic)); screen.processOrders(orders, writeControlCharacter); screen.testingSetLastAid(AttentionIdentification.ENTER); screen.setCursorPosition(0, 1); @@ -215,10 +216,10 @@ public Socket createSocket() throws UnknownHostException, IOException { assertThat(bb.get()).as("Cursor byte 1").isEqualTo((byte)0x40); assertThat(bb.get()).as("Cursor byte 2").isEqualTo((byte)0x4a); - assertThat(bb.get()).as("Unformatted char 1").isEqualTo("1234".getBytes(OrderText.ebcdic)[0]); - assertThat(bb.get()).as("Unformatted char 2").isEqualTo("1234".getBytes(OrderText.ebcdic)[1]); - assertThat(bb.get()).as("Unformatted char 3").isEqualTo("1234".getBytes(OrderText.ebcdic)[2]); - assertThat(bb.get()).as("Unformatted char 4").isEqualTo("1234".getBytes(OrderText.ebcdic)[3]); + assertThat(bb.get()).as("Unformatted char 1").isEqualTo("1234".getBytes(ebcdic)[0]); + assertThat(bb.get()).as("Unformatted char 2").isEqualTo("1234".getBytes(ebcdic)[1]); + assertThat(bb.get()).as("Unformatted char 3").isEqualTo("1234".getBytes(ebcdic)[2]); + assertThat(bb.get()).as("Unformatted char 4").isEqualTo("1234".getBytes(ebcdic)[3]); assertThat(bb.get()).as("End of stream").isEqualTo(NetworkThread.IAC); assertThat(bb.get()).as("End of stream").isEqualTo(NetworkThread.EOR); @@ -226,7 +227,7 @@ public Socket createSocket() throws UnknownHostException, IOException { assertThat(bb.remaining()).as("Should be nothing left").isEqualTo(0); } -// @Test + @Test public void testClear() throws Exception { ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -238,7 +239,7 @@ public Socket createSocket() throws UnknownHostException, IOException { } }; network.connectClient(); - Screen screen = new Screen(10, 2, network); + Screen screen = CreateTestScreen(10, 2, network); screen.erase(); NetworkThread networkThread = new NetworkThread(null, screen, network, network.getInputStream()); @@ -247,7 +248,7 @@ public Socket createSocket() throws UnknownHostException, IOException { ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); // make the first line nulls, should suppress - orders.add(new OrderText("1234")); + orders.add(new OrderText("1234", ebcdic)); screen.processOrders(orders, writeControlCharacter); screen.testingSetLastAid(AttentionIdentification.CLEAR); screen.setCursorPosition(0, 1); @@ -285,7 +286,7 @@ public Socket createSocket() throws UnknownHostException, IOException { } }; network.connectClient(); - Screen screen = new Screen(10, 2, network); + Screen screen = CreateTestScreen(10, 2, network); screen.erase(); NetworkThread networkThread = new NetworkThread(null, screen, network, network.getInputStream()); @@ -293,7 +294,7 @@ public Socket createSocket() throws UnknownHostException, IOException { ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); // make the first line nulls, should suppress - orders.add(new OrderText("1234")); + orders.add(new OrderText("1234", ebcdic)); screen.processOrders(orders, writeControlCharacter); screen.testingSetLastAid(AttentionIdentification.CLEAR); screen.setCursorPosition(0, 1); @@ -318,10 +319,10 @@ public Socket createSocket() throws UnknownHostException, IOException { assertThat(bb.get()).as("Cursor byte 2").isEqualTo((byte)0x4a); // because ALL was requested, the buffer is read anyway despite the CLEAR - assertThat(bb.get()).as("Unformatted char 1").isEqualTo("1234".getBytes(OrderText.ebcdic)[0]); - assertThat(bb.get()).as("Unformatted char 2").isEqualTo("1234".getBytes(OrderText.ebcdic)[1]); - assertThat(bb.get()).as("Unformatted char 3").isEqualTo("1234".getBytes(OrderText.ebcdic)[2]); - assertThat(bb.get()).as("Unformatted char 4").isEqualTo("1234".getBytes(OrderText.ebcdic)[3]); + assertThat(bb.get()).as("Unformatted char 1").isEqualTo("1234".getBytes(ebcdic)[0]); + assertThat(bb.get()).as("Unformatted char 2").isEqualTo("1234".getBytes(ebcdic)[1]); + assertThat(bb.get()).as("Unformatted char 3").isEqualTo("1234".getBytes(ebcdic)[2]); + assertThat(bb.get()).as("Unformatted char 4").isEqualTo("1234".getBytes(ebcdic)[3]); assertThat(bb.get()).as("End of stream").isEqualTo(NetworkThread.IAC); assertThat(bb.get()).as("End of stream").isEqualTo(NetworkThread.EOR); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackSpaceTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackSpaceTest.java index ef0b3991e..67dc99afd 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackSpaceTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackSpaceTest.java @@ -20,6 +20,7 @@ import dev.galasa.zos3270.internal.datastream.OrderText; import dev.galasa.zos3270.internal.datastream.WriteControlCharacter; import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.util.Zos3270TestBase; /** * Test the backSpace function @@ -27,7 +28,7 @@ * @author Michael Baylis * */ -public class BackSpaceTest { +public class BackSpaceTest extends Zos3270TestBase { /** * Test what happens in a empty screen with no fields, should position at 0 @@ -36,7 +37,7 @@ public class BackSpaceTest { */ @Test public void emptyScreen() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -62,16 +63,16 @@ public void emptyScreen() throws Exception { @Test public void testGoldenPath() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("123456789")); + orders.add(new OrderText("123456789", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("ABCDEFGHI")); + orders.add(new OrderText("ABCDEFGHI", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); @@ -96,16 +97,16 @@ public void testGoldenPath() throws Exception { @Test public void testProtectedScreen() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("123456789")); + orders.add(new OrderText("123456789", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("ABCDEFGHI")); + orders.add(new OrderText("ABCDEFGHI", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); @@ -141,13 +142,13 @@ public void testProtectedScreen() throws Exception { @Test public void testSingleField() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("123456789ABCDEFGHIJ")); + orders.add(new OrderText("123456789ABCDEFGHIJ", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackTabTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackTabTest.java index 50a32becb..2a2961e93 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackTabTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackTabTest.java @@ -17,6 +17,7 @@ import dev.galasa.zos3270.internal.datastream.OrderStartField; import dev.galasa.zos3270.internal.datastream.WriteControlCharacter; import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.util.Zos3270TestBase; /** * Test the backTab function @@ -24,7 +25,7 @@ * @author Michael Baylis * */ -public class BackTabTest { +public class BackTabTest extends Zos3270TestBase { /** * Test what happens in a empty screen with no fields, should position at 0 @@ -33,7 +34,7 @@ public class BackTabTest { */ @Test public void emptyScreen() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -58,7 +59,7 @@ public void emptyScreen() throws Exception { @Test public void testSameFieldCursorOffset() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -84,7 +85,7 @@ public void testSameFieldCursorOffset() throws Exception { @Test public void testSameFieldCursorAtBeginning() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -110,7 +111,7 @@ public void testSameFieldCursorAtBeginning() throws Exception { @Test public void testDifferentField() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -138,7 +139,7 @@ public void testDifferentField() throws Exception { @Test public void testDifferentWrappedField() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -166,7 +167,7 @@ public void testDifferentWrappedField() throws Exception { @Test public void testProtectedScreen() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -194,7 +195,7 @@ public void testProtectedScreen() throws Exception { @Test public void testUnprotectedZeroLength() throws Exception { - Screen screen = new Screen(5, 1, null); + Screen screen = CreateTestScreen(5, 1, null); screen.erase(); ArrayList orders = new ArrayList<>(); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/FieldOverflowTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/FieldOverflowTest.java index 945a67d8b..a84b79e62 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/FieldOverflowTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/FieldOverflowTest.java @@ -18,6 +18,7 @@ import dev.galasa.zos3270.internal.datastream.OrderText; import dev.galasa.zos3270.internal.datastream.WriteControlCharacter; import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.util.Zos3270TestBase; /** * Ensure if type over the end of a field, the cursor will skip to the next unprotected field @@ -25,7 +26,7 @@ * @author Michael Baylis * */ -public class FieldOverflowTest { +public class FieldOverflowTest extends Zos3270TestBase { /** * Test with two fields @@ -35,18 +36,18 @@ public class FieldOverflowTest { @Test public void testSameFieldCursorOffset() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText(" ")); + orders.add(new OrderText(" ", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(6))); orders.add(new OrderStartField(true, false, true, false, false, false)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText(" ")); + orders.add(new OrderText(" ", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(16))); orders.add(new OrderStartField(true, false, true, false, false, false)); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/HomeTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/HomeTest.java index 0e9372026..f74e30e5d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/HomeTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/HomeTest.java @@ -17,6 +17,7 @@ import dev.galasa.zos3270.internal.datastream.OrderStartField; import dev.galasa.zos3270.internal.datastream.WriteControlCharacter; import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.util.Zos3270TestBase; /** * Test the home function @@ -24,7 +25,7 @@ * @author Michael Baylis * */ -public class HomeTest { +public class HomeTest extends Zos3270TestBase { /** * Test what happens in a empty screen with no fields, should position at 0 @@ -33,7 +34,7 @@ public class HomeTest { */ @Test public void emptyScreen() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -58,7 +59,7 @@ public void emptyScreen() throws Exception { @Test public void testSameFieldCursorOffset() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -84,7 +85,7 @@ public void testSameFieldCursorOffset() throws Exception { @Test public void testSameFieldCursorAtBeginning() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -110,7 +111,7 @@ public void testSameFieldCursorAtBeginning() throws Exception { @Test public void testDifferentField() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -138,7 +139,7 @@ public void testDifferentField() throws Exception { @Test public void testWrappedField() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -164,7 +165,7 @@ public void testWrappedField() throws Exception { @Test public void testProtectedScreen() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -192,7 +193,7 @@ public void testProtectedScreen() throws Exception { @Test public void testUnprotectedZeroLength() throws Exception { - Screen screen = new Screen(5, 1, null); + Screen screen = CreateTestScreen(5, 1, null); screen.erase(); ArrayList orders = new ArrayList<>(); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/NewLineTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/NewLineTest.java index 1b87ee400..c485f1049 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/NewLineTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/NewLineTest.java @@ -18,6 +18,7 @@ import dev.galasa.zos3270.internal.datastream.OrderText; import dev.galasa.zos3270.internal.datastream.WriteControlCharacter; import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.util.Zos3270TestBase; /** * Test the newline function @@ -25,7 +26,7 @@ * @author Michael Baylis * */ -public class NewLineTest { +public class NewLineTest extends Zos3270TestBase { /** * Test what happens in a empty screen with no fields, should position to the next line @@ -34,7 +35,7 @@ public class NewLineTest { */ @Test public void emptyScreen() throws Exception { - Screen screen = new Screen(10, 4, null); + Screen screen = CreateTestScreen(10, 4, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -58,7 +59,7 @@ public void emptyScreen() throws Exception { @Test public void testSameFieldStartingAtBegginningOfField() throws Exception { - Screen screen = new Screen(10, 4, null); + Screen screen = CreateTestScreen(10, 4, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -85,7 +86,7 @@ public void testSameFieldStartingAtBegginningOfField() throws Exception { @Test public void testSameFieldStartingALineDown() throws Exception { - Screen screen = new Screen(10, 4, null); + Screen screen = CreateTestScreen(10, 4, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -111,7 +112,7 @@ public void testSameFieldStartingALineDown() throws Exception { @Test public void testSameFieldStartingBottom() throws Exception { - Screen screen = new Screen(10, 4, null); + Screen screen = CreateTestScreen(10, 4, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -137,22 +138,22 @@ public void testSameFieldStartingBottom() throws Exception { @Test public void testDifferentField() throws Exception { - Screen screen = new Screen(10, 4, null); + Screen screen = CreateTestScreen(10, 4, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("UField1")); + orders.add(new OrderText("UField1", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); orders.add(new OrderStartField(true, false, true, false, false, false)); - orders.add(new OrderText("PField1")); + orders.add(new OrderText("PField1", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(20))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("UField2")); + orders.add(new OrderText("UField2", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(30))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("UField3")); + orders.add(new OrderText("UField3", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); @@ -173,7 +174,7 @@ public void testDifferentField() throws Exception { @Test public void testWrappedField() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -199,7 +200,7 @@ public void testWrappedField() throws Exception { @Test public void testProtectedScreen() throws Exception { - Screen screen = new Screen(10, 4, null); + Screen screen = CreateTestScreen(10, 4, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -227,7 +228,7 @@ public void testProtectedScreen() throws Exception { @Test public void testUnprotectedZeroLength() throws Exception { - Screen screen = new Screen(2, 4, null); + Screen screen = CreateTestScreen(2, 4, null); screen.erase(); ArrayList orders = new ArrayList<>(); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/TabTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/TabTest.java index 4c5d17327..18797fc83 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/TabTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/TabTest.java @@ -18,6 +18,7 @@ import dev.galasa.zos3270.internal.datastream.OrderText; import dev.galasa.zos3270.internal.datastream.WriteControlCharacter; import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.util.Zos3270TestBase; /** * Test the tab function @@ -25,7 +26,7 @@ * @author Michael Baylis * */ -public class TabTest { +public class TabTest extends Zos3270TestBase { /** * Test what happens in a empty screen with no fields, should position at 0 @@ -34,7 +35,7 @@ public class TabTest { */ @Test public void emptyScreen() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -59,16 +60,16 @@ public void emptyScreen() throws Exception { @Test public void testSameFieldCursorOffset() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("UField1")); + orders.add(new OrderText("UField1", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("UField2")); + orders.add(new OrderText("UField2", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); @@ -89,7 +90,7 @@ public void testSameFieldCursorOffset() throws Exception { @Test public void testSameFieldCursorAtBeginning() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -115,7 +116,7 @@ public void testSameFieldCursorAtBeginning() throws Exception { @Test public void testDifferentField() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -143,7 +144,7 @@ public void testDifferentField() throws Exception { @Test public void testDifferentWrappedField() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -171,7 +172,7 @@ public void testDifferentWrappedField() throws Exception { @Test public void testProtectedScreen() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); @@ -199,7 +200,7 @@ public void testProtectedScreen() throws Exception { @Test public void testUnprotectedZeroLength() throws Exception { - Screen screen = new Screen(5, 1, null); + Screen screen = CreateTestScreen(5, 1, null); screen.erase(); ArrayList orders = new ArrayList<>(); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/EraseUnprotectedToAddressTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/EraseUnprotectedToAddressTest.java index cd9fdc31f..4c3f1d197 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/EraseUnprotectedToAddressTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/EraseUnprotectedToAddressTest.java @@ -19,9 +19,9 @@ import dev.galasa.zos3270.internal.datastream.OrderEraseUnprotectedToAddress; import dev.galasa.zos3270.internal.datastream.OrderSetBufferAddress; import dev.galasa.zos3270.spi.NetworkException; -import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.util.Zos3270TestBase; -public class EraseUnprotectedToAddressTest { +public class EraseUnprotectedToAddressTest extends Zos3270TestBase { @Test public void testEraseAllUnprotected() throws IOException, DecoderException, NetworkException, TerminalInterruptedException { @@ -29,7 +29,7 @@ public void testEraseAllUnprotected() throws IOException, DecoderException, Netw byte[] stream = Hex.decodeHex(vampHex); ByteBuffer buffer = ByteBuffer.wrap(stream); - NetworkThread networkThread = new NetworkThread(null, new Screen(), null, null); + NetworkThread networkThread = new NetworkThread(null, CreateTestScreen(), null, null); List orders = networkThread.process3270Data(buffer).getOrders(); assertThat(orders.size()).as("Should have returned 2 orders, SBA, EUA").isEqualTo(2); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/GraphicsEscapeTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/GraphicsEscapeTest.java index 87ac0914d..6572d880a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/GraphicsEscapeTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/GraphicsEscapeTest.java @@ -19,9 +19,9 @@ import dev.galasa.zos3270.internal.datastream.OrderGraphicsEscape; import dev.galasa.zos3270.internal.datastream.OrderSetBufferAddress; import dev.galasa.zos3270.spi.NetworkException; -import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.util.Zos3270TestBase; -public class GraphicsEscapeTest { +public class GraphicsEscapeTest extends Zos3270TestBase { @Test public void testEraseAllUnprotected() throws IOException, DecoderException, NetworkException, TerminalInterruptedException { @@ -29,7 +29,7 @@ public void testEraseAllUnprotected() throws IOException, DecoderException, Netw byte[] stream = Hex.decodeHex(vampHex); ByteBuffer buffer = ByteBuffer.wrap(stream); - NetworkThread networkThread = new NetworkThread(null, new Screen(), null, null); + NetworkThread networkThread = new NetworkThread(null, CreateTestScreen(), null, null); List orders = networkThread.process3270Data(buffer).getOrders(); assertThat(orders.size()).as("Should have returned 2 orders, SBA, GE").isEqualTo(2); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/InboundTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/InboundTest.java new file mode 100644 index 000000000..49b80e8ec --- /dev/null +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/InboundTest.java @@ -0,0 +1,52 @@ +/* + * Copyright contributors to the Galasa project + */ +package dev.galasa.zos3270.datastream; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.nio.ByteBuffer; +import java.nio.charset.Charset; + +import org.apache.commons.codec.binary.Hex; +import org.junit.Test; + +import dev.galasa.zos3270.common.screens.TerminalSize; +import dev.galasa.zos3270.internal.comms.Inbound3270Message; +import dev.galasa.zos3270.internal.comms.Network; +import dev.galasa.zos3270.internal.comms.NetworkThread; +import dev.galasa.zos3270.spi.Screen; + +public class InboundTest { + + @Test + public void testSettingCodePageRendersSquareBracketsOK() throws Exception { + + // Given... + // A screen that looks like this: + // 0006 SQLTIMES + // 0007 SQLTIMES [0] 6622 + // 0008 SQLTIMES [1] 55339 + // 0009 SQLTIMES [2] 4589 + String inboundDataStream = "f1401102d0290342f541f2c000f0f0f0f61102d5290342f541f2c020404040e2d8d3e3c9d4c5e2404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040110320290342f541f2c000f0f0f0f7110325290342f541f2c020404040e2d8d3e3c9d4c5e240adf0bd40404040404040404040404040110342290342f541f2c000f6f6f2f2110347290342f541f2c02040404040404040404040404040404040404040404040404040404040404040404040404040404040110370290342f541f2c000f0f0f0f8110375290342f541f2c020404040e2d8d3e3c9d4c5e240adf1bd40404040404040404040404040110392290342f541f2c000f5f5f3f3f9110398290342f541f2c0204040404040404040404040404040404040404040404040404040404040404040404040404040401103c0290342f541f2c000f0f0f0f91103c5290342f541f2c020404040e2d8d3e3c9d4c5e240adf2bd404040404040404040404040401103e2290342f541f2c000f4f5f8f91103e7290342f541f2c02040404040404040404040404040404040404040404040404040404040404040404040404040404040110410290342f541f2c000"; + byte[] inboundAsBytes = Hex.decodeHex(inboundDataStream); + + Network network = new Network("here", 1, "a"); + + // Set the screen's code page to EBCDIC 1047 + Charset codePage = Charset.forName("1047"); + TerminalSize terminalSize = new TerminalSize(80, 24); + Screen screen = new Screen(terminalSize, new TerminalSize(0, 0), network, codePage); + + NetworkThread networkThread = new NetworkThread(null, screen, null, null); + ByteBuffer buffer = ByteBuffer.wrap(inboundAsBytes); + Inbound3270Message inboundMessage = networkThread.process3270Data(buffer); + + // When... + screen.processInboundMessage(inboundMessage); + System.out.println(screen.printScreen()); + + // Then... + assertThat(screen.printScreen()).contains("SQLTIMES", "[0]", "[1]", "[2]"); + } +} diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderTextTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderTextTest.java index ffde9d6b9..cdc2043e6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderTextTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderTextTest.java @@ -10,8 +10,9 @@ import dev.galasa.zos3270.internal.datastream.OrderText; import dev.galasa.zos3270.spi.DatastreamException; +import dev.galasa.zos3270.util.Zos3270TestBase; -public class OrderTextTest { +public class OrderTextTest extends Zos3270TestBase { @Test public void testText() throws DatastreamException { @@ -22,7 +23,7 @@ public void testText() throws DatastreamException { buffer.put((byte) 0x85); buffer.flip(); - OrderText orderText = new OrderText(); + OrderText orderText = new OrderText(ebcdic); orderText.append(buffer.get()); orderText.append(buffer.get()); orderText.append(buffer.get()); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplySummaryTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplySummaryTest.java index 6784de780..4beb07e7c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplySummaryTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplySummaryTest.java @@ -14,12 +14,13 @@ import dev.galasa.zos3270.internal.datastream.QueryReplySummary; import dev.galasa.zos3270.internal.datastream.QueryReplyUsableArea; import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.util.Zos3270TestBase; -public class QueryReplySummaryTest { +public class QueryReplySummaryTest extends Zos3270TestBase { @Test public void testGoldenPath() throws TerminalInterruptedException { - Screen screen = new Screen(80, 24, null); + Screen screen = CreateTestScreen(80, 24, null); QueryReplyUsableArea qrua = new QueryReplyUsableArea(screen); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplyUsableAreaTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplyUsableAreaTest.java index 01b5a6d69..cc0a78b39 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplyUsableAreaTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplyUsableAreaTest.java @@ -10,12 +10,13 @@ import dev.galasa.zos3270.TerminalInterruptedException; import dev.galasa.zos3270.internal.datastream.QueryReplyUsableArea; import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.util.Zos3270TestBase; -public class QueryReplyUsableAreaTest { +public class QueryReplyUsableAreaTest extends Zos3270TestBase { @Test public void testGoldenPath() throws TerminalInterruptedException { - Screen screen = new Screen(80, 24, null); + Screen screen = CreateTestScreen(80, 24, null); QueryReplyUsableArea qrua = new QueryReplyUsableArea(screen); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/RepeatToAddressTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/RepeatToAddressTest.java index 52a4401fb..b8e120787 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/RepeatToAddressTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/RepeatToAddressTest.java @@ -10,8 +10,9 @@ import dev.galasa.zos3270.internal.datastream.OrderRepeatToAddress; import dev.galasa.zos3270.spi.DatastreamException; +import dev.galasa.zos3270.util.Zos3270TestBase; -public class RepeatToAddressTest { +public class RepeatToAddressTest extends Zos3270TestBase { @Test public void testRA() throws DatastreamException { @@ -21,7 +22,7 @@ public void testRA() throws DatastreamException { buffer.put((byte) 0xd4); buffer.flip(); - String result = new OrderRepeatToAddress(buffer).toString(); + String result = new OrderRepeatToAddress(buffer, ebcdic).toString(); String shouldbe = "RA(M,1919)"; Assert.assertEquals("RA not translating correct to " + shouldbe, shouldbe, result); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/VampScreenTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/VampScreenTest.java index c3fc9fb49..ed4f8c748 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/VampScreenTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/VampScreenTest.java @@ -18,9 +18,9 @@ import dev.galasa.zos3270.internal.comms.NetworkThread; import dev.galasa.zos3270.internal.datastream.AbstractOrder; import dev.galasa.zos3270.spi.NetworkException; -import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.util.Zos3270TestBase; -public class VampScreenTest { +public class VampScreenTest extends Zos3270TestBase { @Test public void testVampScreen() throws IOException, DecoderException, NetworkException, TerminalInterruptedException { @@ -29,7 +29,7 @@ public void testVampScreen() throws IOException, DecoderException, NetworkExcept byte[] stream = Hex.decodeHex(vampHex); ByteBuffer buffer = ByteBuffer.wrap(stream); - NetworkThread networkThread = new NetworkThread(null, new Screen(), null, null); + NetworkThread networkThread = new NetworkThread(null, CreateTestScreen(), null, null); List orders = networkThread.process3270Data(buffer).getOrders(); Assert.assertEquals("Count of orders is incorrect", 225, orders.size()); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/extended/ExtendedDatastreamTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/extended/ExtendedDatastreamTest.java index af0b6bafd..5551c99e4 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/extended/ExtendedDatastreamTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/extended/ExtendedDatastreamTest.java @@ -28,8 +28,9 @@ import dev.galasa.zos3270.spi.DatastreamException; import dev.galasa.zos3270.spi.Highlight; import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.util.Zos3270TestBase; -public class ExtendedDatastreamTest { +public class ExtendedDatastreamTest extends Zos3270TestBase { private final String RED = "42f2"; private final String GREEN = "42f4"; @@ -52,7 +53,7 @@ private ByteBuffer getBuffer(String data) throws DecoderException { @Before public void setUp() throws TerminalInterruptedException { Network network = new Network("here", 1, "a"); - screen = new Screen(10, 2, network); + screen = CreateTestScreen(10, 2, network); screen.erase(); } @@ -68,16 +69,16 @@ public void testColourAndHighlighting() throws DecoderException, DatastreamExcep ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartFieldExtended(redReverseBuffer)); - orders.add(new OrderText("1234")); + orders.add(new OrderText("1234", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(5))); orders.add(new OrderStartFieldExtended(greenBlinkBuffer)); - orders.add(new OrderText("5678")); + orders.add(new OrderText("5678", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); orders.add(new OrderStartFieldExtended(blueNormalBuffer)); - orders.add(new OrderText("ABCD")); + orders.add(new OrderText("ABCD", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(15))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("EFGH")); + orders.add(new OrderText("EFGH", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); @@ -107,13 +108,13 @@ public void testColourNoHighlighting() throws DecoderException, DatastreamExcept ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartFieldExtended(redBuffer)); - orders.add(new OrderText("1234")); + orders.add(new OrderText("1234", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(5))); orders.add(new OrderStartFieldExtended(greenBuffer)); - orders.add(new OrderText("5678")); + orders.add(new OrderText("5678", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); orders.add(new OrderStartFieldExtended(blueBuffer)); - orders.add(new OrderText("ABCD")); + orders.add(new OrderText("ABCD", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); @@ -140,13 +141,13 @@ public void testHighlightingNoColour() throws DecoderException, DatastreamExcept ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartFieldExtended(blinkBuffer)); - orders.add(new OrderText("1234")); + orders.add(new OrderText("1234", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(5))); orders.add(new OrderStartFieldExtended(underscoreBuffer)); - orders.add(new OrderText("5678")); + orders.add(new OrderText("5678", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); orders.add(new OrderStartFieldExtended(normalBuffer)); - orders.add(new OrderText("ABCD")); + orders.add(new OrderText("ABCD", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/structuredfields/ReadPartitionTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/structuredfields/ReadPartitionTest.java index bb6ffd900..16c5a36fc 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/structuredfields/ReadPartitionTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/structuredfields/ReadPartitionTest.java @@ -17,8 +17,10 @@ import dev.galasa.zos3270.internal.datastream.StructuredField; import dev.galasa.zos3270.internal.datastream.StructuredFieldReadPartition; import dev.galasa.zos3270.spi.NetworkException; +import dev.galasa.zos3270.util.Zos3270TestBase; + +public class ReadPartitionTest extends Zos3270TestBase { -public class ReadPartitionTest { @Test public void testGoldenPath() throws NetworkException { @@ -29,7 +31,7 @@ public void testGoldenPath() throws NetworkException { buffer.put(StructuredFieldReadPartition.QUERY); buffer.flip(); - Inbound3270Message inbound = NetworkThread.processStructuredFields(new CommandWriteStructured(), buffer); + Inbound3270Message inbound = NetworkThread.processStructuredFields(new CommandWriteStructured(), buffer, ebcdic); List fields = inbound.getStructuredFields(); Assert.assertEquals("Count of fields", 1, fields.size()); @@ -55,7 +57,7 @@ public void testQueryListEquivalent() throws NetworkException { buffer.put(qcodeList); buffer.flip(); - Inbound3270Message inbound = NetworkThread.processStructuredFields(new CommandWriteStructured(), buffer); + Inbound3270Message inbound = NetworkThread.processStructuredFields(new CommandWriteStructured(), buffer, ebcdic); List fields = inbound.getStructuredFields(); Assert.assertEquals("Count of fields", 1, fields.size()); @@ -82,7 +84,7 @@ public void testQueryListEquivalentNoList() throws NetworkException { buffer.put(StructuredFieldReadPartition.REQTYP_EQUIVALENT); buffer.flip(); - Inbound3270Message inbound = NetworkThread.processStructuredFields(new CommandWriteStructured(), buffer); + Inbound3270Message inbound = NetworkThread.processStructuredFields(new CommandWriteStructured(), buffer, ebcdic); List fields = inbound.getStructuredFields(); Assert.assertEquals("Count of fields", 1, fields.size()); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Network3270Test.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Network3270Test.java index a08e232d5..e757149a3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Network3270Test.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Network3270Test.java @@ -21,9 +21,9 @@ import dev.galasa.zos3270.internal.datastream.AbstractCommandCode; import dev.galasa.zos3270.internal.datastream.OrderInsertCursor; import dev.galasa.zos3270.spi.NetworkException; -import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.util.Zos3270TestBase; -public class Network3270Test { +public class Network3270Test extends Zos3270TestBase { @Mock private Network network; @@ -48,7 +48,7 @@ public void testProcessMessage() throws NetworkException, IOException, TerminalI ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); - NetworkThread networkThread = new NetworkThread(null, new Screen(), null, bais); + NetworkThread networkThread = new NetworkThread(null, CreateTestScreen(), null, bais); networkThread.processMessage(bais); Assert.assertTrue("Will test the screen at this point, later", true); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/EraseAllUnprotectedTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/EraseAllUnprotectedTest.java index 538280fa5..742b76944 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/EraseAllUnprotectedTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/EraseAllUnprotectedTest.java @@ -20,6 +20,7 @@ import dev.galasa.zos3270.internal.datastream.OrderText; import dev.galasa.zos3270.internal.datastream.WriteControlCharacter; import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.util.Zos3270TestBase; /** * Test the Erase All Unprotected order @@ -27,8 +28,8 @@ * @author Michael Baylis * */ -public class EraseAllUnprotectedTest { - +public class EraseAllUnprotectedTest extends Zos3270TestBase { + /** * Test with two fields * @@ -37,19 +38,19 @@ public class EraseAllUnprotectedTest { @Test public void testEuaGoldPath() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("12345")); + orders.add(new OrderText("12345", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(6))); orders.add(new OrderStartField(true, false, true, false, false, false)); - orders.add(new OrderText("ABC")); + orders.add(new OrderText("ABC", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("67890")); + orders.add(new OrderText("67890", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(16))); orders.add(new OrderStartField(true, false, true, false, false, false)); @@ -82,19 +83,19 @@ public void testEuaGoldPath() throws Exception { @Test public void testEuaFullScreen() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("12345")); + orders.add(new OrderText("12345", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(6))); orders.add(new OrderStartField(true, false, true, false, false, false)); - orders.add(new OrderText("ABC")); + orders.add(new OrderText("ABC", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("67890")); + orders.add(new OrderText("67890", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(16))); orders.add(new OrderStartField(true, false, true, false, false, false)); @@ -127,19 +128,19 @@ public void testEuaFullScreen() throws Exception { @Test public void testEuaMidField() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("12345")); + orders.add(new OrderText("12345", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(6))); orders.add(new OrderStartField(true, false, true, false, false, false)); - orders.add(new OrderText("ABC")); + orders.add(new OrderText("ABC", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("67890")); + orders.add(new OrderText("67890", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(16))); orders.add(new OrderStartField(true, false, true, false, false, false)); @@ -172,19 +173,19 @@ public void testEuaMidField() throws Exception { @Test public void testEuaWrap() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("12345")); + orders.add(new OrderText("12345", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(6))); orders.add(new OrderStartField(true, false, true, false, false, false)); - orders.add(new OrderText("ABC")); + orders.add(new OrderText("ABC", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("67890")); + orders.add(new OrderText("67890", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(16))); orders.add(new OrderStartField(true, false, true, false, false, false)); @@ -217,19 +218,19 @@ public void testEuaWrap() throws Exception { @Test public void testEuaProtected() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("12345")); + orders.add(new OrderText("12345", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(6))); orders.add(new OrderStartField(true, false, true, false, false, false)); - orders.add(new OrderText("ABC")); + orders.add(new OrderText("ABC", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("67890")); + orders.add(new OrderText("67890", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(16))); orders.add(new OrderStartField(true, false, true, false, false, false)); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java index 3ec4343b6..44f207a58 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java @@ -22,6 +22,7 @@ import dev.galasa.zos3270.internal.datastream.OrderText; import dev.galasa.zos3270.internal.datastream.WriteControlCharacter; import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.util.Zos3270TestBase; /** * Test the Graphics Escape order @@ -29,7 +30,7 @@ * @author Michael Baylis * */ -public class GraphicsEscapeTest { +public class GraphicsEscapeTest extends Zos3270TestBase { /** * Test with two fields @@ -39,7 +40,7 @@ public class GraphicsEscapeTest { @Test public void testGeGoldenPath() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ByteBuffer geBuffer = ByteBuffer.wrap(new byte[] {0x50}); @@ -47,9 +48,9 @@ public void testGeGoldenPath() throws Exception { ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("1234")); + orders.add(new OrderText("1234", ebcdic)); orders.add(new OrderGraphicsEscape(geBuffer)); - orders.add(new OrderText("6789ABCDEFGHIJ")); + orders.add(new OrderText("6789ABCDEFGHIJ", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); @@ -65,7 +66,7 @@ public void testGeGoldenPath() throws Exception { */ @Test public void testGeConvertToDatastream() throws Exception { - Screen screen = new Screen(6, 1, null); + Screen screen = CreateTestScreen(6, 1, null); screen.erase(); ByteBuffer geBuffer = ByteBuffer.wrap(new byte[] {0x50}); @@ -73,9 +74,9 @@ public void testGeConvertToDatastream() throws Exception { ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, true, false, false, true)); // needs modified to ensure field written outbound - orders.add(new OrderText("12")); + orders.add(new OrderText("12", ebcdic)); orders.add(new OrderGraphicsEscape(geBuffer)); - orders.add(new OrderText("34")); + orders.add(new OrderText("34", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/CursorTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/CursorTest.java index 77ded4c86..85cc9ed04 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/CursorTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/CursorTest.java @@ -8,6 +8,8 @@ import java.util.ArrayList; import org.junit.Assert; +import org.junit.Test; + import dev.galasa.zos3270.KeyboardLockedException; import dev.galasa.zos3270.Zos3270Exception; import dev.galasa.zos3270.internal.comms.Inbound3270Message; @@ -21,12 +23,13 @@ import dev.galasa.zos3270.spi.DatastreamException; import dev.galasa.zos3270.spi.Screen; import dev.galasa.zos3270.spi.Terminal; +import dev.galasa.zos3270.util.Zos3270TestBase; -public class CursorTest { +public class CursorTest extends Zos3270TestBase { - //@Test + @Test public void goldenPath() throws KeyboardLockedException, Zos3270Exception { - Terminal terminal = new Terminal("test", "", 0, false, 10, 2, 0, 0, null); + Terminal terminal = CreateTestTerminal(); Screen screen = terminal.getScreen(); setScreen(screen); @@ -37,9 +40,9 @@ public void goldenPath() throws KeyboardLockedException, Zos3270Exception { assertThat(bufferPos).as("Buffer position after setCursorPosition").isEqualTo(14); } - //@Test + @Test public void exceedsBuffer() throws KeyboardLockedException, Zos3270Exception { - Terminal terminal = new Terminal("test", "", 0, false, 10, 2, 0, 0, null); + Terminal terminal = CreateTestTerminal(); Screen screen = terminal.getScreen(); setScreen(screen); @@ -59,9 +62,9 @@ public void exceedsBuffer() throws KeyboardLockedException, Zos3270Exception { } } - //@Test + @Test public void invalidPositions() throws KeyboardLockedException, Zos3270Exception { - Terminal terminal = new Terminal("test", "", 0, false, 10, 2, 0, 0, null); + Terminal terminal = CreateTestTerminal(); Screen screen = terminal.getScreen(); setScreen(screen); @@ -98,10 +101,10 @@ private void setScreen(Screen screen) throws DatastreamException { ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, false, false, false, false)); - orders.add(new OrderText("abcd")); + orders.add(new OrderText("abcd", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); orders.add(new OrderStartField(false, false, false, false, false, false)); - orders.add(new OrderText("1234")); + orders.add(new OrderText("1234", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/EraseInputTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/EraseInputTest.java index fc6b85625..da71e5fc0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/EraseInputTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/EraseInputTest.java @@ -18,9 +18,10 @@ import dev.galasa.zos3270.internal.datastream.OrderText; import dev.galasa.zos3270.internal.datastream.WriteControlCharacter; import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.util.Zos3270TestBase; -public class EraseInputTest { +public class EraseInputTest extends Zos3270TestBase { /** * Test golden path with 4 fields @@ -30,22 +31,22 @@ public class EraseInputTest { @Test public void testGoldenPath() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("1234")); + orders.add(new OrderText("1234", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(5))); orders.add(new OrderStartField(true, false, true, false, false, false)); - orders.add(new OrderText("5678")); + orders.add(new OrderText("5678", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("ABCD")); + orders.add(new OrderText("ABCD", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(15))); orders.add(new OrderStartField(true, false, true, false, false, false)); - orders.add(new OrderText("EFGH")); + orders.add(new OrderText("EFGH", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); @@ -71,22 +72,22 @@ public void testGoldenPath() throws Exception { @Test public void testProtected() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(true, false, true, false, false, false)); - orders.add(new OrderText("1234")); + orders.add(new OrderText("1234", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(5))); orders.add(new OrderStartField(true, false, true, false, false, false)); - orders.add(new OrderText("5678")); + orders.add(new OrderText("5678", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); orders.add(new OrderStartField(true, false, true, false, false, false)); - orders.add(new OrderText("ABCD")); + orders.add(new OrderText("ABCD", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(15))); orders.add(new OrderStartField(true, false, true, false, false, false)); - orders.add(new OrderText("EFGH")); + orders.add(new OrderText("EFGH", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); @@ -113,12 +114,12 @@ public void testProtected() throws Exception { @Test public void testUnformatted() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); - orders.add(new OrderText("1234567890ABCDEFGHIJ")); + orders.add(new OrderText("1234567890ABCDEFGHIJ", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); @@ -139,21 +140,21 @@ public void testUnformatted() throws Exception { @Test public void testWrapped() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); - orders.add(new OrderText("12345")); + orders.add(new OrderText("12345", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(5))); orders.add(new OrderStartField(true, false, true, false, false, false)); - orders.add(new OrderText("5678")); + orders.add(new OrderText("5678", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("ABCD")); + orders.add(new OrderText("ABCD", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(15))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("EFGH")); + orders.add(new OrderText("EFGH", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/FindTextTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/FindTextTest.java index b51ebcfaf..567c052fa 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/FindTextTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/FindTextTest.java @@ -19,18 +19,19 @@ import dev.galasa.zos3270.internal.datastream.OrderText; import dev.galasa.zos3270.internal.datastream.WriteControlCharacter; import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.util.Zos3270TestBase; -public class FindTextTest { +public class FindTextTest extends Zos3270TestBase { @Test public void testSimple() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("Find this message here")); + orders.add(new OrderText("Find this message here", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); @@ -53,13 +54,13 @@ public void testSimple() throws Exception { @Test public void testOk() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("Find this message here")); + orders.add(new OrderText("Find this message here", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); @@ -82,13 +83,13 @@ public void testOk() throws Exception { @Test public void testError() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("Find this message here")); + orders.add(new OrderText("Find this message here", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); @@ -119,13 +120,13 @@ public void testError() throws Exception { @Test public void testMultiSearch() throws Exception { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, true, false, false, false)); - orders.add(new OrderText("Find this message here")); + orders.add(new OrderText("Find this message here", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/RetrieveTextTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/RetrieveTextTest.java index 3b1e9c59d..d279bff24 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/RetrieveTextTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/RetrieveTextTest.java @@ -8,6 +8,8 @@ import java.util.ArrayList; import org.junit.Assert; +import org.junit.Test; + import dev.galasa.zos3270.KeyboardLockedException; import dev.galasa.zos3270.Zos3270Exception; import dev.galasa.zos3270.internal.comms.Inbound3270Message; @@ -21,12 +23,13 @@ import dev.galasa.zos3270.spi.DatastreamException; import dev.galasa.zos3270.spi.Screen; import dev.galasa.zos3270.spi.Terminal; +import dev.galasa.zos3270.util.Zos3270TestBase; -public class RetrieveTextTest { +public class RetrieveTextTest extends Zos3270TestBase { - //@Test + @Test public void goldenPathByPosition() throws KeyboardLockedException, Zos3270Exception { - Terminal terminal = new Terminal("test", "", 0, false, 10, 2, 0, 0, null); + Terminal terminal = CreateTestTerminal(); Screen screen = terminal.getScreen(); setScreen(screen); @@ -40,9 +43,9 @@ public void goldenPathByPosition() throws KeyboardLockedException, Zos3270Except assertThat(text).as("Check all text in screen without nulls").isEqualTo(" abcd 1234 "); } - //@Test + @Test public void goldenPathByCursor() throws KeyboardLockedException, Zos3270Exception { - Terminal terminal = new Terminal("test", "", 0, false, 10, 2, 0, 0, null); + Terminal terminal = CreateTestTerminal(); Screen screen = terminal.getScreen(); setScreen(screen); @@ -62,12 +65,13 @@ public void goldenPathByCursor() throws KeyboardLockedException, Zos3270Exceptio assertThat(text).as("Check all text in screen without nulls").isEqualTo(" abcd 1234 "); } - //@Test + @Test public void tooLongByPosition() throws KeyboardLockedException, Zos3270Exception { - Terminal terminal = new Terminal("test", "", 0, false, 10, 2, 0, 0, null); + Terminal terminal = CreateTestTerminal(); Screen screen = terminal.getScreen(); - + setScreen(screen); + try { terminal.retrieveText(2, 1, 11); Assert.fail("Should have thrown an exception"); @@ -83,13 +87,13 @@ public void tooLongByPosition() throws KeyboardLockedException, Zos3270Exception } } - - //@Test + @Test public void tooLongByCursor() throws KeyboardLockedException, Zos3270Exception { - Terminal terminal = new Terminal("test", "", 0, false, 10, 2, 0, 0, null); + Terminal terminal = CreateTestTerminal(); Screen screen = terminal.getScreen(); - + setScreen(screen); + terminal.setCursorPosition(2, 1); try { terminal.retrieveTextAtCursor(11); @@ -107,15 +111,14 @@ public void tooLongByCursor() throws KeyboardLockedException, Zos3270Exception { } } - private void setScreen(Screen screen) throws DatastreamException { ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, false, false, false, false)); - orders.add(new OrderText("abcd")); + orders.add(new OrderText("abcd", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); orders.add(new OrderStartField(false, false, false, false, false, false)); - orders.add(new OrderText("1234")); + orders.add(new OrderText("1234", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/ScreenTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/ScreenTest.java index eae3e5d8d..8374c4b70 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/ScreenTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/ScreenTest.java @@ -33,18 +33,19 @@ import dev.galasa.zos3270.spi.DatastreamException; import dev.galasa.zos3270.spi.NetworkException; import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.util.Zos3270TestBase; -public class ScreenTest { +public class ScreenTest extends Zos3270TestBase { @Test public void testScreenSize() throws TerminalInterruptedException { - Assert.assertEquals("default screen size incorrect", 1920, new Screen().getScreenSize()); - Assert.assertEquals("small screen size incorrect", 20, new Screen(10, 2, null).getScreenSize()); + Assert.assertEquals("default screen size incorrect", 1920, CreateTestScreen().getScreenSize()); + Assert.assertEquals("small screen size incorrect", 20, CreateTestScreen(10, 2, null).getScreenSize()); } @Test public void testErase() throws TerminalInterruptedException { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); Assert.assertEquals("Erase fields are incorrect", @@ -55,10 +56,10 @@ public void testErase() throws TerminalInterruptedException { @Test public void testEraseUsingRA() throws DatastreamException, TerminalInterruptedException { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); - orders.add(new OrderRepeatToAddress((char) 0x00, new BufferAddress(0))); + orders.add(new OrderRepeatToAddress((char) 0x00, new BufferAddress(0), ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); @@ -70,19 +71,19 @@ public void testEraseUsingRA() throws DatastreamException, TerminalInterruptedEx @Test public void testOrders() throws DatastreamException, TerminalInterruptedException { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(true, false, true, false, false, false)); - orders.add(new OrderText("Hello")); + orders.add(new OrderText("Hello", ebcdic)); orders.add(new OrderStartField(false, false, false, false, false, false)); orders.add(new OrderInsertCursor()); - orders.add(new OrderRepeatToAddress('X', new BufferAddress(10))); + orders.add(new OrderRepeatToAddress('X', new BufferAddress(10), ebcdic)); orders.add(new OrderStartField(true, false, true, false, false, false)); - orders.add(new OrderRepeatToAddress('y', new BufferAddress(14))); - orders.add(new OrderRepeatToAddress('z', new BufferAddress(17))); + orders.add(new OrderRepeatToAddress('y', new BufferAddress(14), ebcdic)); + orders.add(new OrderRepeatToAddress('z', new BufferAddress(17), ebcdic)); orders.add(new OrderStartField(true, false, true, false, false, false)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), @@ -99,11 +100,11 @@ public void testOrders() throws DatastreamException, TerminalInterruptedExceptio @Test public void testOrdersInsertAndTail() throws DatastreamException, TerminalInterruptedException { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); - orders.add(new OrderRepeatToAddress('x', new BufferAddress(19))); + orders.add(new OrderRepeatToAddress('x', new BufferAddress(19), ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(true, false, true, false, false, false)); orders.add(new OrderSetBufferAddress(new BufferAddress(19))); @@ -121,7 +122,7 @@ public void testOrdersInsertAndTail() throws DatastreamException, TerminalInterr @Test public void testOrdersJumbled() throws DatastreamException, TerminalInterruptedException { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); @@ -129,9 +130,9 @@ public void testOrdersJumbled() throws DatastreamException, TerminalInterruptedE orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, false, false, false, false)); orders.add(new OrderSetBufferAddress(new BufferAddress(11))); - orders.add(new OrderText("123456789")); + orders.add(new OrderText("123456789", ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(1))); - orders.add(new OrderText("abcdefghi")); + orders.add(new OrderText("abcdefghi", ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); @@ -145,15 +146,15 @@ public void testOrdersJumbled() throws DatastreamException, TerminalInterruptedE @Test public void testOrdersReplacedAll() throws DatastreamException, TerminalInterruptedException { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); screen.erase(); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); orders.add(new OrderStartField(false, false, false, false, false, false)); - orders.add(new OrderRepeatToAddress('X', new BufferAddress(20))); + orders.add(new OrderRepeatToAddress('X', new BufferAddress(20), ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); - orders.add(new OrderRepeatToAddress('X', new BufferAddress(20))); + orders.add(new OrderRepeatToAddress('X', new BufferAddress(20), ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); @@ -165,15 +166,15 @@ public void testOrdersReplacedAll() throws DatastreamException, TerminalInterrup @Test public void testOrderReplaceMiddle() throws DatastreamException, TerminalInterruptedException { - Screen screen = new Screen(10, 2, null); + Screen screen = CreateTestScreen(10, 2, null); ArrayList orders = new ArrayList<>(); orders.add(new OrderSetBufferAddress(new BufferAddress(0))); - orders.add(new OrderRepeatToAddress('X', new BufferAddress(10))); + orders.add(new OrderRepeatToAddress('X', new BufferAddress(10), ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(10))); - orders.add(new OrderRepeatToAddress('Y', new BufferAddress(20))); + orders.add(new OrderRepeatToAddress('Y', new BufferAddress(20), ebcdic)); orders.add(new OrderSetBufferAddress(new BufferAddress(5))); - orders.add(new OrderRepeatToAddress('Z', new BufferAddress(10))); + orders.add(new OrderRepeatToAddress('Z', new BufferAddress(10), ebcdic)); screen.processInboundMessage(new Inbound3270Message(new CommandEraseWrite(), new WriteControlCharacter(false, false, false, false, false, false, true, true), orders)); @@ -186,10 +187,10 @@ public void testOrderReplaceMiddle() throws DatastreamException, TerminalInterru // @Test public void testProcessReadPartitionQueryListEquivalent() throws TerminalInterruptedException, NetworkException { Network network = mock(Network.class); - Screen screen = new Screen(80, 24, network); + Screen screen = CreateTestScreen(80, 24, network); ByteBuffer buffer = createQueryListBuffer(StructuredFieldReadPartition.REQTYP_EQUIVALENT, (byte) 0x80, (byte) 0x81, (byte) 0xa6, (byte) 0x85); - Inbound3270Message inbound = NetworkThread.processStructuredFields(new CommandWriteStructured(), buffer); + Inbound3270Message inbound = NetworkThread.processStructuredFields(new CommandWriteStructured(), buffer, ebcdic); screen.processInboundMessage(inbound); @@ -199,11 +200,11 @@ public void testProcessReadPartitionQueryListEquivalent() throws TerminalInterru // @Test public void testProcessReadPartitionQueryListNoSupportedFunctions() throws TerminalInterruptedException, NetworkException { Network network = mock(Network.class); - Screen screen = new Screen(80, 24, network); + Screen screen = CreateTestScreen(80, 24, network); // query "Graphic Color" & "Graphic Symbol Sets" which are unsupported ByteBuffer buffer = createQueryListBuffer(StructuredFieldReadPartition.REQTYP_LIST, (byte) 0xb4, (byte) 0xb6); - Inbound3270Message inbound = NetworkThread.processStructuredFields(new CommandWriteStructured(), buffer); + Inbound3270Message inbound = NetworkThread.processStructuredFields(new CommandWriteStructured(), buffer, ebcdic); screen.processInboundMessage(inbound); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/Zos3270TestBase.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/Zos3270TestBase.java new file mode 100644 index 000000000..5b2f3c7db --- /dev/null +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/Zos3270TestBase.java @@ -0,0 +1,55 @@ +/* + * Copyright contributors to the Galasa project + */ +package dev.galasa.zos3270.util; + +import java.nio.charset.Charset; + +import dev.galasa.textscan.ILogScanner; +import dev.galasa.textscan.ITextScanner; +import dev.galasa.textscan.TextScanManagerException; +import dev.galasa.textscan.internal.LogScannerImpl; +import dev.galasa.textscan.internal.TextScannerImpl; +import dev.galasa.textscan.spi.ITextScannerManagerSpi; +import dev.galasa.zos3270.TerminalInterruptedException; +import dev.galasa.zos3270.common.screens.TerminalSize; +import dev.galasa.zos3270.internal.comms.Network; +import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.spi.Terminal; + +public class Zos3270TestBase { + + protected static Charset ebcdic = Charset.forName("Cp037"); + + protected Terminal CreateTestTerminal() throws TerminalInterruptedException { + TerminalSize terminalSize = new TerminalSize(10, 2); + TerminalSize alternateTerminalSize = new TerminalSize(0, 0); + ITextScanner textScanner = new TextScannerImpl(); + ILogScanner logScanner = new LogScannerImpl(); + + ITextScannerManagerSpi mockTextScannerManager = new ITextScannerManagerSpi() { + + @Override + public ITextScanner getTextScanner() throws TextScanManagerException { + return textScanner; + } + + @Override + public ILogScanner getLogScanner() throws TextScanManagerException { + return logScanner; + } + }; + return new Terminal("test", "", 0, false, terminalSize, alternateTerminalSize, mockTextScannerManager, ebcdic); + } + + protected Screen CreateTestScreen() throws TerminalInterruptedException { + return CreateTestScreen(80, 24, null); + } + + protected static Screen CreateTestScreen(int columns, int rows, Network network) throws TerminalInterruptedException { + TerminalSize terminalSize = new TerminalSize(columns, rows); + TerminalSize alternateTerminalSize = new TerminalSize(0, 0); + + return new Screen(terminalSize, alternateTerminalSize, network, ebcdic); + } +} diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestColour.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestColour.java index cd726e8c1..1dc292d03 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestColour.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestColour.java @@ -13,8 +13,9 @@ import dev.galasa.zos3270.internal.comms.Network; import dev.galasa.zos3270.internal.comms.NetworkThread; import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.util.Zos3270TestBase; -public class TestColour { +public class TestColour extends Zos3270TestBase { public static void main(String[] args) throws DecoderException, Zos3270Exception { @@ -23,7 +24,7 @@ public static void main(String[] args) throws DecoderException, Zos3270Exception byte[] inboundBytes = Hex.decodeHex(inbound); Network network = new Network("here", 1, "a"); - Screen screen = new Screen(80, 24, network); + Screen screen = CreateTestScreen(80, 24, network); NetworkThread networkThread = new NetworkThread(null, screen, network, null); ByteBuffer buffer = ByteBuffer.wrap(inboundBytes); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestInbound.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestInbound.java index ba7f3f0f5..a350a7720 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestInbound.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestInbound.java @@ -15,8 +15,9 @@ import dev.galasa.zos3270.spi.Field; import dev.galasa.zos3270.spi.NetworkException; import dev.galasa.zos3270.spi.Screen; +import dev.galasa.zos3270.util.Zos3270TestBase; -public class TestInbound { +public class TestInbound extends Zos3270TestBase { public static void main(String[] args) throws TerminalInterruptedException, NetworkException, DecoderException { @@ -31,7 +32,7 @@ public static void main(String[] args) throws TerminalInterruptedException, Netw byte[] inbound3Bytes = Hex.decodeHex(inbound3); Network network = new Network("here", 1, "a"); - Screen screen = new Screen(80, 24, network); + Screen screen = CreateTestScreen(80, 24, network); NetworkThread networkThread = new NetworkThread(null, screen, null, null); ByteBuffer buffer = ByteBuffer.wrap(inbound1Bytes); diff --git a/release.yaml b/release.yaml index 09ebfd010..a46bd4ff6 100644 --- a/release.yaml +++ b/release.yaml @@ -494,7 +494,7 @@ managers: codecoverage: true - artifact: dev.galasa.zos3270.manager - version: 0.26.0 + version: 0.28.0 obr: true javadoc: true bom: true From 62a2289c89afb09766eb3058694870201401fb9e Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Mon, 12 Jun 2023 12:31:01 +0100 Subject: [PATCH 106/263] Change default isMainOrRelease back to false, as should be false for local builds etc that don't come through the pipelines Signed-off-by: Jade Carino --- .../buildSrc/src/main/groovy/galasa.java.gradle | 2 +- galasa-managers-parent/gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.java.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.java.gradle index c775b6e96..d1f0f7d5f 100644 --- a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.java.gradle +++ b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.java.gradle @@ -64,7 +64,7 @@ signing { tasks.withType(Sign) { - onlyIf { isRelease.toBoolean() } + onlyIf { isMainOrRelease.toBoolean() } } publishing { diff --git a/galasa-managers-parent/gradle.properties b/galasa-managers-parent/gradle.properties index 7f825bc0a..c20f7edfd 100644 --- a/galasa-managers-parent/gradle.properties +++ b/galasa-managers-parent/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx4096M jacocoEnabled=false -isRelease=false +isMainOrRelease=false sourceMaven=https://repo.maven.apache.org/maven2/ centralMaven=https://repo.maven.apache.org/maven2/ From a00b26f6c5c3c6f418c2158d20a68081d923be4f Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Mon, 12 Jun 2023 16:31:45 +0100 Subject: [PATCH 107/263] Import missing packages Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../dev.galasa.zos3270.common/bnd.bnd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/bnd.bnd b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/bnd.bnd index a50a3e7fe..a2ec37f4f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/bnd.bnd @@ -3,5 +3,7 @@ Bundle-Name: Galasa zOS 3270 Terminal Manager - Common Packages Export-Package: dev.galasa.zos3270.common.screens,\ dev.galasa.zos3270.common.screens.images,\ dev.galasa.zos3270.common.screens.json -Import-Package: javax.validation.constraints;resolution:=optional +Import-Package: javax.validation.constraints;resolution:=optional,\ + javax.imageio,\ + dev.galasa.framework.spi From 858cf90111cd2d07c8ea6f36ba9dbc1b52961e03 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Thu, 15 Jun 2023 10:30:37 +0100 Subject: [PATCH 108/263] Update IVT to ensure the dataset does not exist before creating (#881) * Update IVT to ensure the dataset does not exist before creating Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> * Bump zos manager ivt to 0.28.0 Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> * Update log message Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --------- Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../dev.galasa.zos.manager.ivt/build.gradle | 2 +- .../dev/galasa/zos/manager/ivt/ZosManagerFileVSAMIVT.java | 8 ++++++++ release.yaml | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/build.gradle index 897613403..1e7b4e42d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS Manager IVTs' -version = '0.25.0' +version = '0.28.0' dependencies { implementation project (':galasa-managers-zos-parent:dev.galasa.zos.manager') diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileVSAMIVT.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileVSAMIVT.java index aecf71862..731b6df7e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileVSAMIVT.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileVSAMIVT.java @@ -90,6 +90,14 @@ public void basicKSDSDefine() throws ZosVSAMDatasetException, ZosBatchException, IZosVSAMDataset vsamDataSet = fileHandler.newVSAMDataset(DSName, imagePrimary); vsamDataSet.setSpace(VSAMSpaceUnit.CYLINDERS, 1, 1); vsamDataSet.setRecordSize(50, 101); + + if (checkThatPDSExists(DSName)) { + logger.info("Dataset " + DSName + " already exists. Deleting..."); + vsamDataSet.delete(); + logger.info("Dataset " + DSName + " deleted OK."); + } + assertThat(checkThatPDSExists(DSName)).isFalse(); + vsamDataSet.create(); assertThat(checkThatPDSExists(DSName)).isTrue(); diff --git a/release.yaml b/release.yaml index a46bd4ff6..c81888fae 100644 --- a/release.yaml +++ b/release.yaml @@ -428,7 +428,7 @@ managers: codecoverage: true - artifact: dev.galasa.zos.manager.ivt - version: 0.25.0 + version: 0.28.0 obr: true mvp: true isolated: true From 2e44fa6d906553bd2d40fa543f760f1ac9ee9724 Mon Sep 17 00:00:00 2001 From: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> Date: Wed, 21 Jun 2023 12:34:05 +0100 Subject: [PATCH 109/263] fix CEDA helper timing issues + typos (#882) --- .../build.gradle | 2 +- .../galasa/cicsts/ceda/internal/CedaImpl.java | 93 ++++++++----------- release.yaml | 2 +- 3 files changed, 40 insertions(+), 57 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/build.gradle index 37ff0f423..2bb24ce73 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa CICS/TS CEDA Manager' -version = '0.21.0' +version = '0.29.0' dependencies { api project (':galasa-managers-cicsts-parent:dev.galasa.cicsts.manager') diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/internal/CedaImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/internal/CedaImpl.java index 323b6f93a..51a016012 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/internal/CedaImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/internal/CedaImpl.java @@ -1,7 +1,5 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. + * Copyright contributors to the Galasa project */ package dev.galasa.cicsts.ceda.internal; @@ -46,11 +44,11 @@ public void createResource(@NotNull ICicsTerminal terminal, @NotNull String reso try { if(resourceParameters==null){ terminal.type("CEDA DEFINE " + resourceType + "(" + resourceName + - ") GROUP(" + groupName + ") ").enter().waitForKeyboard(); + ") GROUP(" + groupName + ") ").enter().wfk(); }else{ terminal.type("CEDA DEFINE " + resourceType + "(" + resourceName + - ") GROUP(" + groupName + ") " + resourceParameters).enter().waitForKeyboard(); + ") GROUP(" + groupName + ") " + resourceParameters).enter().wfk(); } }catch(TimeoutException | KeyboardLockedException | NetworkException | TerminalInterruptedException | FieldNotFoundException e) { throw new CedaException("Problem with starting the CEDA transaction", e); @@ -59,7 +57,7 @@ public void createResource(@NotNull ICicsTerminal terminal, @NotNull String reso try { if(terminal.retrieveScreen().contains("DEFINE SUCCESSFUL")){ if(terminal.retrieveScreen().contains("MESSAGES:")) { - terminal.pf9(); + terminal.pf9().wfk(); } } }catch (Exception e) { @@ -67,10 +65,8 @@ public void createResource(@NotNull ICicsTerminal terminal, @NotNull String reso } try { - terminal.pf3(); - terminal.waitForKeyboard(); - terminal.clear(); - terminal.waitForKeyboard(); + terminal.pf3().wfk(); + terminal.clear().wfk(); }catch(Exception e) { throw new CedaException("Unable to return terminal back into reset state", e); } @@ -92,7 +88,7 @@ public void installGroup(@NotNull ICicsTerminal terminal, @NotNull String groupN } try { - terminal.type("CEDA INSTALL GROUP(" + groupName + ")").enter().waitForKeyboard(); + terminal.type("CEDA INSTALL GROUP(" + groupName + ")").enter().wfk(); }catch(Exception e) { throw new CedaException("Problem with starting the CEDA transaction"); @@ -100,10 +96,9 @@ public void installGroup(@NotNull ICicsTerminal terminal, @NotNull String groupN try { if(!terminal.retrieveScreen().contains("INSTALL SUCCESSFUL")) { - terminal.pf9(); - terminal.pf3(); - terminal.clear(); - terminal.waitForKeyboard(); + terminal.pf9().wfk(); + terminal.pf3().wfk(); + terminal.clear().wfk(); throw new CedaException("Errors detected whilst installing group"); } }catch(Exception e) { @@ -111,10 +106,8 @@ public void installGroup(@NotNull ICicsTerminal terminal, @NotNull String groupN } try { - terminal.pf3(); - terminal.waitForKeyboard(); - terminal.clear(); - terminal.waitForKeyboard(); + terminal.pf3().wfk(); + terminal.clear().wfk(); }catch(Exception e) { throw new CedaException("Unable to return terminal back into reset state", e); } @@ -140,7 +133,7 @@ public void installResource(@NotNull ICicsTerminal terminal, @NotNull String res try { terminal.type("CEDA INSTALL " + resourceType + "(" + resourceName + ") GROUP(" + - cedaGroup + ")").enter().waitForKeyboard(); + cedaGroup + ")").enter().wfk(); }catch(Exception e) { throw new CedaException("Problem with starting the CEDA transaction", e); @@ -159,8 +152,7 @@ public void installResource(@NotNull ICicsTerminal terminal, @NotNull String res } if(error) { - terminal.pf9(); - terminal.waitForKeyboard(); + terminal.pf9().wfk(); throw new CedaException("Errors detected whilst installing group"); } }catch(Exception e) { @@ -171,10 +163,8 @@ public void installResource(@NotNull ICicsTerminal terminal, @NotNull String res } try { - terminal.pf3(); - terminal.waitForKeyboard(); - terminal.clear(); - terminal.waitForKeyboard(); + terminal.pf3().wfk(); + terminal.clear().wfk(); }catch(Exception e) { throw new CedaException("Unable to return terminal back into reset state", e); } @@ -196,17 +186,16 @@ public void deleteGroup(@NotNull ICicsTerminal terminal, @NotNull String groupNa } try { - terminal.type("CEDA DELETE GROUP(" + groupName + ") ALL").enter().waitForKeyboard(); + terminal.type("CEDA DELETE GROUP(" + groupName + ") ALL").enter().wfk(); }catch(Exception e) { throw new CedaException("Problem with starting the CEDA transaction"); } try { if(!terminal.retrieveScreen().contains("DELETE SUCCESSFUL")) { - terminal.pf9(); - terminal.pf3(); - terminal.clear(); - terminal.waitForKeyboard(); + terminal.pf9().wfk(); + terminal.pf3().wfk(); + terminal.clear().wfk(); throw new CedaException("Errors detected whilst discarding group"); } @@ -215,10 +204,8 @@ public void deleteGroup(@NotNull ICicsTerminal terminal, @NotNull String groupNa } try { - terminal.pf3(); - terminal.waitForKeyboard(); - terminal.clear(); - terminal.waitForKeyboard(); + terminal.pf3().wfk(); + terminal.clear().wfk(); }catch(Exception e) { throw new CedaException("Unable to return terminal back into reset state", e); } @@ -244,30 +231,27 @@ public void deleteResource(@NotNull ICicsTerminal terminal, @NotNull String reso try { - terminal.waitForKeyboard(); + terminal.wfk(); terminal.type("CEDA DELETE " + resourceType + "(" - + resourceName + ") GROUP(" + groupName + ")").enter(); - terminal.waitForKeyboard(); + + resourceName + ") GROUP(" + groupName + ")").enter().wfk(); }catch(Exception e) { throw new CedaException("Problem with starting the CEDA transaction", e); } try { if(!terminal.retrieveScreen().contains("DELETE SUCCESSFUL")) { - terminal.pf9() - .pf3().clear() - .waitForKeyboard(); + terminal.pf9().wfk(); + terminal.pf3().wfk(); + terminal.clear().wfk(); throw new CedaException("Errors detected whilst discarding group"); } }catch(Exception e) { - throw new CedaException("Problem determinign the result from the CEDA command)", e); + throw new CedaException("Problem determining the result from the CEDA command)", e); } try { - terminal.pf3(); - terminal.waitForKeyboard(); - terminal.clear(); - terminal.waitForKeyboard(); + terminal.pf3().wfk(); + terminal.clear().wfk(); }catch(Exception e) { throw new CedaException("Unable to return terminal back into reset state", e); } @@ -291,9 +275,8 @@ public boolean resourceExists(@NotNull ICicsTerminal terminal, @NotNull String r try { - terminal.waitForKeyboard(); - terminal.type("CEDA DISPLAY " + resourceType + "(" + resourceName + ") GROUP(" + groupName + ")").enter(); - terminal.waitForKeyboard(); + terminal.wfk(); + terminal.type("CEDA DISPLAY " + resourceType + "(" + resourceName + ") GROUP(" + groupName + ")").enter().wfk(); } catch(Exception e) { throw new CedaException("Problem with starting the CEDA transaction", e); } @@ -303,18 +286,18 @@ public boolean resourceExists(@NotNull ICicsTerminal terminal, @NotNull String r if (terminal.retrieveScreen().contains("RESULTS: 1 TO 1 OF 1")) { exists = true; } else if (!terminal.retrieveScreen().contains("DISPLAY UNSUCCESSFUL")) { - terminal.pf9().pf3().clear().waitForKeyboard(); + terminal.pf9().wfk(); + terminal.pf3().wfk(); + terminal.clear().wfk(); throw new CedaException("Errors detected whilst displaying resource"); } } catch(Exception e) { - throw new CedaException("Problem determinign the result from the CEDA command)", e); + throw new CedaException("Problem determining the result from the CEDA command)", e); } try { - terminal.pf3(); - terminal.waitForKeyboard(); - terminal.clear(); - terminal.waitForKeyboard(); + terminal.pf3().wfk(); + terminal.clear().wfk(); } catch(Exception e) { throw new CedaException("Unable to return terminal back into reset state", e); } diff --git a/release.yaml b/release.yaml index c81888fae..87103d40a 100644 --- a/release.yaml +++ b/release.yaml @@ -61,7 +61,7 @@ managers: isolated: true - artifact: dev.galasa.cicsts.ceda.manager - version: 0.21.0 + version: 0.29.0 obr: true mvp: true javadoc: true From 5fd883f9723ce2d42a2a30bec4c2d58ac766919b Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Thu, 29 Jun 2023 09:58:11 +0100 Subject: [PATCH 110/263] uplift bouncy castle crypto library version Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../dev.galasa.kubernetes.manager/bnd.bnd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd index 696cbd7fe..4226f2993 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd @@ -21,9 +21,9 @@ Import-Package: dev.galasa,\ org.xml.sax.helpers Embed-Transitive: true Embed-Dependency: *;scope=compile --includeresource: bcpkix-jdk18on-1.72.jar; lib:=true,\ - bcprov-jdk18on-1.72.jar; lib:=true,\ - bcutil-jdk18on-1.72.jar; lib:=true,\ +-includeresource: bcpkix-jdk18on-1.77.jar; lib:=true,\ + bcprov-jdk18on-1.75.jar; lib:=true,\ + bcutil-jdk18on-1.75.jar; lib:=true,\ client-java-17.0.0.jar; lib:=true,\ client-java-api-17.0.0.jar; lib:=true,\ client-java-proto-17.0.0.jar; lib:=true,\ From e625163d0a519f03535f3e721679e4896314df6e Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Thu, 29 Jun 2023 10:03:15 +0100 Subject: [PATCH 111/263] uplift bouncy castle crypto library version Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../dev.galasa.kubernetes.manager/build.gradle | 4 ++-- release.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle index eb0e5b1f5..45aa276e8 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Kubernetes Manager' -version = '0.26.0' +version = '0.29.0' dependencies { api project(':galasa-managers-cloud-parent:dev.galasa.cloud.manager') @@ -12,7 +12,7 @@ dependencies { implementation ('org.bouncycastle:bcpkix-jdk18on') { version { - strictly '1.72' + strictly '1.75' } } implementation ('com.google.code.findbugs:jsr305') { diff --git a/release.yaml b/release.yaml index 87103d40a..6d8e13929 100644 --- a/release.yaml +++ b/release.yaml @@ -252,7 +252,7 @@ managers: isolated: true - artifact: dev.galasa.kubernetes.manager - version: 0.26.0 + version: 0.29.0 obr: true javadoc: true bom: true From 416ea004c4fb3d58e7e626c77f96220723ceda51 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Thu, 29 Jun 2023 10:14:21 +0100 Subject: [PATCH 112/263] bouncy castle uplift typo correction Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../dev.galasa.kubernetes.manager/bnd.bnd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd index 4226f2993..8744bbeb4 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd @@ -21,7 +21,7 @@ Import-Package: dev.galasa,\ org.xml.sax.helpers Embed-Transitive: true Embed-Dependency: *;scope=compile --includeresource: bcpkix-jdk18on-1.77.jar; lib:=true,\ +-includeresource: bcpkix-jdk18on-1.75.jar; lib:=true,\ bcprov-jdk18on-1.75.jar; lib:=true,\ bcutil-jdk18on-1.75.jar; lib:=true,\ client-java-17.0.0.jar; lib:=true,\ From 045bab3126241b8b0deeaf92ed3e32f8866043dc Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Thu, 29 Jun 2023 11:17:13 +0100 Subject: [PATCH 113/263] bouncy castle uplift Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../dev.galasa.zossecurity.manager/build.gradle | 14 +++++++------- release.yaml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle index 56813ff40..ce84ccec3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS Security Manager' -version = '0.25.0' +version = '0.29.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') @@ -13,19 +13,19 @@ dependencies { implementation 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.0' implementation 'org.apache.commons:commons-lang3:3.8.1' - implementation ('org.bouncycastle:bcpkix-jdk15on') { + implementation ('org.bouncycastle:bcpkix-jdk18on') { version { - strictly '1.69' + strictly '1.75' } } - implementation ('org.bouncycastle:bcprov-jdk15on') { + implementation ('org.bouncycastle:bcprov-jdk18on') { version { - strictly '1.69' + strictly '1.75' } } - implementation ('org.bouncycastle:bcutil-jdk15on') { + implementation ('org.bouncycastle:bcutil-jdk18on') { version { - strictly '1.69' + strictly '1.75' } } } diff --git a/release.yaml b/release.yaml index 6d8e13929..6e3ecfd56 100644 --- a/release.yaml +++ b/release.yaml @@ -461,7 +461,7 @@ managers: codecoverage: true - artifact: dev.galasa.zossecurity.manager - version: 0.25.0 + version: 0.29.0 obr: true javadoc: true bom: true From f73210872705db8f5643cb37ff916fc54767b11f Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Tue, 4 Jul 2023 17:55:54 +0100 Subject: [PATCH 114/263] re-build release.yaml from the managers in the source tree. Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .gitignore | 1 + README.md | 9 + .../settings.gradle | 7 +- .../settings.gradle | 9 +- .../settings.gradle | 6 +- .../settings.gradle | 9 +- .../settings.gradle | 6 +- .../settings.gradle | 9 +- .../settings.gradle | 7 +- .../dev.galasa.cicsts.manager/settings.gradle | 9 +- .../settings.gradle | 9 +- .../dev.galasa.cloud.manager/settings.gradle | 7 + .../settings.gradle | 6 +- .../dev.galasa.docker.manager/settings.gradle | 9 +- .../settings.gradle | 5 +- .../settings.gradle | 9 +- .../settings.gradle | 9 +- .../settings.gradle | 8 +- .../dev.galasa.common/settings.gradle | 7 +- .../settings.gradle | 6 +- .../dev.galasa.http.manager/settings.gradle | 9 +- .../settings.gradle | 9 +- .../dev.galasa.mq.manager.ivt/settings.gradle | 6 +- .../dev.galasa.mq.manager/settings.gradle | 8 +- .../settings.gradle | 6 +- .../settings.gradle | 7 + .../settings.gradle | 6 +- .../dev.galasa.core.manager/settings.gradle | 9 +- .../settings.gradle | 9 +- .../settings.gradle | 6 +- .../dev.galasa.db2.manager/settings.gradle | 8 +- .../dev.galasa.java.manager/settings.gradle | 8 +- .../settings.gradle | 8 +- .../settings.gradle | 8 +- .../settings.gradle | 5 +- .../settings.gradle | 7 +- .../settings.gradle | 6 +- .../settings.gradle | 7 +- .../settings.gradle | 7 +- .../settings.gradle | 8 +- .../dev.galasa.jmeter.manager/settings.gradle | 8 +- .../settings.gradle | 6 +- .../settings.gradle | 9 +- .../dev.galasa.vtp.manager/settings.gradle | 8 +- .../settings.gradle | 5 +- .../dev.galasa.linux.manager/settings.gradle | 8 +- .../settings.gradle | 8 +- .../settings.gradle | 6 + .../settings.gradle | 6 +- .../dev.galasa.zos.manager/settings.gradle | 9 +- .../dev.galasa.zos3270.common/settings.gradle | 5 + .../settings.gradle | 6 +- .../settings.gradle | 9 +- .../settings.gradle | 8 +- .../settings.gradle | 8 +- .../settings.gradle | 8 +- .../settings.gradle | 8 +- .../settings.gradle | 8 +- .../settings.gradle | 8 +- .../settings.gradle | 8 +- .../settings.gradle | 9 +- .../dev.galasa.zosmf.manager/settings.gradle | 9 +- .../settings.gradle | 9 +- .../settings.gradle | 9 +- .../settings.gradle | 9 +- .../settings.gradle | 8 +- .../settings.gradle | 8 +- release.yaml | 422 +++++++++--------- set-version.sh | 221 +++++++++ 69 files changed, 865 insertions(+), 282 deletions(-) create mode 100755 set-version.sh diff --git a/.gitignore b/.gitignore index 5d352d6db..f6463684d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ Snap*.trc **/gradle/wrapper local-builds/ **/.idea +temp/ diff --git a/README.md b/README.md index 9a6c770db..98e213466 100644 --- a/README.md +++ b/README.md @@ -26,4 +26,13 @@ Other Galasa repositories are available on [GitHub](https://github.com/galasa-de This code is under the [Eclipse Public License 2.0](https://github.com/galasa-dev/maven/blob/main/LICENSE). +## Building locally +Use the `./build-locally.sh` script to build locally. + +## Updating the versions of things +Use the `./set-version.sh --version x.y.z`, where `x.y.z` is the version you want things to be. +That script also scans the contents of the managers and populates the `release.yaml` file with version information +taken from each manager source folder. + + diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/settings.gradle index db2c96513..3f19711b7 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/settings.gradle @@ -1 +1,6 @@ -rootProject.name = 'dev.galasa.cicsts.ceci.manager.ivt' \ No newline at end of file +rootProject.name = 'dev.galasa.cicsts.ceci.manager.ivt' + +include_in_obr = true +include_in_mvp = true +include_in_bom = true +include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/settings.gradle index cf41efba5..e43a44906 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/settings.gradle @@ -1 +1,8 @@ -rootProject.name = 'dev.galasa.cicsts.ceci.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.cicsts.ceci.manager' + +include_in_obr = true +include_in_mvp = true +include_in_javadoc = true +include_in_bom = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/settings.gradle index 3d23092ff..cea9d6c13 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/settings.gradle @@ -1 +1,5 @@ -rootProject.name = 'dev.galasa.cicsts.ceda.manager.ivt' \ No newline at end of file +rootProject.name = 'dev.galasa.cicsts.ceda.manager.ivt' + +include_in_obr = true +include_in_mvp = true +include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/settings.gradle index bc30891ba..456a7b6f8 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/settings.gradle @@ -1 +1,8 @@ -rootProject.name = 'dev.galasa.cicsts.ceda.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.cicsts.ceda.manager' + +include_in_obr = true +include_in_mvp = true +include_in_javadoc = true +include_in_bom = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/settings.gradle index f8d73d1fe..a52fe0c77 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/settings.gradle @@ -1 +1,5 @@ -rootProject.name = 'dev.galasa.cicsts.cemt.manager.ivt' \ No newline at end of file +rootProject.name = 'dev.galasa.cicsts.cemt.manager.ivt' + +include_in_obr = true +include_in_mvp = true +include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/settings.gradle index 7000a4527..2ac6c1340 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/settings.gradle @@ -1 +1,8 @@ -rootProject.name = 'dev.galasa.cicsts.cemt.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.cicsts.cemt.manager' + +include_in_obr = true +include_in_mvp = true +include_in_javadoc = true +include_in_bom = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/settings.gradle index 3b0143115..a9453fcd3 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/settings.gradle @@ -1 +1,6 @@ -rootProject.name = 'dev.galasa.cicsts.manager.ivt' \ No newline at end of file +rootProject.name = 'dev.galasa.cicsts.manager.ivt' + +include_in_obr = true +include_in_mvp = true +include_in_bom = true +include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/settings.gradle index e83755535..b997d0bda 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/settings.gradle @@ -1 +1,8 @@ -rootProject.name = 'dev.galasa.cicsts.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.cicsts.manager' + +include_in_obr = true +include_in_mvp = true +include_in_javadoc = true +include_in_bom = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/settings.gradle index 0ae497a5c..647b62261 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/settings.gradle @@ -1 +1,8 @@ -rootProject.name = 'dev.galasa.cicsts.resource.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.cicsts.resource.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/settings.gradle index eef9af599..d7ca6dfc7 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/settings.gradle @@ -1 +1,8 @@ rootProject.name = 'dev.galasa.cloud.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/settings.gradle index ca8b77c14..dc09e4ccb 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/settings.gradle @@ -1 +1,5 @@ -rootProject.name = 'dev.galasa.docker.manager.ivt' \ No newline at end of file +rootProject.name = 'dev.galasa.docker.manager.ivt' + +include_in_obr = true +include_in_mvp = true +include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/settings.gradle index c3aa7a668..9ecd9758c 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/settings.gradle @@ -1 +1,8 @@ -rootProject.name = 'dev.galasa.docker.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.docker.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/settings.gradle index dd06fe350..2d28f09a6 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/settings.gradle @@ -1 +1,4 @@ -rootProject.name = 'dev.galasa.kubernetes.manager.ivt' \ No newline at end of file +rootProject.name = 'dev.galasa.kubernetes.manager.ivt' + +include_in_obr = true +include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/settings.gradle index 7c972a99f..433a52d77 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/settings.gradle @@ -1 +1,8 @@ -rootProject.name = 'dev.galasa.kubernetes.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.kubernetes.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/settings.gradle index c1d966552..9915c86c5 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/settings.gradle @@ -1 +1,8 @@ -rootProject.name = 'dev.galasa.liberty.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.liberty.manager' + +include_in_obr = true +include_in_mvp = true +include_in_javadoc = true +include_in_bom = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/settings.gradle index 8b59c21ce..3260c0d66 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'dev.galasa.openstack.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.openstack.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/settings.gradle b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/settings.gradle index a2a1c419a..46a11ae63 100644 --- a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/settings.gradle +++ b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/settings.gradle @@ -1 +1,6 @@ -rootProject.name = 'dev.galasa.common' \ No newline at end of file +rootProject.name = 'dev.galasa.common' + +include_in_obr = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/settings.gradle index b0ee74b2b..c94f0a6f8 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/settings.gradle @@ -1 +1,5 @@ -rootProject.name = 'dev.galasa.http.manager.ivt' \ No newline at end of file +rootProject.name = 'dev.galasa.http.manager.ivt' + +include_in_obr = true +include_in_mvp = true +include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/settings.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/settings.gradle index 85c6d3475..da236b085 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/settings.gradle @@ -1 +1,8 @@ -rootProject.name = 'dev.galasa.http.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.http.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/settings.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/settings.gradle index 446762548..c4984cfaa 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/settings.gradle @@ -1 +1,8 @@ -rootProject.name = 'dev.galasa.ipnetwork.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.ipnetwork.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/settings.gradle index 34aafed5e..05e3f4a98 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/settings.gradle @@ -1 +1,5 @@ -rootProject.name = 'dev.galasa.mq.manager.ivt' \ No newline at end of file +rootProject.name = 'dev.galasa.mq.manager.ivt' + +include_in_obr = true +include_in_bom = true +include_in_isolated = true diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/settings.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/settings.gradle index 1aac5ba35..31a3a4ef9 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'dev.galasa.mq.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.mq.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/settings.gradle index e7a324369..0000e1ade 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/settings.gradle @@ -1 +1,5 @@ -rootProject.name = 'dev.galasa.artifact.manager.ivt' \ No newline at end of file +rootProject.name = 'dev.galasa.artifact.manager.ivt' + +include_in_obr = true +include_in_mvp = true +include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/settings.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/settings.gradle index 0b8530e68..6244e0284 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/settings.gradle @@ -1 +1,8 @@ rootProject.name = 'dev.galasa.artifact.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_code_coverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/settings.gradle index c6115ed62..d0ce98349 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/settings.gradle @@ -1 +1,5 @@ -rootProject.name = 'dev.galasa.core.manager.ivt' \ No newline at end of file +rootProject.name = 'dev.galasa.core.manager.ivt' + +include_in_obr = true +include_in_mvp = true +include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/settings.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/settings.gradle index 6b49a5e37..a03e31866 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/settings.gradle @@ -1 +1,8 @@ -rootProject.name = 'dev.galasa.core.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.core.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/settings.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/settings.gradle index f6a3dec00..283cfc1d6 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/settings.gradle @@ -1 +1,8 @@ -rootProject.name = 'dev.galasa.textscan.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.textscan.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/settings.gradle index a096fe92f..62fd527bf 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/settings.gradle @@ -1 +1,5 @@ -rootProject.name = 'dev.galasa.db2.manager.ivt' \ No newline at end of file +rootProject.name = 'dev.galasa.db2.manager.ivt' + +include_in_obr = true +include_in_mvp = true +include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/settings.gradle b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/settings.gradle index 5a5f81164..566dd8eb4 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'dev.galasa.db2.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.db2.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/settings.gradle b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/settings.gradle index a7cc24960..dfb87ce43 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'dev.galasa.java.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.java.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/settings.gradle b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/settings.gradle index 6807cded2..2173951b1 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'dev.galasa.java.ubuntu.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.java.ubuntu.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_isolated = true +include_in_codecoverage = true diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/settings.gradle b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/settings.gradle index b05d2e45e..4ebc6b462 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'dev.galasa.java.windows.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.java.windows.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/settings.gradle index c907026e1..30562d941 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/settings.gradle @@ -1 +1,4 @@ -rootProject.name = 'dev.galasa.elasticlog.manager.ivt' \ No newline at end of file +rootProject.name = 'dev.galasa.elasticlog.manager.ivt' + +include_in_obr = true +include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/settings.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/settings.gradle index e993ecdc8..7dbfc444a 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/settings.gradle @@ -1 +1,6 @@ -rootProject.name = 'dev.galasa.elasticlog.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.elasticlog.manager' + +include_in_obr = true +include_in_bom = true +include_in_isolated = true +include_in_codecoverage = true diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/settings.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/settings.gradle index eff66c84b..6ff7e8731 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/settings.gradle @@ -1 +1,5 @@ -rootProject.name = 'dev.galasa.phoenix2.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.phoenix2.manager' + +include_in_obr = true +include_in_bom = true +include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/settings.gradle index bd3a326f5..22bfae0a6 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/settings.gradle @@ -1 +1,6 @@ -rootProject.name = 'dev.galasa.galasaecosystem.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.galasaecosystem.manager.ivt' + +include_in_obr = true +include_in_isolated = true + + \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/settings.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/settings.gradle index bd3a326f5..0ed9ef833 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/settings.gradle @@ -1 +1,6 @@ -rootProject.name = 'dev.galasa.galasaecosystem.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.galasaecosystem.manager' + +include_in_obr = true +include_in_bom = true +include_in_isolated = true +include_in_codecoverage = true diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/settings.gradle index 568edb9b9..b1c217108 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'dev.galasa.jmeter.manager.ivt' \ No newline at end of file +rootProject.name = 'dev.galasa.jmeter.manager.ivt' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/settings.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/settings.gradle index f327327b7..b887f96e7 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'dev.galasa.jmeter.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.jmeter.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_isolated = true +include_in_codecoverage = true diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/settings.gradle index a90d1366e..cf7b56a7f 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/settings.gradle @@ -1 +1,5 @@ -rootProject.name = 'dev.galasa.selenium.manager.ivt' \ No newline at end of file +rootProject.name = 'dev.galasa.selenium.manager.ivt' + +include_in_obr = true +include_in_mvp = true +include_in_isolated = true diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/settings.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/settings.gradle index 9664f1919..185a74f8d 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/settings.gradle @@ -1 +1,8 @@ -rootProject.name = 'dev.galasa.selenium.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.selenium.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/settings.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/settings.gradle index 96c363848..07302fe68 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'dev.galasa.vtp.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.vtp.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/settings.gradle index 34b923e99..6272d45f4 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/settings.gradle @@ -1 +1,4 @@ -rootProject.name = 'dev.galasa.linux.manager.ivt' \ No newline at end of file +rootProject.name = 'dev.galasa.linux.manager.ivt' + +include_in_obr = true +include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/settings.gradle b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/settings.gradle index ddb3dcf86..99a2f9aa2 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'dev.galasa.linux.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.linux.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_isolated = true +include_in_codecoverage = true diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/settings.gradle b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/settings.gradle index 98942ec01..c3e9f8de4 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'dev.galasa.windows.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.windows.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_isolated = true +include_in_codecoverage = true diff --git a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/settings.gradle b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/settings.gradle index 430d1242d..7fd0d06d2 100644 --- a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/settings.gradle @@ -1 +1,7 @@ rootProject.name = 'dev.galasa.githubissue.manager' + +include_in_obr = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true + diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/settings.gradle index 5a9b5d76c..1177aebdc 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/settings.gradle @@ -1 +1,5 @@ -rootProject.name = 'dev.galasa.zos.manager.ivt' \ No newline at end of file +rootProject.name = 'dev.galasa.zos.manager.ivt' + +include_in_obr = true +include_in_mvp = true +include_in_isolated = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/settings.gradle index a041a484a..b935c6812 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/settings.gradle @@ -1 +1,8 @@ -rootProject.name = 'dev.galasa.zos.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.zos.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/settings.gradle index 398946c10..e05a01beb 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/settings.gradle @@ -1,2 +1,7 @@ rootProject.name = 'dev.galasa.zos3270.common' +include_in_obr = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/settings.gradle index df864bb62..8777bfba9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/settings.gradle @@ -1 +1,5 @@ -rootProject.name = 'dev.galasa.zos3270.manager.ivt' \ No newline at end of file +rootProject.name = 'dev.galasa.zos3270.manager.ivt' + +include_in_obr = true +include_in_mvp = true +include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/settings.gradle index e3b2c860a..1c6ba3278 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/settings.gradle @@ -1 +1,8 @@ -rootProject.name = 'dev.galasa.zos3270.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.zos3270.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/settings.gradle index 3197bac73..b5bd8d686 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'dev.galasa.zosbatch.rseapi.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.zosbatch.rseapi.manager' + +include_in_obr = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/settings.gradle index 8627b7e41..8189af0cf 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'dev.galasa.zosbatch.zosmf.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.zosbatch.zosmf.manager' + +include_in_obr = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/settings.gradle index 19b0a3043..7dd877b50 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'dev.galasa.zosconsole.oeconsol.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.zosconsole.oeconsol.manager' + +include_in_obr = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/settings.gradle index 143c80dc7..5fd517276 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'dev.galasa.zosconsole.zosmf.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.zosconsole.zosmf.manager' + +include_in_obr = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/settings.gradle index 55f5fb72c..742d1ef10 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'dev.galasa.zosfile.rseapi.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.zosfile.rseapi.manager' + +include_in_obr = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/settings.gradle index f464b0e1d..fc048fee4 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'dev.galasa.zosfile.zosmf.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.zosfile.zosmf.manager' + +include_in_obr = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/settings.gradle index 115e6a7ee..4d825187c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'dev.galasa.zosliberty.angel.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.zosliberty.angel.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_isolated = true +include_in_codecoverage = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/settings.gradle index a2dc1c348..a2fa91273 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/settings.gradle @@ -1 +1,8 @@ -rootProject.name = 'dev.galasa.zosliberty.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.zosliberty.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/settings.gradle index 9fb465d13..39a7e06db 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/settings.gradle @@ -1 +1,8 @@ -rootProject.name = 'dev.galasa.zosmf.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.zosmf.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/settings.gradle index ea9d455a4..75409db46 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/settings.gradle @@ -1 +1,8 @@ -rootProject.name = 'dev.galasa.zosprogram.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.zosprogram.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/settings.gradle index 8d8c913be..10c8f22a8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/settings.gradle @@ -1 +1,8 @@ -rootProject.name = 'dev.galasa.zosrseapi.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.zosrseapi.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/settings.gradle index a1e273fd3..ed5eebcab 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/settings.gradle @@ -1 +1,8 @@ -rootProject.name = 'dev.galasa.zossecurity.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.zossecurity.manager' + +include_in_obr = true +include_in_javadoc = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/settings.gradle index c0eb4fc2d..aa38df8a9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'dev.galasa.zostsocommand.ssh.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.zostsocommand.ssh.manager' + +include_in_obr = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/settings.gradle index 003ac9382..9fc1bc52c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/settings.gradle @@ -1 +1,7 @@ -rootProject.name = 'dev.galasa.zosunixcommand.ssh.manager' \ No newline at end of file +rootProject.name = 'dev.galasa.zosunixcommand.ssh.manager' + +include_in_obr = true +include_in_bom = true +include_in_mvp = true +include_in_isolated = true +include_in_codecoverage = true \ No newline at end of file diff --git a/release.yaml b/release.yaml index 6e3ecfd56..858960815 100644 --- a/release.yaml +++ b/release.yaml @@ -1,6 +1,16 @@ # # Copyright contributors to the Galasa project # + +# ----------------------------------------------------------- +# +# WARNING +# +# This file is periodically re-generated from the contents of +# the repository, so don't make changes here manually please. +# ----------------------------------------------------------- + + apiVersion: galasa.dev/v1alpha kind: Release metadata: @@ -13,83 +23,67 @@ managers: # Manager # - - artifact: dev.galasa.artifact.manager + - artifact: galasa-managers-parent + version: 0.15.0 + + - artifact: dev.galasa.cicsts.ceci.manager version: 0.25.0 obr: true javadoc: true bom: true mvp: true isolated: true - codecoverage: true - - - artifact: dev.galasa.artifact.manager.ivt + + - artifact: dev.galasa.cicsts.ceci.manager.ivt version: 0.25.0 obr: true + bom: true mvp: true isolated: true - - - artifact: dev.galasa.cicsts.manager - version: 0.28.0 + + - artifact: dev.galasa.cicsts.ceda.manager + version: 0.29.0 obr: true - mvp: true javadoc: true bom: true + mvp: true isolated: true - codecoverage: true - - artifact: dev.galasa.cicsts.manager.ivt + - artifact: dev.galasa.cicsts.ceda.manager.ivt version: 0.22.0 obr: true mvp: true - bom: true isolated: true - - - artifact: dev.galasa.cicsts.ceci.manager + + - artifact: dev.galasa.cicsts.cemt.manager version: 0.25.0 obr: true - mvp: true javadoc: true bom: true + mvp: true isolated: true - codecoverage: true - - artifact: dev.galasa.cicsts.ceci.manager.ivt - version: 0.25.0 + - artifact: dev.galasa.cicsts.cemt.manager.ivt + version: 0.22.0 obr: true mvp: true - bom: true isolated: true - - - artifact: dev.galasa.cicsts.ceda.manager - version: 0.29.0 + + - artifact: dev.galasa.cicsts.manager + version: 0.28.0 obr: true - mvp: true javadoc: true bom: true - isolated: true - codecoverage: true - - - artifact: dev.galasa.cicsts.ceda.manager.ivt - version: 0.22.0 - obr: true mvp: true isolated: true - - - artifact: dev.galasa.cicsts.cemt.manager + + - artifact: dev.galasa.cicsts.manager.ivt version: 0.25.0 obr: true - mvp: true - javadoc: true bom: true - isolated: true - codecoverage: true - - - artifact: dev.galasa.cicsts.cemt.manager.ivt - version: 0.22.0 - obr: true mvp: true isolated: true - + - artifact: dev.galasa.cicsts.resource.manager version: 0.25.0 obr: true @@ -97,8 +91,7 @@ managers: bom: true mvp: true isolated: true - codecoverage: true - + - artifact: dev.galasa.cloud.manager version: 0.22.0 obr: true @@ -106,268 +99,313 @@ managers: bom: true mvp: true isolated: true - codecoverage: true - - artifact: dev.galasa.common + - artifact: dev.galasa.docker.manager version: 0.25.0 obr: true + javadoc: true bom: true mvp: true isolated: true - - - artifact: dev.galasa.core.manager + + - artifact: dev.galasa.docker.manager.ivt version: 0.25.0 obr: true + mvp: true + isolated: true + + - artifact: dev.galasa.kubernetes.manager + version: 0.29.0 + obr: true javadoc: true bom: true mvp: true isolated: true - codecoverage: true - - - artifact: dev.galasa.core.manager.ivt + + - artifact: dev.galasa.kubernetes.manager.ivt version: 0.21.0 obr: true - mvp: true isolated: true - - artifact: dev.galasa.db2.manager - version: 0.25.0 + - artifact: dev.galasa.liberty.manager + version: 0.21.0 obr: true - bom: true javadoc: true + bom: true mvp: true isolated: true - - artifact: dev.galasa.db2.manager.ivt - version: 0.21.0 + - artifact: dev.galasa.openstack.manager + version: 0.26.0 + obr: true + javadoc: true + bom: true + isolated: true + + - artifact: dev.galasa.common + version: 0.25.0 obr: true + bom: true mvp: true isolated: true - - - artifact: dev.galasa.docker.manager + + - artifact: dev.galasa.http.manager version: 0.25.0 obr: true javadoc: true bom: true mvp: true isolated: true - codecoverage: true - - - artifact: dev.galasa.docker.manager.ivt + + - artifact: dev.galasa.http.manager.ivt version: 0.25.0 obr: true mvp: true isolated: true - - - artifact: dev.galasa.elasticlog.manager + + - artifact: dev.galasa.ipnetwork.manager version: 0.25.0 obr: true + javadoc: true bom: true + mvp: true isolated: true - codecoverage: true - - - artifact: dev.galasa.elasticlog.manager.ivt + + - artifact: dev.galasa.mq.manager + version: 0.25.0 + obr: true + javadoc: true + bom: true + isolated: true + + - artifact: dev.galasa.mq.manager.ivt version: 0.21.0 obr: true + bom: true isolated: true - - - artifact: dev.galasa.galasaecosystem.manager - version: 0.27.0 + + - artifact: dev.galasa.artifact.manager + version: 0.25.0 obr: true + javadoc: true bom: true + mvp: true isolated: true codecoverage: true - - artifact: dev.galasa.galasaecosystem.manager.ivt - version: 0.21.0 + - artifact: dev.galasa.artifact.manager.ivt + version: 0.25.0 obr: true + mvp: true isolated: true - - artifact: dev.galasa.githubissue.manager + - artifact: dev.galasa.core.manager version: 0.25.0 obr: true - mvp: false + javadoc: true bom: true - isolated: false - - - artifact: dev.galasa.http.manager - version: 0.25.0 + mvp: true + isolated: true + + - artifact: dev.galasa.core.manager.ivt + version: 0.21.0 + obr: true + mvp: true + isolated: true + + - artifact: dev.galasa.textscan.manager + version: 0.21.0 obr: true javadoc: true bom: true mvp: true isolated: true - codecoverage: true - - - artifact: dev.galasa.http.manager.ivt + + - artifact: dev.galasa.db2.manager version: 0.25.0 obr: true + javadoc: true + bom: true mvp: true isolated: true - - - artifact: dev.galasa.ipnetwork.manager + + - artifact: dev.galasa.db2.manager.ivt version: 0.25.0 obr: true - javadoc: true - bom: true mvp: true isolated: true - codecoverage: true - + + - artifact: dev.galasa.eclipseruntime + version: 0.18.0 + + - artifact: dev.galasa.eclipseruntime.ubuntu.manager + version: 0.18.0 + + - artifact: dev.galasa.sem.manager + version: 0.25.0 + - artifact: dev.galasa.java.manager version: 0.21.0 obr: true javadoc: true bom: true isolated: true - codecoverage: true - + - artifact: dev.galasa.java.ubuntu.manager version: 0.21.0 obr: true javadoc: true bom: true isolated: true - codecoverage: true - + - artifact: dev.galasa.java.windows.manager version: 0.21.0 obr: true javadoc: true bom: true isolated: true - codecoverage: true - - - artifact: dev.galasa.jmeter.manager + + - artifact: dev.galasa.elasticlog.manager version: 0.25.0 obr: true - javadoc: true bom: true isolated: true - codecoverage: true - - - artifact: dev.galasa.jmeter.manager.ivt + + - artifact: dev.galasa.elasticlog.manager.ivt + version: 0.21.0 + obr: true + isolated: true + + - artifact: dev.galasa.phoenix2.manager version: 0.25.0 obr: true + bom: true isolated: true - - - artifact: dev.galasa.kubernetes.manager - version: 0.29.0 + + - artifact: dev.galasa.galasaecosystem.manager + version: 0.27.0 obr: true - javadoc: true bom: true - mvp: true isolated: true - codecoverage: true - - - artifact: dev.galasa.kubernetes.manager.ivt + + - artifact: dev.galasa.galasaecosystem.manager.ivt version: 0.21.0 obr: true isolated: true - - - artifact: dev.galasa.liberty.manager - version: 0.21.0 + + - artifact: dev.galasa.jmeter.manager + version: 0.25.0 obr: true - mvp: true javadoc: true bom: true isolated: true - codecoverage: true - - - artifact: dev.galasa.linux.manager - version: 0.21.0 + + - artifact: dev.galasa.jmeter.manager.ivt + version: 0.25.0 obr: true javadoc: true bom: true isolated: true - codecoverage: true - - - artifact: dev.galasa.linux.manager.ivt + + - artifact: dev.galasa.selenium.manager + version: 0.25.0 + obr: true + javadoc: true + bom: true + mvp: true + isolated: true + + - artifact: dev.galasa.selenium.manager.ivt version: 0.21.0 obr: true + mvp: true isolated: true - - artifact: dev.galasa.mq.manager + - artifact: dev.galasa.vtp.manager version: 0.25.0 obr: true javadoc: true bom: true + mvp: true isolated: true - codecoverage: true - - - artifact: dev.galasa.mq.manager.ivt + + - artifact: dev.galasa.vtp.manager.ivt + version: 0.21.0 + + - artifact: dev.galasa.linux.manager version: 0.21.0 obr: true + javadoc: true bom: true isolated: true - - - artifact: dev.galasa.openstack.manager - version: 0.26.0 + + - artifact: dev.galasa.linux.manager.ivt + version: 0.21.0 + obr: true + isolated: true + + - artifact: dev.galasa.windows.manager + version: 0.21.0 obr: true javadoc: true bom: true isolated: true - codecoverage: true - - - artifact: dev.galasa.phoenix2.manager + + - artifact: dev.galasa.githubissue.manager version: 0.25.0 obr: true bom: true + mvp: true isolated: true - - - artifact: dev.galasa.selenium.manager - version: 0.25.0 + + - artifact: dev.galasa.zos.manager + version: 0.28.0 obr: true javadoc: true bom: true mvp: true isolated: true - codecoverage: true - - - artifact: dev.galasa.selenium.manager.ivt - version: 0.21.0 + + - artifact: dev.galasa.zos.manager.ivt + version: 0.28.0 obr: true mvp: true isolated: true - - - artifact: dev.galasa.sem.manager - version: 0.25.0 + + - artifact: dev.galasa.zos3270.common + version: 0.28.0 obr: true bom: true + mvp: true isolated: true - - - artifact: dev.galasa.textscan.manager - version: 0.21.0 + + - artifact: dev.galasa.zos3270.manager + version: 0.28.0 obr: true - mvp: true javadoc: true bom: true + mvp: true isolated: true - codecoverage: true - - - artifact: dev.galasa.windows.manager + + - artifact: dev.galasa.zos3270.manager.ivt version: 0.21.0 obr: true - javadoc: true - bom: true + mvp: true isolated: true - codecoverage: true - + - artifact: dev.galasa.zosbatch.rseapi.manager version: 0.26.0 obr: true bom: true mvp: true isolated: true - codecoverage: true - + - artifact: dev.galasa.zosbatch.zosmf.manager version: 0.26.0 obr: true bom: true mvp: true isolated: true - codecoverage: true - artifact: dev.galasa.zosconsole.oeconsol.manager version: 0.21.0 @@ -375,82 +413,59 @@ managers: bom: true mvp: true isolated: true - codecoverage: true - + - artifact: dev.galasa.zosconsole.zosmf.manager version: 0.25.0 obr: true bom: true mvp: true isolated: true - codecoverage: true - + - artifact: dev.galasa.zosfile.rseapi.manager version: 0.25.0 obr: true bom: true mvp: true isolated: true - codecoverage: true - + - artifact: dev.galasa.zosfile.zosmf.manager version: 0.25.0 obr: true bom: true mvp: true isolated: true - codecoverage: true - - - artifact: dev.galasa.zosliberty.manager - version: 0.21.0 - obr: true - mvp: true - javadoc: true - bom: true - isolated: true - codecoverage: true - + - artifact: dev.galasa.zosliberty.angel.manager version: 0.21.0 obr: true javadoc: true bom: true isolated: true - codecoverage: true - - - artifact: dev.galasa.zos.manager - version: 0.28.0 + + - artifact: dev.galasa.zosliberty.manager + version: 0.21.0 obr: true javadoc: true bom: true mvp: true isolated: true - codecoverage: true - - - artifact: dev.galasa.zos.manager.ivt - version: 0.28.0 - obr: true - mvp: true - isolated: true - - - artifact: dev.galasa.zosprogram.manager + + - artifact: dev.galasa.zosmf.manager version: 0.25.0 obr: true javadoc: true bom: true mvp: true isolated: true - codecoverage: true - - - artifact: dev.galasa.zosmf.manager + + - artifact: dev.galasa.zosprogram.manager version: 0.25.0 obr: true javadoc: true bom: true mvp: true isolated: true - codecoverage: true - + - artifact: dev.galasa.zosrseapi.manager version: 0.25.0 obr: true @@ -458,8 +473,7 @@ managers: bom: true mvp: true isolated: true - codecoverage: true - + - artifact: dev.galasa.zossecurity.manager version: 0.29.0 obr: true @@ -467,51 +481,17 @@ managers: bom: true mvp: true isolated: true - codecoverage: true - + - artifact: dev.galasa.zostsocommand.ssh.manager version: 0.21.0 obr: true bom: true mvp: true isolated: true - codecoverage: true - + - artifact: dev.galasa.zosunixcommand.ssh.manager version: 0.21.0 obr: true bom: true mvp: true isolated: true - codecoverage: true - - - artifact: dev.galasa.zos3270.common - version: 0.28.0 - obr: true - bom: true - mvp: true - isolated: true - codecoverage: true - - - artifact: dev.galasa.zos3270.manager - version: 0.28.0 - obr: true - javadoc: true - bom: true - mvp: true - isolated: true - codecoverage: true - - - artifact: dev.galasa.zos3270.manager.ivt - version: 0.21.0 - obr: true - mvp: true - isolated: true - - - artifact: dev.galasa.vtp.manager - version: 0.25.0 - obr: true - javadoc: true - bom: true - mvp: true - isolated: true diff --git a/set-version.sh b/set-version.sh new file mode 100755 index 000000000..68bdbe389 --- /dev/null +++ b/set-version.sh @@ -0,0 +1,221 @@ +#! /usr/bin/env bash + +#----------------------------------------------------------------------------------------- +# +# Objectives: Sets the version number, and/or re-build the release.yaml +# +# Environment variable over-rides: +# None +# +#----------------------------------------------------------------------------------------- + +# Where is this script executing from ? +BASEDIR=$(dirname "$0");pushd $BASEDIR 2>&1 >> /dev/null ;BASEDIR=$(pwd);popd 2>&1 >> /dev/null +# echo "Running from directory ${BASEDIR}" +export ORIGINAL_DIR=$(pwd) +# cd "${BASEDIR}" + +cd "${BASEDIR}/.." +WORKSPACE_DIR=$(pwd) + + +#----------------------------------------------------------------------------------------- +# +# Set Colors +# +#----------------------------------------------------------------------------------------- +bold=$(tput bold) +underline=$(tput sgr 0 1) +reset=$(tput sgr0) +red=$(tput setaf 1) +green=$(tput setaf 76) +white=$(tput setaf 7) +tan=$(tput setaf 202) +blue=$(tput setaf 25) + +#----------------------------------------------------------------------------------------- +# +# Headers and Logging +# +#----------------------------------------------------------------------------------------- +underline() { printf "${underline}${bold}%s${reset}\n" "$@" +} +h1() { printf "\n${underline}${bold}${blue}%s${reset}\n" "$@" +} +h2() { printf "\n${underline}${bold}${white}%s${reset}\n" "$@" +} +debug() { printf "${white}%s${reset}\n" "$@" +} +info() { printf "${white}➜ %s${reset}\n" "$@" +} +success() { printf "${green}✔ %s${reset}\n" "$@" +} +error() { printf "${red}✖ %s${reset}\n" "$@" +} +warn() { printf "${tan}➜ %s${reset}\n" "$@" +} +bold() { printf "${bold}%s${reset}\n" "$@" +} +note() { printf "\n${underline}${bold}${blue}Note:${reset} ${blue}%s${reset}\n" "$@" +} + +#----------------------------------------------------------------------------------------- +# Functions +#----------------------------------------------------------------------------------------- +function usage { + h1 "Syntax" + cat << EOF +set-version.sh [OPTIONS] +Options are: +-v | --version xxx : Mandatory. Set the version number to something explicitly. + Re-builds the release.yaml based on the contents of sub-projects. + For example '--version 0.29.0' +EOF +} + +#----------------------------------------------------------------------------------------- +# Process parameters +#----------------------------------------------------------------------------------------- +overall_version="" + +while [ "$1" != "" ]; do + case $1 in + -v | --version ) export overall_version=$1 + shift + ;; + -h | --help ) usage + exit + ;; + * ) error "Unexpected argument $1" + usage + exit 1 + esac + shift +done + +if [[ -z $overall_version ]]; then + error "Missing mandatory '--version' argument." + usage + exit 1 +fi + +function build_release_yaml { + target_file=$1 + + + cd $BASEDIR + + manager_folders_list="$target_file-temp-managers-folders.txt" + find . | grep "build.gradle" | sed "s/\/build.gradle//g" | sort > $manager_folders_list + + cat << EOF > $target_file +# +# Copyright contributors to the Galasa project +# + +# ----------------------------------------------------------- +# +# WARNING +# +# This file is periodically re-generated from the contents of +# the repository, so don't make changes here manually please. +# ----------------------------------------------------------- + + +apiVersion: galasa.dev/v1alpha +kind: Release +metadata: + name: galasa-release + +managers: + bundles: + +# +# Manager +# +EOF + + + # Results in a file containing things like this: + # ./galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt + # ./galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager + # ./galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager + + while IFS= read -r manager_folder + do + info "Processing folder $manager_folder..." + manager_version=$(cat $manager_folder/build.gradle | grep "version =" | cut -f2 -d"'") + + manager_name=$(cat $manager_folder/settings.gradle | grep "rootProject.name =" | cut -f2 -d"'") + + + if [[ "${manager_name}" != "" ]]; then + + # The settings.gradle file also contains something like this: + # include_in_obr = true + # include_in_javadoc = true + # include_in_bom = true + # include_in_mvp = true + # include_in_isolated = true + # include_in_code_coverage = true + # ... which we need to read-in. + include_in_obr=$(cat $manager_folder/settings.gradle | grep -v "\/\/" | grep "include_in_obr" | sed "s/=/ /g" | xargs | cut -f2 -d' ') + include_in_javadoc=$(cat $manager_folder/settings.gradle | grep -v "\/\/" | grep "include_in_javadoc" | sed "s/=/ /g" | xargs | cut -f2 -d' ') + include_in_bom=$(cat $manager_folder/settings.gradle | grep -v "\/\/" | grep "include_in_bom" | sed "s/=/ /g" | xargs | cut -f2 -d' ') + include_in_mvp=$(cat $manager_folder/settings.gradle | grep -v "\/\/" | grep "include_in_mvp" | sed "s/=/ /g" | xargs | cut -f2 -d' ') + include_in_isolated=$(cat $manager_folder/settings.gradle | grep -v "\/\/" | grep "include_in_isolated" | sed "s/=/ /g" | xargs | cut -f2 -d' ') + include_in_code_coverage=$(cat $manager_folder/settings.gradle | grep -v "\/\/" | grep "include_in_code_coverage" | sed "s/=/ /g" | xargs | cut -f2 -d' ') + + info "Manager '$manager_name' is at version '$manager_version'" + + echo "" >> $target_file + echo " - artifact: $manager_name" >> $target_file + echo " version: $manager_version" >> $target_file + + if [[ "${include_in_obr}" != "" ]]; then + echo " obr: $include_in_obr" >> $target_file + fi + + if [[ "${include_in_javadoc}" != "" ]]; then + echo " javadoc: $include_in_javadoc" >> $target_file + fi + + if [[ "${include_in_bom}" != "" ]]; then + echo " bom: $include_in_bom" >> $target_file + fi + + if [[ "${include_in_mvp}" != "" ]]; then + echo " mvp: $include_in_mvp" >> $target_file + fi + + if [[ "${include_in_isolated}" != "" ]]; then + echo " isolated: $include_in_isolated" >> $target_file + fi + + if [[ "${include_in_code_coverage}" != "" ]]; then + echo " codecoverage: $include_in_code_coverage" >> $target_file + fi + + fi + + done < $manager_folders_list + + rm $manager_folders_list + +} + +rm -fr $BASEDIR/temp +mkdir -p $BASEDIR/temp + +build_release_yaml $BASEDIR/temp/release.yaml + +diff ${BASEDIR}/release.yaml $BASEDIR/temp/release.yaml > /dev/null +is_different=$? +if [[ "${is_different}" == "0" ]]; then + info "The generated yaml and the release.yaml are the same, so not replacing it." +else + info "Replacing the generated yaml with the release.yaml file..." + cp $BASEDIR/temp/release.yaml ${BASEDIR}/release.yaml +fi + +success "OK" \ No newline at end of file From fb596f834a336c2dfb685d44031905ff7428a56c Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Mon, 10 Jul 2023 17:41:22 +0100 Subject: [PATCH 115/263] build-release-yaml.sh is now generated. Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- build-locally.sh | 65 +++++++++++++++---------- set-version.sh => build-release-yaml.sh | 18 ++----- 2 files changed, 42 insertions(+), 41 deletions(-) rename set-version.sh => build-release-yaml.sh (92%) diff --git a/build-locally.sh b/build-locally.sh index f2f1ccc7e..9eaa00833 100755 --- a/build-locally.sh +++ b/build-locally.sh @@ -107,7 +107,7 @@ fi source_dir="galasa-managers-parent" project=$(basename ${BASEDIR}) -h1 "Building ${project}" + # Debug or not debug ? Override using the DEBUG flag. if [[ -z ${DEBUG} ]]; then @@ -140,34 +140,47 @@ else fi mkdir -p ${LOGS_DIR} 2>&1 > /dev/null # Don't show output. We don't care if it already existed. -info "Using source code at ${source_dir}" -cd ${BASEDIR}/${source_dir} -if [[ "${DEBUG}" == "1" ]]; then - OPTIONAL_DEBUG_FLAG="-debug" -else - OPTIONAL_DEBUG_FLAG="-info" -fi -# auto plain rich or verbose -CONSOLE_FLAG=--console=plain +function build_code { + h1 "Building ${project}" + info "Using source code at ${source_dir}" + cd ${BASEDIR}/${source_dir} + if [[ "${DEBUG}" == "1" ]]; then + OPTIONAL_DEBUG_FLAG="-debug" + else + OPTIONAL_DEBUG_FLAG="-info" + fi -log_file=${LOGS_DIR}/logs.txt -info "Log will be placed at ${log_file}" + # auto plain rich or verbose + CONSOLE_FLAG=--console=plain -if [[ "${build_type}" == "clean" ]]; then - goals="clean build check publishToMavenLocal -no-build-cache --no-daemon --parallel" -else - goals="build check publishToMavenLocal --parallel" -fi + log_file=${LOGS_DIR}/logs.txt + info "Log will be placed at ${log_file}" + + if [[ "${build_type}" == "clean" ]]; then + goals="clean build check publishToMavenLocal -no-build-cache --no-daemon --parallel" + else + goals="build check publishToMavenLocal --parallel" + fi -cmd="gradle \ -${CONSOLE_FLAG} \ --Dorg.gradle.java.home=${JAVA_HOME} \ --PsourceMaven=${SOURCE_MAVEN} ${OPTIONAL_DEBUG_FLAG} \ -${goals} -" + cmd="gradle \ + ${CONSOLE_FLAG} \ + -Dorg.gradle.java.home=${JAVA_HOME} \ + -PsourceMaven=${SOURCE_MAVEN} ${OPTIONAL_DEBUG_FLAG} \ + ${goals} + " + + $cmd 2>&1 > ${log_file} + + rc=$? ; if [[ "${rc}" != "0" ]]; then error "Failed to build ${project} see logs at ${log_file}" ; exit 1 ; fi + success "Project ${project} built - OK - log is at ${log_file}" + +} + +function build_release_yaml { + $BASEDIR/build-release-yaml.sh +} -$cmd 2>&1 > ${log_file} +build_code -rc=$? ; if [[ "${rc}" != "0" ]]; then error "Failed to build ${project} see logs at ${log_file}" ; exit 1 ; fi -success "Project ${project} built - OK - log is at ${log_file}" +build_release_yaml \ No newline at end of file diff --git a/set-version.sh b/build-release-yaml.sh similarity index 92% rename from set-version.sh rename to build-release-yaml.sh index 68bdbe389..6e619b53d 100755 --- a/set-version.sh +++ b/build-release-yaml.sh @@ -2,7 +2,7 @@ #----------------------------------------------------------------------------------------- # -# Objectives: Sets the version number, and/or re-build the release.yaml +# Objectives: Re-build the release.yaml # # Environment variable over-rides: # None @@ -65,24 +65,18 @@ note() { printf "\n${underline}${bold}${blue}Note:${reset} ${blue}%s${reset}\n" function usage { h1 "Syntax" cat << EOF -set-version.sh [OPTIONS] +build-release-yaml.sh [OPTIONS] Options are: --v | --version xxx : Mandatory. Set the version number to something explicitly. - Re-builds the release.yaml based on the contents of sub-projects. - For example '--version 0.29.0' +(none yet implemented) EOF } #----------------------------------------------------------------------------------------- # Process parameters #----------------------------------------------------------------------------------------- -overall_version="" while [ "$1" != "" ]; do case $1 in - -v | --version ) export overall_version=$1 - shift - ;; -h | --help ) usage exit ;; @@ -93,16 +87,10 @@ while [ "$1" != "" ]; do shift done -if [[ -z $overall_version ]]; then - error "Missing mandatory '--version' argument." - usage - exit 1 -fi function build_release_yaml { target_file=$1 - cd $BASEDIR manager_folders_list="$target_file-temp-managers-folders.txt" From 5fc8804f131a397c77059a779011e8416e7705e4 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Mon, 10 Jul 2023 17:46:48 +0100 Subject: [PATCH 116/263] readme instructions detail the release.yaml generation details Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 98e213466..781a68ad1 100644 --- a/README.md +++ b/README.md @@ -30,9 +30,7 @@ This code is under the [Eclipse Public License 2.0](https://github.com/galasa-de Use the `./build-locally.sh` script to build locally. ## Updating the versions of things -Use the `./set-version.sh --version x.y.z`, where `x.y.z` is the version you want things to be. -That script also scans the contents of the managers and populates the `release.yaml` file with version information -taken from each manager source folder. +Use the `./build-release-yaml.sh` script to scan the contents of the managers source code and populate the `release.yaml` file with version information taken from each manager source folder. From 40776dbf17ed0dee2941c3117f5875da2dda78c6 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Mon, 10 Jul 2023 17:55:46 +0100 Subject: [PATCH 117/263] comments in each settings.gradle file Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../dev.galasa.zosunixcommand.ssh.manager/settings.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/settings.gradle index 9fc1bc52c..17aeaef07 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.zosunixcommand.ssh.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_bom = true include_in_mvp = true From 16e37e738fd1f36514642ef7335b1905f007be40 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Mon, 10 Jul 2023 17:56:59 +0100 Subject: [PATCH 118/263] comments in each settings.gradle file Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../dev.galasa.cicsts.ceci.manager.ivt/settings.gradle | 5 +++++ .../dev.galasa.cicsts.ceci.manager/settings.gradle | 5 +++++ .../dev.galasa.cicsts.ceda.manager.ivt/settings.gradle | 5 +++++ .../dev.galasa.cicsts.ceda.manager/settings.gradle | 5 +++++ .../dev.galasa.cicsts.cemt.manager.ivt/settings.gradle | 5 +++++ .../dev.galasa.cicsts.cemt.manager/settings.gradle | 5 +++++ .../dev.galasa.cicsts.manager.ivt/settings.gradle | 5 +++++ .../dev.galasa.cicsts.manager/settings.gradle | 5 +++++ .../dev.galasa.cicsts.resource.manager/settings.gradle | 5 +++++ .../dev.galasa.cloud.manager/settings.gradle | 5 +++++ .../dev.galasa.docker.manager.ivt/settings.gradle | 5 +++++ .../dev.galasa.docker.manager/settings.gradle | 5 +++++ .../dev.galasa.kubernetes.manager.ivt/settings.gradle | 5 +++++ .../dev.galasa.kubernetes.manager/settings.gradle | 5 +++++ .../dev.galasa.liberty.manager/settings.gradle | 5 +++++ .../dev.galasa.openstack.manager/settings.gradle | 5 +++++ .../dev.galasa.common/settings.gradle | 5 +++++ .../dev.galasa.http.manager.ivt/settings.gradle | 5 +++++ .../dev.galasa.http.manager/settings.gradle | 5 +++++ .../dev.galasa.ipnetwork.manager/settings.gradle | 5 +++++ .../dev.galasa.mq.manager.ivt/settings.gradle | 5 +++++ .../dev.galasa.mq.manager/settings.gradle | 5 +++++ .../dev.galasa.artifact.manager.ivt/settings.gradle | 5 +++++ .../dev.galasa.artifact.manager/settings.gradle | 5 +++++ .../dev.galasa.core.manager.ivt/settings.gradle | 5 +++++ .../dev.galasa.core.manager/settings.gradle | 5 +++++ .../dev.galasa.textscan.manager/settings.gradle | 5 +++++ .../dev.galasa.db2.manager.ivt/settings.gradle | 5 +++++ .../dev.galasa.db2.manager/settings.gradle | 5 +++++ .../dev.galasa.java.manager/settings.gradle | 5 +++++ .../dev.galasa.java.ubuntu.manager/settings.gradle | 5 +++++ .../dev.galasa.java.windows.manager/settings.gradle | 5 +++++ .../dev.galasa.elasticlog.manager.ivt/settings.gradle | 5 +++++ .../dev.galasa.elasticlog.manager/settings.gradle | 5 +++++ .../dev.galasa.phoenix2.manager/settings.gradle | 5 +++++ .../dev.galasa.galasaecosystem.manager.ivt/settings.gradle | 5 +++++ .../dev.galasa.galasaecosystem.manager/settings.gradle | 5 +++++ .../dev.galasa.jmeter.manager.ivt/settings.gradle | 5 +++++ .../dev.galasa.jmeter.manager/settings.gradle | 5 +++++ .../dev.galasa.selenium.manager.ivt/settings.gradle | 5 +++++ .../dev.galasa.selenium.manager/settings.gradle | 5 +++++ .../dev.galasa.vtp.manager/settings.gradle | 5 +++++ .../dev.galasa.linux.manager.ivt/settings.gradle | 5 +++++ .../dev.galasa.linux.manager/settings.gradle | 5 +++++ .../dev.galasa.windows.manager/settings.gradle | 5 +++++ .../dev.galasa.githubissue.manager/settings.gradle | 5 +++++ .../dev.galasa.zos.manager.ivt/settings.gradle | 5 +++++ .../dev.galasa.zos.manager/settings.gradle | 5 +++++ .../dev.galasa.zos3270.common/settings.gradle | 5 +++++ .../dev.galasa.zos3270.manager.ivt/settings.gradle | 5 +++++ .../dev.galasa.zos3270.manager/settings.gradle | 5 +++++ .../dev.galasa.zosbatch.rseapi.manager/settings.gradle | 5 +++++ .../dev.galasa.zosbatch.zosmf.manager/settings.gradle | 5 +++++ .../dev.galasa.zosconsole.oeconsol.manager/settings.gradle | 5 +++++ .../dev.galasa.zosconsole.zosmf.manager/settings.gradle | 5 +++++ .../dev.galasa.zosfile.rseapi.manager/settings.gradle | 5 +++++ .../dev.galasa.zosfile.zosmf.manager/settings.gradle | 5 +++++ .../dev.galasa.zosliberty.angel.manager/settings.gradle | 5 +++++ .../dev.galasa.zosliberty.manager/settings.gradle | 5 +++++ .../dev.galasa.zosmf.manager/settings.gradle | 5 +++++ .../dev.galasa.zosprogram.manager/settings.gradle | 5 +++++ .../dev.galasa.zosrseapi.manager/settings.gradle | 5 +++++ .../dev.galasa.zossecurity.manager/settings.gradle | 5 +++++ .../dev.galasa.zostsocommand.ssh.manager/settings.gradle | 5 +++++ 64 files changed, 320 insertions(+) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/settings.gradle index 3f19711b7..e18d9f90a 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.cicsts.ceci.manager.ivt' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_mvp = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/settings.gradle index e43a44906..7a3915b9b 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.cicsts.ceci.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_mvp = true include_in_javadoc = true diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/settings.gradle index cea9d6c13..e9c578958 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.cicsts.ceda.manager.ivt' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_mvp = true include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/settings.gradle index 456a7b6f8..0e1879310 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.cicsts.ceda.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_mvp = true include_in_javadoc = true diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/settings.gradle index a52fe0c77..530c240b4 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.cicsts.cemt.manager.ivt' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_mvp = true include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/settings.gradle index 2ac6c1340..1be2c425c 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.cicsts.cemt.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_mvp = true include_in_javadoc = true diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/settings.gradle index a9453fcd3..ddcbc85e7 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.cicsts.manager.ivt' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_mvp = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/settings.gradle index b997d0bda..e2d67e94a 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.cicsts.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_mvp = true include_in_javadoc = true diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/settings.gradle index 647b62261..28041c872 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.cicsts.resource.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/settings.gradle index d7ca6dfc7..4a2a61e5e 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.cloud.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/settings.gradle index dc09e4ccb..6e6a4805a 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.docker.manager.ivt' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_mvp = true include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/settings.gradle index 9ecd9758c..088538020 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.docker.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/settings.gradle index 2d28f09a6..4d63bed0c 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/settings.gradle @@ -1,4 +1,9 @@ rootProject.name = 'dev.galasa.kubernetes.manager.ivt' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/settings.gradle index 433a52d77..b9f84d796 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.kubernetes.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/settings.gradle index 9915c86c5..708b1cbd0 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.liberty.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_mvp = true include_in_javadoc = true diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/settings.gradle index 3260c0d66..95998e4e6 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.openstack.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/settings.gradle b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/settings.gradle index 46a11ae63..e5b1a2e9e 100644 --- a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/settings.gradle +++ b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.common' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_bom = true include_in_mvp = true diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/settings.gradle index c94f0a6f8..4e54fd38c 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.http.manager.ivt' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_mvp = true include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/settings.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/settings.gradle index da236b085..ee0968d92 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.http.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/settings.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/settings.gradle index c4984cfaa..8a76b1c62 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.ipnetwork.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/settings.gradle index 05e3f4a98..926c8c83d 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.mq.manager.ivt' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_bom = true include_in_isolated = true diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/settings.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/settings.gradle index 31a3a4ef9..fa1f2bfc9 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.mq.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/settings.gradle index 0000e1ade..996a487f5 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.artifact.manager.ivt' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_mvp = true include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/settings.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/settings.gradle index 6244e0284..e57b06d38 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.artifact.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/settings.gradle index d0ce98349..5347929ce 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.core.manager.ivt' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_mvp = true include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/settings.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/settings.gradle index a03e31866..dc5bf8c9f 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.core.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/settings.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/settings.gradle index 283cfc1d6..9c9e1afbe 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.textscan.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/settings.gradle index 62fd527bf..f2cf32711 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.db2.manager.ivt' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_mvp = true include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/settings.gradle b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/settings.gradle index 566dd8eb4..f5c54264d 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.db2.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/settings.gradle b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/settings.gradle index dfb87ce43..2893b7dd3 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.java.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/settings.gradle b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/settings.gradle index 2173951b1..d68feb456 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.java.ubuntu.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/settings.gradle b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/settings.gradle index 4ebc6b462..eb90c0828 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.java.windows.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/settings.gradle index 30562d941..3f71bcec8 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/settings.gradle @@ -1,4 +1,9 @@ rootProject.name = 'dev.galasa.elasticlog.manager.ivt' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/settings.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/settings.gradle index 7dbfc444a..848111789 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.elasticlog.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_bom = true include_in_isolated = true diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/settings.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/settings.gradle index 6ff7e8731..ac2e038cf 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.phoenix2.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_bom = true include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/settings.gradle index 22bfae0a6..168c7e98d 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.galasaecosystem.manager.ivt' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_isolated = true diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/settings.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/settings.gradle index 0ed9ef833..11ea49c79 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.galasaecosystem.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_bom = true include_in_isolated = true diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/settings.gradle index b1c217108..9c6794c28 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.jmeter.manager.ivt' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/settings.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/settings.gradle index b887f96e7..a1ce6c16c 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.jmeter.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/settings.gradle index cf7b56a7f..1227ff7e3 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.selenium.manager.ivt' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_mvp = true include_in_isolated = true diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/settings.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/settings.gradle index 185a74f8d..840b9d493 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.selenium.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/settings.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/settings.gradle index 07302fe68..27907eb4a 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.vtp.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/settings.gradle index 6272d45f4..5b1008594 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/settings.gradle @@ -1,4 +1,9 @@ rootProject.name = 'dev.galasa.linux.manager.ivt' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/settings.gradle b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/settings.gradle index 99a2f9aa2..036bacf81 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.linux.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/settings.gradle b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/settings.gradle index c3e9f8de4..64037f7b7 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.windows.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/settings.gradle b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/settings.gradle index 7fd0d06d2..d4bcb11e2 100644 --- a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.githubissue.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_bom = true include_in_mvp = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/settings.gradle index 1177aebdc..3ee38539d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.zos.manager.ivt' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_mvp = true include_in_isolated = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/settings.gradle index b935c6812..3c398fa7a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.zos.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/settings.gradle index e05a01beb..b11113c03 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.zos3270.common' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_bom = true include_in_mvp = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/settings.gradle index 8777bfba9..a231e8cd3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.zos3270.manager.ivt' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_mvp = true include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/settings.gradle index 1c6ba3278..70a421ecb 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.zos3270.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/settings.gradle index b5bd8d686..9656028a8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.zosbatch.rseapi.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_bom = true include_in_mvp = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/settings.gradle index 8189af0cf..3cfd06b87 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.zosbatch.zosmf.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_bom = true include_in_mvp = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/settings.gradle index 7dd877b50..1c6f6f33a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.zosconsole.oeconsol.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_bom = true include_in_mvp = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/settings.gradle index 5fd517276..0cc610721 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.zosconsole.zosmf.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_bom = true include_in_mvp = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/settings.gradle index 742d1ef10..11fd984bc 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.zosfile.rseapi.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_bom = true include_in_mvp = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/settings.gradle index fc048fee4..01a844f58 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.zosfile.zosmf.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_bom = true include_in_mvp = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/settings.gradle index 4d825187c..fd479376e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.zosliberty.angel.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/settings.gradle index a2fa91273..50fee7bd2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.zosliberty.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/settings.gradle index 39a7e06db..081da91ca 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.zosmf.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/settings.gradle index 75409db46..a5b43471b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.zosprogram.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/settings.gradle index 10c8f22a8..0611f4894 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.zosrseapi.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/settings.gradle index ed5eebcab..1aed2a346 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.zossecurity.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_javadoc = true include_in_bom = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/settings.gradle index aa38df8a9..96f436693 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/settings.gradle @@ -1,5 +1,10 @@ rootProject.name = 'dev.galasa.zostsocommand.ssh.manager' +// Note: These values are consumed by the build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. include_in_obr = true include_in_bom = true include_in_mvp = true From e5ee8f8eec7370a820594c6f58e492e5dd3a42b6 Mon Sep 17 00:00:00 2001 From: Aaron Jhaj Date: Wed, 12 Jul 2023 11:34:18 +0100 Subject: [PATCH 119/263] bumo framework to 0.30.0 Signed-off-by: Aaron Jhaj --- .../buildSrc/src/main/groovy/galasa.manager.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle index bbef42903..ecf6b84bc 100644 --- a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle +++ b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle @@ -6,7 +6,7 @@ plugins { dependencies { api 'dev.galasa:dev.galasa:0.21.0' - implementation 'dev.galasa:dev.galasa.framework:0.27.0' + implementation 'dev.galasa:dev.galasa.framework:0.30.0' implementation 'commons-logging:commons-logging:1.2' implementation 'org.osgi:org.osgi.core:6.0.0' implementation 'org.osgi:org.osgi.service.component.annotations:1.3.0' From ec0a0de5cd953c607bf0e1d1306d795651ec656e Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Wed, 12 Jul 2023 10:35:19 +0100 Subject: [PATCH 120/263] gradle constructs the release.yaml and publishes it Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- build-locally.sh | 10 +- .../build-release-yaml.sh | 34 +++--- galasa-managers-parent/build.gradle | 60 +++++++-- release.yaml | 2 +- set-version.sh | 114 ++++++++++++++++++ 5 files changed, 187 insertions(+), 33 deletions(-) rename build-release-yaml.sh => galasa-managers-parent/build-release-yaml.sh (91%) create mode 100755 set-version.sh diff --git a/build-locally.sh b/build-locally.sh index 9eaa00833..bf161a41e 100755 --- a/build-locally.sh +++ b/build-locally.sh @@ -158,9 +158,9 @@ function build_code { info "Log will be placed at ${log_file}" if [[ "${build_type}" == "clean" ]]; then - goals="clean build check publishToMavenLocal -no-build-cache --no-daemon --parallel" + goals="clean build buildReleaseYaml check publishToMavenLocal -no-build-cache --no-daemon --parallel" else - goals="build check publishToMavenLocal --parallel" + goals="build buildReleaseYaml check publishToMavenLocal --parallel" fi cmd="gradle \ @@ -177,10 +177,4 @@ function build_code { } -function build_release_yaml { - $BASEDIR/build-release-yaml.sh -} - build_code - -build_release_yaml \ No newline at end of file diff --git a/build-release-yaml.sh b/galasa-managers-parent/build-release-yaml.sh similarity index 91% rename from build-release-yaml.sh rename to galasa-managers-parent/build-release-yaml.sh index 6e619b53d..6aaadbe2a 100755 --- a/build-release-yaml.sh +++ b/galasa-managers-parent/build-release-yaml.sh @@ -1,4 +1,4 @@ -#! /usr/bin/env bash +#! /usr/bin/env sh #----------------------------------------------------------------------------------------- # @@ -67,7 +67,8 @@ function usage { cat << EOF build-release-yaml.sh [OPTIONS] Options are: -(none yet implemented) +--help | -h : Get help on this command. +--file | -f : the release.yaml file path we will generage/overwrite. Mandatory. EOF } @@ -75,8 +76,13 @@ EOF # Process parameters #----------------------------------------------------------------------------------------- +release_yaml_path="" + while [ "$1" != "" ]; do case $1 in + -f | --file ) shift + release_yaml_path=$1 + ;; -h | --help ) usage exit ;; @@ -87,10 +93,16 @@ while [ "$1" != "" ]; do shift done +if [[ -z release_yaml_path ]]; then + error "--file parameter is missing. It refers to the file path of the target file we want to generate." + exit 1 +fi function build_release_yaml { target_file=$1 + h1 "Building $target_file..." + cd $BASEDIR manager_folders_list="$target_file-temp-managers-folders.txt" @@ -131,7 +143,7 @@ EOF while IFS= read -r manager_folder do - info "Processing folder $manager_folder..." + # info "Processing folder $manager_folder..." manager_version=$(cat $manager_folder/build.gradle | grep "version =" | cut -f2 -d"'") manager_name=$(cat $manager_folder/settings.gradle | grep "rootProject.name =" | cut -f2 -d"'") @@ -192,18 +204,6 @@ EOF } -rm -fr $BASEDIR/temp -mkdir -p $BASEDIR/temp - -build_release_yaml $BASEDIR/temp/release.yaml - -diff ${BASEDIR}/release.yaml $BASEDIR/temp/release.yaml > /dev/null -is_different=$? -if [[ "${is_different}" == "0" ]]; then - info "The generated yaml and the release.yaml are the same, so not replacing it." -else - info "Replacing the generated yaml with the release.yaml file..." - cp $BASEDIR/temp/release.yaml ${BASEDIR}/release.yaml -fi +build_release_yaml $release_yaml_path -success "OK" \ No newline at end of file +success "OK - created file $release_yaml_path" \ No newline at end of file diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index ee8764385..be4e9db0e 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -5,7 +5,11 @@ plugins { id 'maven-publish' } -version = '0.15.0' +// Note: The following version number is updated using the set-version.sh tool. +// It is used as the version number of the managers bundle, which contains a yaml +// file which is in a release.yaml, but published to maven, so that the OBR build +// can pick it up later. +version = "0.30.0" task clean { // make sure the build directory is gone @@ -17,6 +21,7 @@ task clean { // A configuration to publish the merge exec into configurations { archives + release_metadata } // Get all the sub projects with jacoco plugin to add itself to the merge @@ -51,15 +56,55 @@ repositories { } } + + if (jacocoEnabled.toBoolean()) { + publishing { + publications { + maven(MavenPublication) { + artifact execArtifact + + groupId = 'codecoverage' + artifactId = 'manager-unit-tests' + } + } + repositories { + maven { + url = "$targetMaven" + + if ("$targetMaven".startsWith('http')) { + credentials { + username System.getenv('MAVENUSERNAME') + password System.getenv('MAVENPASSWORD') + } + } + } + } + } +} + +// Build the release.yaml file +task buildReleaseYaml(type: Exec) { + println 'Building the release.yaml file...' + + // commandLine 'sh', './build-release-yaml.sh', '--file', "$projectDir/release.yaml" + commandLine 'sh', './build-release-yaml.sh', '--file', "$buildDir/release.yaml" +} + +def myReleaseYaml = artifacts.add('release_metadata', file("$buildDir/release.yaml")) { + builtBy 'buildReleaseYaml' +} + +// Publish the release.yaml as a maven artifact. +// Note: The maven co-ordinates are versioned using the version for this bundle. publishing { publications { maven(MavenPublication) { - artifact execArtifact - - groupId = 'codecoverage' - artifactId = 'manager-unit-tests' - } + artifact myReleaseYaml + artifactId "dev.galasa.managers" + groupId 'dev.galasa' + version version + } } repositories { maven { @@ -74,4 +119,5 @@ publishing { } } } -} \ No newline at end of file + + diff --git a/release.yaml b/release.yaml index 858960815..6481fcf77 100644 --- a/release.yaml +++ b/release.yaml @@ -24,7 +24,7 @@ managers: # - artifact: galasa-managers-parent - version: 0.15.0 + version: 0.30.0 - artifact: dev.galasa.cicsts.ceci.manager version: 0.25.0 diff --git a/set-version.sh b/set-version.sh new file mode 100755 index 000000000..d14984a33 --- /dev/null +++ b/set-version.sh @@ -0,0 +1,114 @@ +#! /usr/bin/env bash + +#----------------------------------------------------------------------------------------- +# +# Objectives: Sets the version number of this component. +# +# Environment variable over-rides: +# None +# +#----------------------------------------------------------------------------------------- + +# Where is this script executing from ? +BASEDIR=$(dirname "$0");pushd $BASEDIR 2>&1 >> /dev/null ;BASEDIR=$(pwd);popd 2>&1 >> /dev/null +# echo "Running from directory ${BASEDIR}" +export ORIGINAL_DIR=$(pwd) +# cd "${BASEDIR}" + +cd "${BASEDIR}/.." +WORKSPACE_DIR=$(pwd) + + +#----------------------------------------------------------------------------------------- +# +# Set Colors +# +#----------------------------------------------------------------------------------------- +bold=$(tput bold) +underline=$(tput sgr 0 1) +reset=$(tput sgr0) +red=$(tput setaf 1) +green=$(tput setaf 76) +white=$(tput setaf 7) +tan=$(tput setaf 202) +blue=$(tput setaf 25) + +#----------------------------------------------------------------------------------------- +# +# Headers and Logging +# +#----------------------------------------------------------------------------------------- +underline() { printf "${underline}${bold}%s${reset}\n" "$@" +} +h1() { printf "\n${underline}${bold}${blue}%s${reset}\n" "$@" +} +h2() { printf "\n${underline}${bold}${white}%s${reset}\n" "$@" +} +debug() { printf "${white}%s${reset}\n" "$@" +} +info() { printf "${white}➜ %s${reset}\n" "$@" +} +success() { printf "${green}✔ %s${reset}\n" "$@" +} +error() { printf "${red}✖ %s${reset}\n" "$@" +} +warn() { printf "${tan}➜ %s${reset}\n" "$@" +} +bold() { printf "${bold}%s${reset}\n" "$@" +} +note() { printf "\n${underline}${bold}${blue}Note:${reset} ${blue}%s${reset}\n" "$@" +} + +#----------------------------------------------------------------------------------------- +# Functions +#----------------------------------------------------------------------------------------- +function usage { + h1 "Syntax" + cat << EOF +set-version.sh [OPTIONS] +Options are: +-v | --version xxx : Mandatory. Set the version number to something explicitly. + Re-builds the release.yaml based on the contents of sub-projects. + For example '--version 0.29.0' +EOF +} + +#----------------------------------------------------------------------------------------- +# Process parameters +#----------------------------------------------------------------------------------------- +component_version="" + +while [ "$1" != "" ]; do + case $1 in + -v | --version ) shift + export component_version=$1 + ;; + -h | --help ) usage + exit + ;; + * ) error "Unexpected argument $1" + usage + exit 1 + esac + shift +done + +if [[ -z $component_version ]]; then + error "Missing mandatory '--version' argument." + usage + exit 1 +fi + + +temp_dir=$BASEDIR/temp/version_bump +mkdir -p $temp_dir + +# The galasa-parent/dev.galasa.framework/build.gradle file is where the 'master' version number +# of the framework component lives. +# For example: version = "0.29.0" +cat $BASEDIR/galasa-managers-parent/build.gradle | sed "s/^[ ]*version[ ]*=.*/version = \"$component_version\"/1" > $temp_dir/managers-build.gradle + +# Copy the temp files back to where they belong... +cp $temp_dir/managers-build.gradle $BASEDIR/galasa-managers-parent/build.gradle + + From 44f106ee56e86b9fd460320fdb86a4255131268c Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Wed, 12 Jul 2023 11:11:58 +0100 Subject: [PATCH 121/263] gradle image doesn't support pushd/popd in scripts Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- galasa-managers-parent/build-release-yaml.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-managers-parent/build-release-yaml.sh b/galasa-managers-parent/build-release-yaml.sh index 6aaadbe2a..d64c8ed61 100755 --- a/galasa-managers-parent/build-release-yaml.sh +++ b/galasa-managers-parent/build-release-yaml.sh @@ -10,7 +10,7 @@ #----------------------------------------------------------------------------------------- # Where is this script executing from ? -BASEDIR=$(dirname "$0");pushd $BASEDIR 2>&1 >> /dev/null ;BASEDIR=$(pwd);popd 2>&1 >> /dev/null +BASEDIR=$(dirname "$0");cd $BASEDIR 2>&1 >> /dev/null ;BASEDIR=$(pwd);cd - 2>&1 >> /dev/null # echo "Running from directory ${BASEDIR}" export ORIGINAL_DIR=$(pwd) # cd "${BASEDIR}" From 2df85703420e66eb13f75023762e875be2c7336e Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Wed, 12 Jul 2023 16:22:40 +0100 Subject: [PATCH 122/263] set-version upgrades framework version dependency in buildSrc also Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- set-version.sh | 45 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/set-version.sh b/set-version.sh index d14984a33..e2b9bcd3d 100755 --- a/set-version.sh +++ b/set-version.sh @@ -18,6 +18,8 @@ export ORIGINAL_DIR=$(pwd) cd "${BASEDIR}/.." WORKSPACE_DIR=$(pwd) +set -o pipefail + #----------------------------------------------------------------------------------------- # @@ -103,12 +105,43 @@ fi temp_dir=$BASEDIR/temp/version_bump mkdir -p $temp_dir -# The galasa-parent/dev.galasa.framework/build.gradle file is where the 'master' version number -# of the framework component lives. -# For example: version = "0.29.0" -cat $BASEDIR/galasa-managers-parent/build.gradle | sed "s/^[ ]*version[ ]*=.*/version = \"$component_version\"/1" > $temp_dir/managers-build.gradle +function upgrade_dependencies_on_framework { + h1 "Upgrading anything which references the framework component" + + source_path=${BASEDIR}/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle + temp_file=$temp_dir/dependency.gradle + # The line marked this: implementation 'dev.galasa:dev.galasa.framework:0.27.0' needs to change. + info "Upgrading version framework in file $source_path" + + cat $source_path | sed "s/implementation[ \t]*.'dev.galasa:dev.galasa.framework:.*'[ \t]*$/implementation 'dev.galasa:dev.galasa.framework:$component_version'/1" > $temp_file + rc=$? ; if [[ "${rc}" != "0" ]]; then error "Failed to replace master version in file $source_path" ; exit 1 ; fi + + cp $temp_file $source_path + rc=$? ; if [[ "${rc}" != "0" ]]; then error "Failed to replace master version file with the modified one." ; exit 1 ; fi + + success "Upgraded dependencies on framework." +} + +function upgrade_build_gradle { + h1 "Upgrading the component version number in the master gradle." + + source_path=$BASEDIR/galasa-managers-parent/build.gradle + info "File to change is at file$source_path" + + # The galasa-managers-parent/build.gradle file is where the 'master' version number + # of the this component lives. + # For example: version = "0.29.0" + + cat $source_path | sed "s/^[ ]*version[ ]*=.*/version = \"$component_version\"/1" > $temp_dir/managers-build.gradle + rc=$? ; if [[ "${rc}" != "0" ]]; then error "Failed to replace master version in file $source_path" ; exit 1 ; fi + + cp $temp_dir/managers-build.gradle $source_path + rc=$? ; if [[ "${rc}" != "0" ]]; then error "Failed to replace master version file with the modified one." ; exit 1 ; fi + + success "Upgraded build.gradle file OK." +} -# Copy the temp files back to where they belong... -cp $temp_dir/managers-build.gradle $BASEDIR/galasa-managers-parent/build.gradle +upgrade_build_gradle +upgrade_dependencies_on_framework From be130f532881942c8541aaf74893028a1b8b5769 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Fri, 14 Jul 2023 11:53:24 +0100 Subject: [PATCH 123/263] Use gradle to build the release.yaml file Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- galasa-managers-parent/build-release-yaml.sh | 209 ------------------ galasa-managers-parent/build.gradle | 94 +++++++- .../build.gradle | 14 ++ .../settings.gradle | 9 - .../build.gradle | 16 ++ .../settings.gradle | 11 - .../build.gradle | 14 ++ .../settings.gradle | 8 - .../build.gradle | 14 ++ .../settings.gradle | 11 - .../build.gradle | 13 ++ .../settings.gradle | 9 - .../build.gradle | 14 ++ .../settings.gradle | 11 - .../build.gradle | 16 ++ .../settings.gradle | 9 - .../dev.galasa.cicsts.manager/build.gradle | 14 ++ .../dev.galasa.cicsts.manager/settings.gradle | 11 - .../build.gradle | 13 ++ .../settings.gradle | 11 - .../dev.galasa.cloud.manager/build.gradle | 13 ++ .../dev.galasa.cloud.manager/settings.gradle | 11 - .../build.gradle | 14 ++ .../settings.gradle | 8 - .../dev.galasa.docker.manager/build.gradle | 13 ++ .../dev.galasa.docker.manager/settings.gradle | 12 - .../build.gradle | 13 ++ .../settings.gradle | 8 - .../build.gradle | 14 ++ .../settings.gradle | 11 - .../dev.galasa.liberty.manager/build.gradle | 13 ++ .../settings.gradle | 11 - .../dev.galasa.openstack.manager/build.gradle | 14 ++ .../settings.gradle | 10 - .../dev.galasa.common/build.gradle | 13 +- .../dev.galasa.common/settings.gradle | 9 - .../dev.galasa.http.manager.ivt/build.gradle | 14 ++ .../settings.gradle | 9 - .../dev.galasa.http.manager/build.gradle | 13 ++ .../dev.galasa.http.manager/settings.gradle | 11 - .../dev.galasa.ipnetwork.manager/build.gradle | 14 ++ .../settings.gradle | 12 - .../dev.galasa.mq.manager.ivt/build.gradle | 12 + .../dev.galasa.mq.manager.ivt/settings.gradle | 9 +- .../dev.galasa.mq.manager/build.gradle | 13 ++ .../dev.galasa.mq.manager/settings.gradle | 10 - .../build.gradle | 13 ++ .../settings.gradle | 8 - .../dev.galasa.artifact.manager/build.gradle | 16 +- .../settings.gradle | 11 - .../dev.galasa.core.manager.ivt/build.gradle | 13 ++ .../settings.gradle | 8 - .../dev.galasa.core.manager/build.gradle | 14 ++ .../dev.galasa.core.manager/settings.gradle | 11 - .../dev.galasa.textscan.manager/build.gradle | 14 ++ .../settings.gradle | 11 - .../dev.galasa.db2.manager.ivt/build.gradle | 14 ++ .../settings.gradle | 8 - .../dev.galasa.db2.manager/build.gradle | 15 ++ .../dev.galasa.db2.manager/settings.gradle | 10 - .../build.gradle | 12 + .../build.gradle | 12 + .../dev.galasa.sem.manager/build.gradle | 13 ++ .../dev.galasa.java.manager/build.gradle | 14 ++ .../dev.galasa.java.manager/settings.gradle | 10 - .../build.gradle | 14 ++ .../settings.gradle | 11 +- .../build.gradle | 17 +- .../settings.gradle | 10 - .../build.gradle | 14 ++ .../settings.gradle | 7 - .../build.gradle | 13 ++ .../settings.gradle | 10 +- .../dev.galasa.phoenix2.manager/build.gradle | 14 ++ .../settings.gradle | 8 - .../build.gradle | 14 ++ .../settings.gradle | 7 - .../build.gradle | 14 ++ .../settings.gradle | 9 - .../build.gradle | 13 ++ .../settings.gradle | 10 - .../dev.galasa.jmeter.manager/build.gradle | 14 ++ .../dev.galasa.jmeter.manager/settings.gradle | 11 +- .../build.gradle | 14 ++ .../settings.gradle | 9 - .../dev.galasa.selenium.manager/build.gradle | 14 ++ .../settings.gradle | 11 - .../dev.galasa.vtp.manager.ivt/build.gradle | 13 ++ .../dev.galasa.vtp.manager/build.gradle | 14 ++ .../dev.galasa.vtp.manager/settings.gradle | 11 - .../dev.galasa.linux.manager.ivt/build.gradle | 15 ++ .../settings.gradle | 7 - .../dev.galasa.linux.manager/build.gradle | 14 ++ .../dev.galasa.linux.manager/settings.gradle | 11 +- .../dev.galasa.windows.manager/build.gradle | 13 ++ .../build.gradle | 15 ++ .../settings.gradle | 9 - .../dev.galasa.zos.manager.ivt/build.gradle | 14 ++ .../settings.gradle | 9 +- .../dev.galasa.zos.manager/build.gradle | 14 ++ .../dev.galasa.zos3270.common/build.gradle | 13 ++ .../dev.galasa.zos3270.common/settings.gradle | 11 - .../build.gradle | 14 ++ .../settings.gradle | 8 - .../dev.galasa.zos3270.manager/build.gradle | 13 ++ .../settings.gradle | 12 - .../build.gradle | 13 ++ .../settings.gradle | 10 - .../build.gradle | 14 ++ .../settings.gradle | 10 - .../build.gradle | 16 ++ .../settings.gradle | 10 - .../build.gradle | 14 ++ .../settings.gradle | 10 - .../build.gradle | 13 ++ .../settings.gradle | 10 - .../build.gradle | 13 ++ .../settings.gradle | 10 - .../build.gradle | 14 ++ .../settings.gradle | 11 +- .../build.gradle | 14 ++ .../settings.gradle | 11 - .../dev.galasa.zosmf.manager/build.gradle | 14 ++ .../dev.galasa.zosmf.manager/settings.gradle | 11 - .../build.gradle | 13 ++ .../settings.gradle | 12 - .../dev.galasa.zosrseapi.manager/build.gradle | 13 ++ .../settings.gradle | 12 - .../build.gradle | 13 ++ .../settings.gradle | 11 - .../build.gradle | 13 ++ .../settings.gradle | 11 - .../build.gradle | 13 ++ .../settings.gradle | 10 - 134 files changed, 1041 insertions(+), 838 deletions(-) delete mode 100755 galasa-managers-parent/build-release-yaml.sh diff --git a/galasa-managers-parent/build-release-yaml.sh b/galasa-managers-parent/build-release-yaml.sh deleted file mode 100755 index d64c8ed61..000000000 --- a/galasa-managers-parent/build-release-yaml.sh +++ /dev/null @@ -1,209 +0,0 @@ -#! /usr/bin/env sh - -#----------------------------------------------------------------------------------------- -# -# Objectives: Re-build the release.yaml -# -# Environment variable over-rides: -# None -# -#----------------------------------------------------------------------------------------- - -# Where is this script executing from ? -BASEDIR=$(dirname "$0");cd $BASEDIR 2>&1 >> /dev/null ;BASEDIR=$(pwd);cd - 2>&1 >> /dev/null -# echo "Running from directory ${BASEDIR}" -export ORIGINAL_DIR=$(pwd) -# cd "${BASEDIR}" - -cd "${BASEDIR}/.." -WORKSPACE_DIR=$(pwd) - - -#----------------------------------------------------------------------------------------- -# -# Set Colors -# -#----------------------------------------------------------------------------------------- -bold=$(tput bold) -underline=$(tput sgr 0 1) -reset=$(tput sgr0) -red=$(tput setaf 1) -green=$(tput setaf 76) -white=$(tput setaf 7) -tan=$(tput setaf 202) -blue=$(tput setaf 25) - -#----------------------------------------------------------------------------------------- -# -# Headers and Logging -# -#----------------------------------------------------------------------------------------- -underline() { printf "${underline}${bold}%s${reset}\n" "$@" -} -h1() { printf "\n${underline}${bold}${blue}%s${reset}\n" "$@" -} -h2() { printf "\n${underline}${bold}${white}%s${reset}\n" "$@" -} -debug() { printf "${white}%s${reset}\n" "$@" -} -info() { printf "${white}➜ %s${reset}\n" "$@" -} -success() { printf "${green}✔ %s${reset}\n" "$@" -} -error() { printf "${red}✖ %s${reset}\n" "$@" -} -warn() { printf "${tan}➜ %s${reset}\n" "$@" -} -bold() { printf "${bold}%s${reset}\n" "$@" -} -note() { printf "\n${underline}${bold}${blue}Note:${reset} ${blue}%s${reset}\n" "$@" -} - -#----------------------------------------------------------------------------------------- -# Functions -#----------------------------------------------------------------------------------------- -function usage { - h1 "Syntax" - cat << EOF -build-release-yaml.sh [OPTIONS] -Options are: ---help | -h : Get help on this command. ---file | -f : the release.yaml file path we will generage/overwrite. Mandatory. -EOF -} - -#----------------------------------------------------------------------------------------- -# Process parameters -#----------------------------------------------------------------------------------------- - -release_yaml_path="" - -while [ "$1" != "" ]; do - case $1 in - -f | --file ) shift - release_yaml_path=$1 - ;; - -h | --help ) usage - exit - ;; - * ) error "Unexpected argument $1" - usage - exit 1 - esac - shift -done - -if [[ -z release_yaml_path ]]; then - error "--file parameter is missing. It refers to the file path of the target file we want to generate." - exit 1 -fi - -function build_release_yaml { - target_file=$1 - - h1 "Building $target_file..." - - cd $BASEDIR - - manager_folders_list="$target_file-temp-managers-folders.txt" - find . | grep "build.gradle" | sed "s/\/build.gradle//g" | sort > $manager_folders_list - - cat << EOF > $target_file -# -# Copyright contributors to the Galasa project -# - -# ----------------------------------------------------------- -# -# WARNING -# -# This file is periodically re-generated from the contents of -# the repository, so don't make changes here manually please. -# ----------------------------------------------------------- - - -apiVersion: galasa.dev/v1alpha -kind: Release -metadata: - name: galasa-release - -managers: - bundles: - -# -# Manager -# -EOF - - - # Results in a file containing things like this: - # ./galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt - # ./galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager - # ./galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager - - while IFS= read -r manager_folder - do - # info "Processing folder $manager_folder..." - manager_version=$(cat $manager_folder/build.gradle | grep "version =" | cut -f2 -d"'") - - manager_name=$(cat $manager_folder/settings.gradle | grep "rootProject.name =" | cut -f2 -d"'") - - - if [[ "${manager_name}" != "" ]]; then - - # The settings.gradle file also contains something like this: - # include_in_obr = true - # include_in_javadoc = true - # include_in_bom = true - # include_in_mvp = true - # include_in_isolated = true - # include_in_code_coverage = true - # ... which we need to read-in. - include_in_obr=$(cat $manager_folder/settings.gradle | grep -v "\/\/" | grep "include_in_obr" | sed "s/=/ /g" | xargs | cut -f2 -d' ') - include_in_javadoc=$(cat $manager_folder/settings.gradle | grep -v "\/\/" | grep "include_in_javadoc" | sed "s/=/ /g" | xargs | cut -f2 -d' ') - include_in_bom=$(cat $manager_folder/settings.gradle | grep -v "\/\/" | grep "include_in_bom" | sed "s/=/ /g" | xargs | cut -f2 -d' ') - include_in_mvp=$(cat $manager_folder/settings.gradle | grep -v "\/\/" | grep "include_in_mvp" | sed "s/=/ /g" | xargs | cut -f2 -d' ') - include_in_isolated=$(cat $manager_folder/settings.gradle | grep -v "\/\/" | grep "include_in_isolated" | sed "s/=/ /g" | xargs | cut -f2 -d' ') - include_in_code_coverage=$(cat $manager_folder/settings.gradle | grep -v "\/\/" | grep "include_in_code_coverage" | sed "s/=/ /g" | xargs | cut -f2 -d' ') - - info "Manager '$manager_name' is at version '$manager_version'" - - echo "" >> $target_file - echo " - artifact: $manager_name" >> $target_file - echo " version: $manager_version" >> $target_file - - if [[ "${include_in_obr}" != "" ]]; then - echo " obr: $include_in_obr" >> $target_file - fi - - if [[ "${include_in_javadoc}" != "" ]]; then - echo " javadoc: $include_in_javadoc" >> $target_file - fi - - if [[ "${include_in_bom}" != "" ]]; then - echo " bom: $include_in_bom" >> $target_file - fi - - if [[ "${include_in_mvp}" != "" ]]; then - echo " mvp: $include_in_mvp" >> $target_file - fi - - if [[ "${include_in_isolated}" != "" ]]; then - echo " isolated: $include_in_isolated" >> $target_file - fi - - if [[ "${include_in_code_coverage}" != "" ]]; then - echo " codecoverage: $include_in_code_coverage" >> $target_file - fi - - fi - - done < $manager_folders_list - - rm $manager_folders_list - -} - -build_release_yaml $release_yaml_path - -success "OK - created file $release_yaml_path" \ No newline at end of file diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index be4e9db0e..c3e656e17 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -1,6 +1,5 @@ plugins { id 'biz.aQute.bnd.builder' version '5.3.0' apply false - id 'jacoco' id 'maven-publish' } @@ -83,12 +82,97 @@ if (jacocoEnabled.toBoolean()) { } } + +def manifestFilePath = "$buildDir/release.yaml" + +def header = """# +# Copyright contributors to the Galasa project +# + +# ----------------------------------------------------------- +# +# WARNING +# +# This file is periodically re-generated from the contents of +# the repository, so don't make changes here manually please. +# ----------------------------------------------------------- + + +apiVersion: galasa.dev/v1alpha +kind: Release +metadata: + name: galasa-release + +managers: + bundles: + +# +# Manager +# +""" + // Build the release.yaml file -task buildReleaseYaml(type: Exec) { +task buildReleaseYaml() { println 'Building the release.yaml file...' - // commandLine 'sh', './build-release-yaml.sh', '--file', "$projectDir/release.yaml" - commandLine 'sh', './build-release-yaml.sh', '--file', "$buildDir/release.yaml" + // During execution phase, make sure the file exists. + doFirst{ + if ( !buildDir.exists() ) { + buildDir.mkdirs() + } + def manifest_file = new File(manifestFilePath) + if (!manifest_file.exists()){ + manifest_file.createNewFile() + } else { + manifest_file.delete() + manifest_file.createNewFile() + } + manifest_file.append(header) + } + + + subprojects { + ext { + // the property that should be overridden in suproject's build.gradle + // Each sub-project will set the values... + project_name = '' + include_in_obr = '' + include_in_mvp = '' + include_in_bom = '' + include_in_javadoc = '' + include_in_isolated = '' + include_in_codecoverage = '' + } + + afterEvaluate { + doLast { + // Some projects don't have a version property... as they are parent projects mostly. + if (version != 'unspecified') { + def f = new File(manifestFilePath) + f.append("\n\n - artifact: $project_name") + f.append("\n version: $version") + if (include_in_obr != '') { + f.append("\n obr: $include_in_obr") + } + if (include_in_mvp != '') { + f.append("\n mvp: $include_in_mvp") + } + if (include_in_bom != '') { + f.append("\n bom: $include_in_bom") + } + if (include_in_javadoc != '') { + f.append("\n javadoc: $include_in_javadoc") + } + if (include_in_isolated != '') { + f.append("\n isolated: $include_in_isolated") + } + if (include_in_codecoverage != '') { + f.append("\n codecoverage: $include_in_codecoverage") + } + } + } + } + } } def myReleaseYaml = artifacts.add('release_metadata', file("$buildDir/release.yaml")) { @@ -109,7 +193,7 @@ publishing { repositories { maven { url = "$targetMaven" - + if ("$targetMaven".startsWith('http')) { credentials { username System.getenv('MAVENUSERNAME') diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/build.gradle index 89e635f3e..0dab684f5 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/build.gradle @@ -15,3 +15,17 @@ dependencies { implementation project (':galasa-managers-core-parent:dev.galasa.artifact.manager') implementation project (':galasa-managers-zos-parent:dev.galasa.zosprogram.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp=true +ext.include_in_bom=true +ext.include_in_isolated=true +ext.include_in_codecoverage=false +ext.include_in_javadoc=false + diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/settings.gradle index e18d9f90a..78abd2ddb 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/settings.gradle @@ -1,11 +1,2 @@ rootProject.name = 'dev.galasa.cicsts.ceci.manager.ivt' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_mvp = true -include_in_bom = true -include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/build.gradle index 6cdcdafc2..7537a6dbe 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/build.gradle @@ -10,3 +10,19 @@ dependencies { api project (':galasa-managers-cicsts-parent:dev.galasa.cicsts.manager') implementation project (':galasa-managers-zos-parent:dev.galasa.zos3270.manager') } + + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp=true +ext.include_in_bom=true +ext.include_in_isolated=true +ext.include_in_codecoverage=true +ext.include_in_javadoc=true + + diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/settings.gradle index 7a3915b9b..5251901e3 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/settings.gradle @@ -1,13 +1,2 @@ rootProject.name = 'dev.galasa.cicsts.ceci.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_mvp = true -include_in_javadoc = true -include_in_bom = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/build.gradle index 876e80ba1..abcbe513c 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/build.gradle @@ -11,3 +11,17 @@ dependencies { implementation project (':galasa-managers-cicsts-parent:dev.galasa.cicsts.ceda.manager') implementation project (':galasa-managers-zos-parent:dev.galasa.zos3270.manager') } + + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp=true +ext.include_in_bom=false +ext.include_in_isolated=true +ext.include_in_codecoverage=false +ext.include_in_javadoc=false diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/settings.gradle index e9c578958..76d2e3e9a 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/settings.gradle @@ -1,10 +1,2 @@ rootProject.name = 'dev.galasa.cicsts.ceda.manager.ivt' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_mvp = true -include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/build.gradle index 2bb24ce73..f23fde949 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/build.gradle @@ -11,3 +11,17 @@ dependencies { implementation project (':galasa-managers-zos-parent:dev.galasa.zos3270.manager') api project (':galasa-managers-cicsts-parent:dev.galasa.cicsts.cemt.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp=true +ext.include_in_bom=true +ext.include_in_isolated=true +ext.include_in_codecoverage=true +ext.include_in_javadoc=true + diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/settings.gradle index 0e1879310..288e41424 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/settings.gradle @@ -1,13 +1,2 @@ rootProject.name = 'dev.galasa.cicsts.ceda.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_mvp = true -include_in_javadoc = true -include_in_bom = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/build.gradle index f16078782..6a8b064a4 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/build.gradle @@ -13,3 +13,16 @@ dependencies { implementation project (':galasa-managers-cicsts-parent:dev.galasa.cicsts.manager') implementation project (':galasa-managers-zos-parent:dev.galasa.zos3270.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp=true +ext.include_in_isolated=true +ext.include_in_bom=false +ext.include_in_codecoverage=false +ext.include_in_javadoc=false diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/settings.gradle index 530c240b4..11ee6fb33 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/settings.gradle @@ -1,10 +1 @@ rootProject.name = 'dev.galasa.cicsts.cemt.manager.ivt' - -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_mvp = true -include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/build.gradle index a667d177c..54702e817 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/build.gradle @@ -10,3 +10,17 @@ dependencies { api project (':galasa-managers-cicsts-parent:dev.galasa.cicsts.manager') implementation project (':galasa-managers-zos-parent:dev.galasa.zos3270.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp=true +ext.include_in_bom=true +ext.include_in_isolated=true +ext.include_in_codecoverage=true +ext.include_in_javadoc=true + diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/settings.gradle index 1be2c425c..7c63b6c38 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/settings.gradle @@ -1,13 +1,2 @@ rootProject.name = 'dev.galasa.cicsts.cemt.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_mvp = true -include_in_javadoc = true -include_in_bom = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/build.gradle index be9649c5e..975ab406e 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/build.gradle @@ -14,3 +14,19 @@ dependencies { implementation project (':galasa-managers-workflow-parent:dev.galasa.githubissue.manager') implementation project (':galasa-managers-internal-parent:dev.galasa.sem.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp=true +ext.include_in_bom=true +ext.include_in_isolated=false +ext.include_in_codecoverage=false +ext.include_in_javadoc=false + + + diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/settings.gradle index ddcbc85e7..bc3b862cb 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/settings.gradle @@ -1,11 +1,2 @@ rootProject.name = 'dev.galasa.cicsts.manager.ivt' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_mvp = true -include_in_bom = true -include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle index e94804d98..36df2cb4f 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle @@ -13,3 +13,17 @@ dependencies { implementation project(':galasa-managers-core-parent:dev.galasa.textscan.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp=true +ext.include_in_isolated=true +ext.include_in_bom=true +ext.include_in_codecoverage=true +ext.include_in_javadoc=true + diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/settings.gradle index e2d67e94a..8f9669b2c 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/settings.gradle @@ -1,13 +1,2 @@ rootProject.name = 'dev.galasa.cicsts.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_mvp = true -include_in_javadoc = true -include_in_bom = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle index 66b340dec..68aa610fa 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle @@ -15,3 +15,16 @@ dependencies { implementation 'org.apache.commons:commons-lang3:3.8.1' implementation 'commons-io:commons-io:2.9.0' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/settings.gradle index 28041c872..3a6ce964d 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/settings.gradle @@ -1,13 +1,2 @@ rootProject.name = 'dev.galasa.cicsts.resource.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/build.gradle index 4eaf47929..08aceee25 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/build.gradle @@ -8,3 +8,16 @@ version = '0.22.0' dependencies { } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/settings.gradle index 4a2a61e5e..d1c9f8599 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/settings.gradle @@ -1,13 +1,2 @@ rootProject.name = 'dev.galasa.cloud.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/build.gradle index 4faa93e91..56d5c8144 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/build.gradle @@ -12,3 +12,17 @@ dependencies { implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = false +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = false + diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/settings.gradle index 6e6a4805a..5a01d8d01 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/settings.gradle @@ -1,10 +1,2 @@ rootProject.name = 'dev.galasa.docker.manager.ivt' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_mvp = true -include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle index 0a369f017..b9c18923e 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle @@ -13,3 +13,16 @@ dependencies { implementation 'commons-io:commons-io:2.9.0' implementation 'org.apache.commons:commons-compress:1.21' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/settings.gradle index 088538020..f8d922be0 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/settings.gradle @@ -1,13 +1 @@ rootProject.name = 'dev.galasa.docker.manager' - -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/build.gradle index 9a2516cb6..eaee6cabd 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/build.gradle @@ -12,3 +12,16 @@ dependencies { implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = false +ext.include_in_bom = false +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = false \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/settings.gradle index 4d63bed0c..3607b52c9 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/settings.gradle @@ -1,9 +1 @@ rootProject.name = 'dev.galasa.kubernetes.manager.ivt' - -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle index 45aa276e8..f20b17e6e 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle @@ -53,3 +53,17 @@ dependencies { implementation 'io.kubernetes:client-java:17.0.0' implementation 'commons-io:commons-io:2.11.0' } + + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/settings.gradle index b9f84d796..56b66953c 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/settings.gradle @@ -1,13 +1,2 @@ rootProject.name = 'dev.galasa.kubernetes.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/build.gradle index 85156086d..352e65338 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/build.gradle @@ -8,3 +8,16 @@ version = '0.21.0' dependencies { } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/settings.gradle index 708b1cbd0..9b1e91a3e 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/settings.gradle @@ -1,13 +1,2 @@ rootProject.name = 'dev.galasa.liberty.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_mvp = true -include_in_javadoc = true -include_in_bom = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle index 96d73e773..e4cc551de 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle @@ -14,3 +14,17 @@ dependencies { implementation 'com.google.code.gson:gson:2.8.9' implementation 'io.prometheus:simpleclient:0.6.0' } + + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = false +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = false diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/settings.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/settings.gradle index 95998e4e6..8909e3a50 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/settings.gradle @@ -1,12 +1,2 @@ rootProject.name = 'dev.galasa.openstack.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/build.gradle b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/build.gradle index 4803ddc29..6e68d99a1 100644 --- a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/build.gradle +++ b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/build.gradle @@ -6,4 +6,15 @@ description = 'Manager Common' version = '0.25.0' - +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = false diff --git a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/settings.gradle b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/settings.gradle index e5b1a2e9e..276e9f05b 100644 --- a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/settings.gradle +++ b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/settings.gradle @@ -1,11 +1,2 @@ rootProject.name = 'dev.galasa.common' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle index 47088906f..3cdfb654b 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle @@ -11,3 +11,17 @@ dependencies { implementation project(':galasa-managers-core-parent:dev.galasa.core.manager') implementation 'com.google.code.gson:gson:2.8.9' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = false +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = false + diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/settings.gradle index 4e54fd38c..cf0f28824 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/settings.gradle @@ -1,10 +1 @@ rootProject.name = 'dev.galasa.http.manager.ivt' - -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_mvp = true -include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle index 5e61f16e4..575e9f034 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle @@ -20,3 +20,16 @@ dependencies { } implementation project (':galasa-managers-common-parent:dev.galasa.common') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/settings.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/settings.gradle index ee0968d92..456648a74 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/settings.gradle @@ -1,13 +1,2 @@ rootProject.name = 'dev.galasa.http.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/build.gradle index 42f0ffafc..c4f53e725 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/build.gradle @@ -10,3 +10,17 @@ dependencies { implementation 'dev.galasa:com.jcraft.jsch:0.1.55' implementation 'commons-codec:commons-codec:1.15' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = false +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = false + diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/settings.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/settings.gradle index 8a76b1c62..7e23153bf 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/settings.gradle @@ -1,13 +1 @@ rootProject.name = 'dev.galasa.ipnetwork.manager' - -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/build.gradle index 7029bf5df..adbe80623 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/build.gradle @@ -10,3 +10,15 @@ dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.mq.manager') implementation project(':galasa-managers-core-parent:dev.galasa.core.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.include_in_obr = true +ext.include_in_mvp = false +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = false diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/settings.gradle index 926c8c83d..65e6bd684 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/settings.gradle @@ -1,10 +1,3 @@ rootProject.name = 'dev.galasa.mq.manager.ivt' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_bom = true -include_in_isolated = true + diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/build.gradle index 13f87c0f8..99860bfe6 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/build.gradle @@ -15,3 +15,16 @@ dependencies { implementation 'commons-codec:commons-codec:1.11' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = false +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/settings.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/settings.gradle index fa1f2bfc9..1dedfd9a8 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/settings.gradle @@ -1,12 +1,2 @@ rootProject.name = 'dev.galasa.mq.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/build.gradle index 948f22555..f6d590dc2 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/build.gradle @@ -10,3 +10,16 @@ dependencies { implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') implementation project(':galasa-managers-core-parent:dev.galasa.core.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = false +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = false diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/settings.gradle index 996a487f5..8cbc70bff 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/settings.gradle @@ -1,10 +1,2 @@ rootProject.name = 'dev.galasa.artifact.manager.ivt' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_mvp = true -include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/build.gradle index bbf954bcd..d8d52934e 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/build.gradle @@ -11,4 +11,18 @@ version = '0.25.0' dependencies { implementation 'org.apache.velocity:velocity-engine-core:2.3' implementation 'commons-io:commons-io:2.9.0' -} \ No newline at end of file +} + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true + diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/settings.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/settings.gradle index e57b06d38..2a03f16df 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/settings.gradle @@ -1,13 +1,2 @@ rootProject.name = 'dev.galasa.artifact.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_code_coverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/build.gradle index 8d10149bf..e98f2cbe2 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/build.gradle @@ -9,3 +9,16 @@ version = '0.21.0' dependencies { implementation project(':galasa-managers-core-parent:dev.galasa.core.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = false +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = false diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/settings.gradle index 5347929ce..e5560f772 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/settings.gradle @@ -1,10 +1,2 @@ rootProject.name = 'dev.galasa.core.manager.ivt' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_mvp = true -include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle index a407889b1..bbdb674e5 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle @@ -8,3 +8,17 @@ version = '0.25.0' dependencies { implementation 'com.google.code.gson:gson:2.8.9' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true + diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/settings.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/settings.gradle index dc5bf8c9f..844405f7b 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/settings.gradle @@ -1,13 +1,2 @@ rootProject.name = 'dev.galasa.core.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/build.gradle index 42f5f3029..17147f727 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/build.gradle @@ -9,3 +9,17 @@ version = '0.21.0' dependencies { implementation 'commons-io:commons-io:2.9.0' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true + diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/settings.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/settings.gradle index 9c9e1afbe..9512b318b 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/settings.gradle @@ -1,13 +1,2 @@ rootProject.name = 'dev.galasa.textscan.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/build.gradle index 6fce03db4..ad897575f 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/build.gradle @@ -10,3 +10,17 @@ dependencies { implementation project(':galasa-managers-database-parent:dev.galasa.db2.manager') implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = false +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = false + diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/settings.gradle index f2cf32711..8e2303842 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/settings.gradle @@ -1,10 +1,2 @@ rootProject.name = 'dev.galasa.db2.manager.ivt' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_mvp = true -include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle index cd8329675..b4d9472b6 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle @@ -11,3 +11,18 @@ dependencies { implementation 'com.ibm.db2.jcc:db2jcc:db2jcc4' implementation 'dev.galasa:jta:1.1' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = true + + diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/settings.gradle b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/settings.gradle index f5c54264d..c1f00e938 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/settings.gradle @@ -1,12 +1,2 @@ rootProject.name = 'dev.galasa.db2.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true diff --git a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/build.gradle b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/build.gradle index d620bb6d6..11e3c3993 100644 --- a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/build.gradle @@ -10,3 +10,15 @@ dependencies { implementation project(':galasa-managers-languages-parent:dev.galasa.java.manager') } +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = false +ext.include_in_mvp = false +ext.include_in_bom = false +ext.include_in_isolated = false +ext.include_in_codecoverage = false +ext.include_in_javadoc = false \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/build.gradle b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/build.gradle index 818189838..623d43237 100644 --- a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/build.gradle @@ -11,3 +11,15 @@ dependencies { implementation project(':galasa-managers-languages-parent:dev.galasa.java.manager') } +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = false +ext.include_in_mvp = false +ext.include_in_bom = false +ext.include_in_isolated = false +ext.include_in_codecoverage = false +ext.include_in_javadoc = false \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle index a7996087f..6514e0043 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle @@ -20,3 +20,16 @@ dependencies { implementation 'org.apache.velocity:velocity-engine-core:2.3' implementation 'org.apache.logging.log4j:log4j-1.2-api:2.17.1' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = false +ext.include_in_mvp = false +ext.include_in_bom = false +ext.include_in_isolated = false +ext.include_in_codecoverage = false +ext.include_in_javadoc = false \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/build.gradle b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/build.gradle index ccb97ac9e..99a327cf4 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/build.gradle @@ -9,3 +9,17 @@ version = '0.21.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = false +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true + diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/settings.gradle b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/settings.gradle index 2893b7dd3..e963cdaea 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/settings.gradle @@ -1,12 +1,2 @@ rootProject.name = 'dev.galasa.java.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/build.gradle b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/build.gradle index bb0b4f2ea..9f033f91c 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/build.gradle @@ -10,3 +10,17 @@ dependencies { api project(':galasa-managers-unix-parent:dev.galasa.linux.manager') api project(':galasa-managers-languages-parent:dev.galasa.java.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = false +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true + diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/settings.gradle b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/settings.gradle index d68feb456..c2c5351cd 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/settings.gradle @@ -1,12 +1,3 @@ rootProject.name = 'dev.galasa.java.ubuntu.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_isolated = true -include_in_codecoverage = true + diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/build.gradle b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/build.gradle index 4548b2ee3..a2c1dc2fd 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/build.gradle @@ -8,4 +8,19 @@ version = '0.21.0' dependencies { api project(':galasa-managers-windows-parent:dev.galasa.windows.manager') - api project(':galasa-managers-languages-parent:dev.galasa.java.manager')} + api project(':galasa-managers-languages-parent:dev.galasa.java.manager') +} + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = false +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true + diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/settings.gradle b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/settings.gradle index eb90c0828..19979fd15 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/settings.gradle @@ -1,12 +1,2 @@ rootProject.name = 'dev.galasa.java.windows.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/build.gradle index bbdb83909..a597518d2 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/build.gradle @@ -10,3 +10,17 @@ dependencies { implementation project(':galasa-managers-logging-parent:dev.galasa.elasticlog.manager') implementation project(':galasa-managers-core-parent:dev.galasa.core.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = false +ext.include_in_bom = false +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = false + diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/settings.gradle index 3f71bcec8..450365e70 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/settings.gradle @@ -1,9 +1,2 @@ rootProject.name = 'dev.galasa.elasticlog.manager.ivt' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle index 18cfab857..9595e3ec7 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle @@ -10,3 +10,16 @@ dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') implementation 'com.google.code.gson:gson:2.8.9' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = false +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = false diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/settings.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/settings.gradle index 848111789..bb02e8675 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/settings.gradle @@ -1,11 +1,3 @@ rootProject.name = 'dev.galasa.elasticlog.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_bom = true -include_in_isolated = true -include_in_codecoverage = true + diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle index 0025fd2cf..cccd4b646 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle @@ -10,3 +10,17 @@ dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') implementation 'com.google.code.gson:gson:2.8.9' } + + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = false +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = false diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/settings.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/settings.gradle index ac2e038cf..47ff92e80 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/settings.gradle @@ -1,10 +1,2 @@ rootProject.name = 'dev.galasa.phoenix2.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_bom = true -include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/build.gradle index 530aa40b8..3f654553e 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/build.gradle @@ -13,3 +13,17 @@ dependencies { implementation project(':galasa-managers-cloud-parent:dev.galasa.kubernetes.manager') implementation project(':galasa-managers-other-parent:dev.galasa.galasaecosystem.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = false +ext.include_in_bom = false +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = false + diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/settings.gradle index 168c7e98d..020347ce1 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/settings.gradle @@ -1,11 +1,4 @@ rootProject.name = 'dev.galasa.galasaecosystem.manager.ivt' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle index a9ae13ac7..76932d5c7 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle @@ -20,3 +20,17 @@ dependencies { implementation 'org.yaml:snakeyaml:2.0' implementation 'com.google.code.gson:gson:2.8.9' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = false +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = false + diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/settings.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/settings.gradle index 11ea49c79..aa26c7b19 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/settings.gradle @@ -1,11 +1,2 @@ rootProject.name = 'dev.galasa.galasaecosystem.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_bom = true -include_in_isolated = true -include_in_codecoverage = true diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/build.gradle index 143ed7676..5b4c9b2fe 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/build.gradle @@ -11,3 +11,16 @@ dependencies { implementation project(':galasa-managers-core-parent:dev.galasa.core.manager') implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = false +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = true diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/settings.gradle index 9c6794c28..b98a3e27a 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/settings.gradle @@ -1,12 +1,2 @@ rootProject.name = 'dev.galasa.jmeter.manager.ivt' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/build.gradle index 812d456c3..af38d6c06 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/build.gradle @@ -10,3 +10,17 @@ dependencies { implementation project(':galasa-managers-cloud-parent:dev.galasa.docker.manager') implementation 'org.apache.velocity:velocity-engine-core:2.3' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = false +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = true + diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/settings.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/settings.gradle index a1ce6c16c..55a7634f0 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/settings.gradle @@ -1,12 +1,3 @@ rootProject.name = 'dev.galasa.jmeter.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_isolated = true -include_in_codecoverage = true + diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/build.gradle index 505524264..3a664d38d 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/build.gradle @@ -10,3 +10,17 @@ dependencies { implementation project(':galasa-managers-core-parent:dev.galasa.core.manager') implementation project(':galasa-managers-testingtools-parent:dev.galasa.selenium.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = false +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = false + diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/settings.gradle index 1227ff7e3..411dbccd7 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/settings.gradle @@ -1,10 +1 @@ rootProject.name = 'dev.galasa.selenium.manager.ivt' - -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_mvp = true -include_in_isolated = true diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle index 54414af1f..b500c906c 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle @@ -31,3 +31,17 @@ dependencies { implementation 'com.google.code.gson:gson:2.8.9' } +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true + + diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/settings.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/settings.gradle index 840b9d493..74dfea3a6 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/settings.gradle @@ -1,13 +1,2 @@ rootProject.name = 'dev.galasa.selenium.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager.ivt/build.gradle index a10ac62ef..d8f6663a7 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager.ivt/build.gradle @@ -15,3 +15,16 @@ dependencies { implementation project (':galasa-managers-core-parent:dev.galasa.artifact.manager') implementation project (':galasa-managers-testingtools-parent:dev.galasa.vtp.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = false +ext.include_in_mvp = false +ext.include_in_bom = false +ext.include_in_isolated = false +ext.include_in_codecoverage = false +ext.include_in_javadoc = false diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/build.gradle index a9ca8db18..72372044c 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/build.gradle @@ -11,3 +11,17 @@ dependencies { implementation project(':galasa-managers-zos-parent:dev.galasa.zos3270.manager') implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = true + diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/settings.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/settings.gradle index 27907eb4a..940eb943f 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/settings.gradle @@ -1,12 +1 @@ rootProject.name = 'dev.galasa.vtp.manager' - -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/build.gradle index 7a34ed495..6b3da334b 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/build.gradle @@ -10,3 +10,18 @@ dependencies { implementation project(':galasa-managers-core-parent:dev.galasa.core.manager') implementation project(':galasa-managers-unix-parent:dev.galasa.linux.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = false +ext.include_in_bom = false +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = false + + diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/settings.gradle index 5b1008594..b05b6a060 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/settings.gradle @@ -1,9 +1,2 @@ rootProject.name = 'dev.galasa.linux.manager.ivt' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/build.gradle b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/build.gradle index 60cedf5d6..546464f2c 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/build.gradle @@ -11,3 +11,17 @@ dependencies { implementation 'io.prometheus:simpleclient:0.6.0' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = false +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true + diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/settings.gradle b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/settings.gradle index 036bacf81..79f4cac27 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/settings.gradle @@ -1,12 +1,3 @@ rootProject.name = 'dev.galasa.linux.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_isolated = true -include_in_codecoverage = true + diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/build.gradle b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/build.gradle index 60b72de39..7ac144405 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/build.gradle @@ -11,3 +11,16 @@ dependencies { implementation 'io.prometheus:simpleclient:0.6.0' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = false +ext.include_in_bom = false +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = false \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/build.gradle b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/build.gradle index edfc77328..dfb664837 100644 --- a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/build.gradle @@ -10,3 +10,18 @@ dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') implementation 'com.google.code.gson:gson:2.8.9' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = false + + diff --git a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/settings.gradle b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/settings.gradle index d4bcb11e2..fc17ff395 100644 --- a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/settings.gradle @@ -1,12 +1,3 @@ rootProject.name = 'dev.galasa.githubissue.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/build.gradle index 1e7b4e42d..271916ae5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/build.gradle @@ -11,3 +11,17 @@ dependencies { implementation project (':galasa-managers-core-parent:dev.galasa.core.manager') implementation project (':galasa-managers-core-parent:dev.galasa.artifact.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = false +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = false + diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/settings.gradle index 3ee38539d..8e257a791 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/settings.gradle @@ -1,10 +1,3 @@ rootProject.name = 'dev.galasa.zos.manager.ivt' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_mvp = true -include_in_isolated = true + diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle index 05bbe85d6..61c132788 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle @@ -11,3 +11,17 @@ dependencies { implementation 'io.prometheus:simpleclient:0.6.0' implementation 'org.apache.commons:commons-lang3:3.8.1' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true + diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle index ee3a9701e..d713479f5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle @@ -9,3 +9,16 @@ version = '0.28.0' dependencies { implementation 'com.google.code.gson:gson:2.8.9' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = false +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/settings.gradle index b11113c03..1edd341a6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/settings.gradle @@ -1,12 +1 @@ rootProject.name = 'dev.galasa.zos3270.common' - -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/build.gradle index 8b7ca314d..c26890353 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/build.gradle @@ -10,3 +10,17 @@ dependencies { implementation project(':galasa-managers-zos-parent:dev.galasa.zos3270.manager') implementation project(':galasa-managers-core-parent:dev.galasa.core.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = false +ext.include_in_isolated = true +ext.include_in_codecoverage = false +ext.include_in_javadoc = false + diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/settings.gradle index a231e8cd3..960486fe5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/settings.gradle @@ -1,10 +1,2 @@ rootProject.name = 'dev.galasa.zos3270.manager.ivt' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_mvp = true -include_in_isolated = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle index 59c4287bc..bbec75e81 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle @@ -15,3 +15,16 @@ dependencies { implementation 'commons-io:commons-io:2.9.0' implementation project (':galasa-managers-common-parent:dev.galasa.common') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/settings.gradle index 70a421ecb..086d34a4d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/settings.gradle @@ -1,13 +1 @@ rootProject.name = 'dev.galasa.zos3270.manager' - -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle index dfcf24f99..0ffdfd7cc 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle @@ -11,3 +11,16 @@ dependencies { implementation 'org.apache.commons:commons-lang3:3.8.1' implementation 'com.google.code.gson:gson:2.8.9' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = false diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/settings.gradle index 9656028a8..4041670e8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/settings.gradle @@ -1,12 +1,2 @@ rootProject.name = 'dev.galasa.zosbatch.rseapi.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle index 4cebd33d0..40fdea0d3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle @@ -11,3 +11,17 @@ dependencies { implementation 'com.google.code.gson:gson:2.8.9' implementation 'org.apache.commons:commons-lang3:3.8.1' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = false + diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/settings.gradle index 3cfd06b87..e5c60b217 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/settings.gradle @@ -1,12 +1,2 @@ rootProject.name = 'dev.galasa.zosbatch.zosmf.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/build.gradle index c943091e1..d96023929 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/build.gradle @@ -10,3 +10,19 @@ dependencies { implementation project(':galasa-managers-zos-parent:dev.galasa.zos.manager') implementation project(':galasa-managers-zos-parent:dev.galasa.zosunixcommand.ssh.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = false + + + diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/settings.gradle index 1c6f6f33a..b5008420c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/settings.gradle @@ -1,12 +1,2 @@ rootProject.name = 'dev.galasa.zosconsole.oeconsol.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/build.gradle index 7cff59066..770c7caf0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/build.gradle @@ -10,3 +10,17 @@ dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zosmf.manager') implementation 'com.google.code.gson:gson:2.8.9' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = false + diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/settings.gradle index 0cc610721..cd259163c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/settings.gradle @@ -1,12 +1,2 @@ rootProject.name = 'dev.galasa.zosconsole.zosmf.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle index f372d4e9e..52e074fa1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle @@ -15,3 +15,16 @@ dependencies { implementation 'org.apache.commons:commons-collections4:4.4' implementation 'commons-io:commons-io:2.9.0' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = false diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/settings.gradle index 11fd984bc..7444c5c97 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/settings.gradle @@ -1,12 +1,2 @@ rootProject.name = 'dev.galasa.zosfile.rseapi.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/build.gradle index 01bbaac72..e763d84c1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/build.gradle @@ -12,3 +12,16 @@ dependencies { implementation 'org.apache.commons:commons-lang3:3.8.1' implementation 'commons-io:commons-io:2.9.0' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = false diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/settings.gradle index 01a844f58..0cc8a1566 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/settings.gradle @@ -1,12 +1,2 @@ rootProject.name = 'dev.galasa.zosfile.zosmf.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/build.gradle index 051f455fc..e97723981 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/build.gradle @@ -10,3 +10,17 @@ dependencies { implementation project(':galasa-managers-zos-parent:dev.galasa.zos.manager') implementation 'org.apache.commons:commons-lang3:3.8.1' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = false +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true + diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/settings.gradle index fd479376e..f8392e271 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/settings.gradle @@ -1,12 +1,3 @@ rootProject.name = 'dev.galasa.zosliberty.angel.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_isolated = true -include_in_codecoverage = true + diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/build.gradle index 51bb1f407..3e502a772 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/build.gradle @@ -16,3 +16,17 @@ dependencies { implementation 'org.apache.commons:commons-collections4:4.4' implementation 'commons-io:commons-io:2.9.0' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true + diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/settings.gradle index 50fee7bd2..d2553dc11 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/settings.gradle @@ -1,13 +1,2 @@ rootProject.name = 'dev.galasa.zosliberty.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle index 28dfd6c38..4a004459c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle @@ -13,3 +13,17 @@ dependencies { implementation 'org.apache.commons:commons-lang3:3.8.1' implementation 'com.google.code.gson:gson:2.8.9' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true + diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/settings.gradle index 081da91ca..1a438ede6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/settings.gradle @@ -1,13 +1,2 @@ rootProject.name = 'dev.galasa.zosmf.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/build.gradle index 24b01e96e..c9854cdc2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/build.gradle @@ -10,3 +10,16 @@ dependencies { implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') implementation project(':galasa-managers-zos-parent:dev.galasa.zos.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/settings.gradle index a5b43471b..dce6efacd 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/settings.gradle @@ -1,13 +1 @@ rootProject.name = 'dev.galasa.zosprogram.manager' - -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle index 67230c13c..edf005684 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle @@ -12,3 +12,16 @@ dependencies { implementation 'commons-io:commons-io:2.9.0' implementation 'com.google.code.gson:gson:2.8.9' } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/settings.gradle index 0611f4894..313439015 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/settings.gradle @@ -1,13 +1 @@ rootProject.name = 'dev.galasa.zosrseapi.manager' - -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle index ce84ccec3..93d4d8a79 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle @@ -29,3 +29,16 @@ dependencies { } } } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/settings.gradle index 1aed2a346..33faed94c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/settings.gradle @@ -1,13 +1,2 @@ rootProject.name = 'dev.galasa.zossecurity.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/build.gradle index ea5317272..19f6bbdc3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/build.gradle @@ -10,3 +10,16 @@ dependencies { implementation project(':galasa-managers-zos-parent:dev.galasa.zos.manager') implementation project(':galasa-managers-zos-parent:dev.galasa.zosunixcommand.ssh.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = false \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/settings.gradle index 96f436693..420a114d0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/settings.gradle @@ -1,12 +1 @@ rootProject.name = 'dev.galasa.zostsocommand.ssh.manager' - -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/build.gradle index 6097d4413..5897c5de8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/build.gradle @@ -9,3 +9,16 @@ version = '0.21.0' dependencies { implementation project (':galasa-managers-zos-parent:dev.galasa.zos.manager') } + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name +ext.include_in_obr = true +ext.include_in_mvp = true +ext.include_in_bom = true +ext.include_in_isolated = true +ext.include_in_codecoverage = true +ext.include_in_javadoc = false \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/settings.gradle index 17aeaef07..b3c2a9581 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/settings.gradle @@ -1,12 +1,2 @@ rootProject.name = 'dev.galasa.zosunixcommand.ssh.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file From d546dc6138c264913f8c32ac871f110007585a71 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Sat, 15 Jul 2023 10:05:10 +0100 Subject: [PATCH 124/263] managers.manifest maven artifact created Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- galasa-managers-parent/build.gradle | 2 +- .../dev.galasa.mq.manager.ivt/build.gradle | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index c3e656e17..46655b5f0 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -185,7 +185,7 @@ publishing { publications { maven(MavenPublication) { artifact myReleaseYaml - artifactId "dev.galasa.managers" + artifactId "dev.galasa.managers.manifest" groupId 'dev.galasa' version version } diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/build.gradle index adbe80623..4f90b4241 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/build.gradle @@ -16,6 +16,7 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.project_name=project.name ext.include_in_obr = true ext.include_in_mvp = false ext.include_in_bom = true From 9c12e1941961503d39892ea63c622d36d7bae461 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Sat, 15 Jul 2023 10:37:41 +0100 Subject: [PATCH 125/263] conform to normal naming conventions Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- galasa-managers-parent/build.gradle | 40 +++++++++---------- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../dev.galasa.cicsts.manager/build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../dev.galasa.cloud.manager/build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../dev.galasa.docker.manager/build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../dev.galasa.liberty.manager/build.gradle | 14 +++---- .../dev.galasa.openstack.manager/build.gradle | 14 +++---- .../dev.galasa.common/build.gradle | 14 +++---- .../dev.galasa.http.manager.ivt/build.gradle | 14 +++---- .../dev.galasa.http.manager/build.gradle | 14 +++---- .../dev.galasa.ipnetwork.manager/build.gradle | 14 +++---- .../dev.galasa.mq.manager.ivt/build.gradle | 14 +++---- .../dev.galasa.mq.manager/build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../dev.galasa.artifact.manager/build.gradle | 14 +++---- .../dev.galasa.core.manager.ivt/build.gradle | 14 +++---- .../dev.galasa.core.manager/build.gradle | 14 +++---- .../dev.galasa.textscan.manager/build.gradle | 14 +++---- .../dev.galasa.db2.manager.ivt/build.gradle | 14 +++---- .../dev.galasa.db2.manager/build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../dev.galasa.sem.manager/build.gradle | 14 +++---- .../dev.galasa.java.manager/build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../dev.galasa.phoenix2.manager/build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../dev.galasa.jmeter.manager/build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../dev.galasa.selenium.manager/build.gradle | 14 +++---- .../dev.galasa.vtp.manager.ivt/build.gradle | 14 +++---- .../dev.galasa.vtp.manager/build.gradle | 14 +++---- .../dev.galasa.linux.manager.ivt/build.gradle | 14 +++---- .../dev.galasa.linux.manager/build.gradle | 14 +++---- .../dev.galasa.windows.manager/build.gradle | 14 +++---- .../settings.gradle | 10 ++--- .../build.gradle | 14 +++---- .../dev.galasa.zos.manager.ivt/build.gradle | 14 +++---- .../dev.galasa.zos.manager/build.gradle | 14 +++---- .../dev.galasa.zos.manager/settings.gradle | 12 +++--- .../dev.galasa.zos3270.common/build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../dev.galasa.zos3270.manager/build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../dev.galasa.zosmf.manager/build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../dev.galasa.zosrseapi.manager/build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- .../build.gradle | 14 +++---- 72 files changed, 514 insertions(+), 514 deletions(-) diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index 46655b5f0..b7838c3c2 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -135,13 +135,13 @@ task buildReleaseYaml() { ext { // the property that should be overridden in suproject's build.gradle // Each sub-project will set the values... - project_name = '' - include_in_obr = '' - include_in_mvp = '' - include_in_bom = '' - include_in_javadoc = '' - include_in_isolated = '' - include_in_codecoverage = '' + projectName = '' + includeInOBR = '' + includeInMVP = '' + includeInBOM = '' + includeInJavadoc = '' + includeInIsolated = '' + includeInCodeCoverage = '' } afterEvaluate { @@ -149,25 +149,25 @@ task buildReleaseYaml() { // Some projects don't have a version property... as they are parent projects mostly. if (version != 'unspecified') { def f = new File(manifestFilePath) - f.append("\n\n - artifact: $project_name") + f.append("\n\n - artifact: $projectName") f.append("\n version: $version") - if (include_in_obr != '') { - f.append("\n obr: $include_in_obr") + if (includeInOBR != '') { + f.append("\n obr: $includeInOBR") } - if (include_in_mvp != '') { - f.append("\n mvp: $include_in_mvp") + if (includeInMVP != '') { + f.append("\n mvp: $includeInMVP") } - if (include_in_bom != '') { - f.append("\n bom: $include_in_bom") + if (includeInBOM != '') { + f.append("\n bom: $includeInBOM") } - if (include_in_javadoc != '') { - f.append("\n javadoc: $include_in_javadoc") + if (includeInJavadoc != '') { + f.append("\n javadoc: $includeInJavadoc") } - if (include_in_isolated != '') { - f.append("\n isolated: $include_in_isolated") + if (includeInIsolated != '') { + f.append("\n isolated: $includeInIsolated") } - if (include_in_codecoverage != '') { - f.append("\n codecoverage: $include_in_codecoverage") + if (includeInCodeCoverage != '') { + f.append("\n codecoverage: $includeInCodeCoverage") } } } diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/build.gradle index 0dab684f5..d1c66e706 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/build.gradle @@ -21,11 +21,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp=true -ext.include_in_bom=true -ext.include_in_isolated=true -ext.include_in_codecoverage=false -ext.include_in_javadoc=false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP=true +ext.includeInBOM=true +ext.includeInIsolated=true +ext.includeInCodeCoverage=false +ext.includeInJavadoc=false diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/build.gradle index 7537a6dbe..f22a1d13d 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/build.gradle @@ -17,12 +17,12 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp=true -ext.include_in_bom=true -ext.include_in_isolated=true -ext.include_in_codecoverage=true -ext.include_in_javadoc=true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP=true +ext.includeInBOM=true +ext.includeInIsolated=true +ext.includeInCodeCoverage=true +ext.includeInJavadoc=true diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/build.gradle index abcbe513c..7474f6058 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/build.gradle @@ -18,10 +18,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp=true -ext.include_in_bom=false -ext.include_in_isolated=true -ext.include_in_codecoverage=false -ext.include_in_javadoc=false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP=true +ext.includeInBOM=false +ext.includeInIsolated=true +ext.includeInCodeCoverage=false +ext.includeInJavadoc=false diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/build.gradle index f23fde949..ecbd68f1f 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/build.gradle @@ -17,11 +17,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp=true -ext.include_in_bom=true -ext.include_in_isolated=true -ext.include_in_codecoverage=true -ext.include_in_javadoc=true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP=true +ext.includeInBOM=true +ext.includeInIsolated=true +ext.includeInCodeCoverage=true +ext.includeInJavadoc=true diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/build.gradle index 6a8b064a4..894b16725 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/build.gradle @@ -19,10 +19,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp=true -ext.include_in_isolated=true -ext.include_in_bom=false -ext.include_in_codecoverage=false -ext.include_in_javadoc=false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP=true +ext.includeInIsolated=true +ext.includeInBOM=false +ext.includeInCodeCoverage=false +ext.includeInJavadoc=false diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/build.gradle index 54702e817..3e72b017e 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/build.gradle @@ -16,11 +16,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp=true -ext.include_in_bom=true -ext.include_in_isolated=true -ext.include_in_codecoverage=true -ext.include_in_javadoc=true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP=true +ext.includeInBOM=true +ext.includeInIsolated=true +ext.includeInCodeCoverage=true +ext.includeInJavadoc=true diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/build.gradle index 975ab406e..b61278b3c 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/build.gradle @@ -20,13 +20,13 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp=true -ext.include_in_bom=true -ext.include_in_isolated=false -ext.include_in_codecoverage=false -ext.include_in_javadoc=false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP=true +ext.includeInBOM=true +ext.includeInIsolated=false +ext.includeInCodeCoverage=false +ext.includeInJavadoc=false diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle index 36df2cb4f..f65cdee94 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle @@ -19,11 +19,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp=true -ext.include_in_isolated=true -ext.include_in_bom=true -ext.include_in_codecoverage=true -ext.include_in_javadoc=true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP=true +ext.includeInIsolated=true +ext.includeInBOM=true +ext.includeInCodeCoverage=true +ext.includeInJavadoc=true diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle index 68aa610fa..ba7e7a04e 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle @@ -21,10 +21,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true \ No newline at end of file +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/build.gradle index 08aceee25..56d5a4131 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/build.gradle @@ -14,10 +14,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true \ No newline at end of file +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/build.gradle index 56d5c8144..97602a348 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/build.gradle @@ -18,11 +18,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = false -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle index b9c18923e..8f7d0a70c 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle @@ -19,10 +19,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true \ No newline at end of file +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/build.gradle index eaee6cabd..d90972dd7 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/build.gradle @@ -18,10 +18,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = false -ext.include_in_bom = false -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = false \ No newline at end of file +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = false +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle index f20b17e6e..eb11e5f5a 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle @@ -60,10 +60,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true \ No newline at end of file +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/build.gradle index 352e65338..79fc429e9 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/build.gradle @@ -14,10 +14,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true \ No newline at end of file +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle index e4cc551de..14a3953d0 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle @@ -21,10 +21,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = false -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/build.gradle b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/build.gradle index 6e68d99a1..adc60745e 100644 --- a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/build.gradle +++ b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/build.gradle @@ -11,10 +11,10 @@ version = '0.25.0' // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle index 3cdfb654b..701d46ce3 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle @@ -17,11 +17,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = false -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle index 575e9f034..c4bcca9f7 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle @@ -26,10 +26,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/build.gradle index c4f53e725..bd8482f71 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/build.gradle @@ -16,11 +16,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = false -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/build.gradle index 4f90b4241..0bee972fa 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/build.gradle @@ -16,10 +16,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = false -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/build.gradle index 99860bfe6..a8cc4ebbe 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/build.gradle @@ -21,10 +21,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = false -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/build.gradle index f6d590dc2..4eec032af 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/build.gradle @@ -16,10 +16,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = false -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/build.gradle index d8d52934e..9e4252cc9 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/build.gradle @@ -18,11 +18,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/build.gradle index e98f2cbe2..3663f0cf5 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/build.gradle @@ -15,10 +15,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = false -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle index bbdb674e5..1fac9881f 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle @@ -14,11 +14,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/build.gradle index 17147f727..a53561dea 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/build.gradle @@ -15,11 +15,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/build.gradle index ad897575f..d1ea8ba63 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/build.gradle @@ -16,11 +16,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = false -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle index b4d9472b6..ee70333d7 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle @@ -17,12 +17,12 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/build.gradle b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/build.gradle index 11e3c3993..e761f2682 100644 --- a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/build.gradle @@ -15,10 +15,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = false -ext.include_in_mvp = false -ext.include_in_bom = false -ext.include_in_isolated = false -ext.include_in_codecoverage = false -ext.include_in_javadoc = false \ No newline at end of file +ext.projectName=project.name +ext.includeInOBR = false +ext.includeInMVP = false +ext.includeInBOM = false +ext.includeInIsolated = false +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/build.gradle b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/build.gradle index 623d43237..d811d44d0 100644 --- a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/build.gradle @@ -16,10 +16,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = false -ext.include_in_mvp = false -ext.include_in_bom = false -ext.include_in_isolated = false -ext.include_in_codecoverage = false -ext.include_in_javadoc = false \ No newline at end of file +ext.projectName=project.name +ext.includeInOBR = false +ext.includeInMVP = false +ext.includeInBOM = false +ext.includeInIsolated = false +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle index 6514e0043..abc65865f 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle @@ -26,10 +26,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = false -ext.include_in_mvp = false -ext.include_in_bom = false -ext.include_in_isolated = false -ext.include_in_codecoverage = false -ext.include_in_javadoc = false \ No newline at end of file +ext.projectName=project.name +ext.includeInOBR = false +ext.includeInMVP = false +ext.includeInBOM = false +ext.includeInIsolated = false +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/build.gradle b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/build.gradle index 99a327cf4..228f2f4f6 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/build.gradle @@ -15,11 +15,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = false -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/build.gradle b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/build.gradle index 9f033f91c..f7085c49f 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/build.gradle @@ -16,11 +16,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = false -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/build.gradle b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/build.gradle index a2c1dc2fd..16626c46e 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/build.gradle @@ -16,11 +16,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = false -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/build.gradle index a597518d2..11e1d9965 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/build.gradle @@ -16,11 +16,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = false -ext.include_in_bom = false -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = false +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle index 9595e3ec7..56a092836 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle @@ -16,10 +16,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = false -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle index cccd4b646..1f5223138 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle @@ -17,10 +17,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = false -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/build.gradle index 3f654553e..8fe1e2fd4 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/build.gradle @@ -19,11 +19,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = false -ext.include_in_bom = false -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = false +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle index 76932d5c7..a85e2375a 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle @@ -26,11 +26,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = false -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/build.gradle index 5b4c9b2fe..7c680c4b9 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/build.gradle @@ -17,10 +17,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = false -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/build.gradle index af38d6c06..82c385fea 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/build.gradle @@ -16,11 +16,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = false -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/build.gradle index 3a664d38d..c851ac403 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/build.gradle @@ -16,11 +16,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = false -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle index b500c906c..947770ab4 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle @@ -36,12 +36,12 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager.ivt/build.gradle index d8f6663a7..d6f33aed3 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager.ivt/build.gradle @@ -21,10 +21,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = false -ext.include_in_mvp = false -ext.include_in_bom = false -ext.include_in_isolated = false -ext.include_in_codecoverage = false -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = false +ext.includeInMVP = false +ext.includeInBOM = false +ext.includeInIsolated = false +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/build.gradle index 72372044c..cfd5478d7 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/build.gradle @@ -17,11 +17,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/build.gradle index 6b3da334b..e21862a97 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/build.gradle @@ -16,12 +16,12 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = false -ext.include_in_bom = false -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = false +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/build.gradle b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/build.gradle index 546464f2c..ff37bf7e8 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/build.gradle @@ -17,11 +17,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = false -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/build.gradle b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/build.gradle index 7ac144405..a8ac0ca1f 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/build.gradle @@ -17,10 +17,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = false -ext.include_in_bom = false -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = false \ No newline at end of file +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = false +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/settings.gradle b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/settings.gradle index 64037f7b7..3361ab1fe 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/settings.gradle @@ -5,8 +5,8 @@ rootProject.name = 'dev.galasa.windows.manager' // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_isolated = true -include_in_codecoverage = true +includeInOBR = true +includeInJavadoc = true +includeInBOM = true +includeInIsolated = true +includeInCodeCoverage = true diff --git a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/build.gradle b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/build.gradle index dfb664837..ee27e5056 100644 --- a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/build.gradle @@ -16,12 +16,12 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/build.gradle index 271916ae5..ce534aef1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/build.gradle @@ -17,11 +17,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = false -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle index 61c132788..6cd176fce 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle @@ -17,11 +17,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/settings.gradle index 3c398fa7a..3a5c79c15 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/settings.gradle @@ -5,9 +5,9 @@ rootProject.name = 'dev.galasa.zos.manager' // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -include_in_obr = true -include_in_javadoc = true -include_in_bom = true -include_in_mvp = true -include_in_isolated = true -include_in_codecoverage = true \ No newline at end of file +includeInOBR = true +includeInJavadoc = true +includeInBOM = true +includeInMVP = true +includeInIsolated = true +includeInCodeCoverage = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle index d713479f5..78ec5b5af 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle @@ -15,10 +15,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = false -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/build.gradle index c26890353..5ae0e1338 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/build.gradle @@ -16,11 +16,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = false -ext.include_in_isolated = true -ext.include_in_codecoverage = false -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle index bbec75e81..2d04e7416 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle @@ -21,10 +21,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle index 0ffdfd7cc..ad72ce9cf 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle @@ -17,10 +17,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle index 40fdea0d3..bfe4e7119 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle @@ -17,11 +17,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/build.gradle index d96023929..8567a7282 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/build.gradle @@ -16,13 +16,13 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/build.gradle index 770c7caf0..978c4ea68 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/build.gradle @@ -16,11 +16,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle index 52e074fa1..0b086d671 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle @@ -21,10 +21,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/build.gradle index e763d84c1..3e85e087a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/build.gradle @@ -18,10 +18,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = false +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/build.gradle index e97723981..9062f04f8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/build.gradle @@ -16,11 +16,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = false -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/build.gradle index 3e502a772..217da785c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/build.gradle @@ -22,11 +22,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle index 4a004459c..6c5013087 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle @@ -19,11 +19,11 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/build.gradle index c9854cdc2..9553270f6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/build.gradle @@ -16,10 +16,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true \ No newline at end of file +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle index edf005684..23046e212 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle @@ -18,10 +18,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true \ No newline at end of file +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle index 93d4d8a79..7370b1dd3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle @@ -35,10 +35,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = true \ No newline at end of file +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/build.gradle index 19f6bbdc3..f7d97281f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/build.gradle @@ -16,10 +16,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = false \ No newline at end of file +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = false \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/build.gradle index 5897c5de8..95167ec31 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/build.gradle @@ -15,10 +15,10 @@ dependencies { // or referenced from. // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. -ext.project_name=project.name -ext.include_in_obr = true -ext.include_in_mvp = true -ext.include_in_bom = true -ext.include_in_isolated = true -ext.include_in_codecoverage = true -ext.include_in_javadoc = false \ No newline at end of file +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = false \ No newline at end of file From 23d54087c4f34b559fd865b1dba6f645f1bdfa70 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Sat, 15 Jul 2023 10:52:14 +0100 Subject: [PATCH 126/263] layout in build files to make it easier to read Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../build.gradle | 6 +- .../build.gradle | 2 +- .../build.gradle | 8 +- .../build.gradle | 2 +- .../build.gradle | 8 +- .../build.gradle | 2 +- .../build.gradle | 8 +- .../dev.galasa.cicsts.manager/build.gradle | 2 +- .../build.gradle | 10 +-- .../dev.galasa.cloud.manager/build.gradle | 10 +-- .../build.gradle | 10 +-- .../dev.galasa.docker.manager/build.gradle | 10 +-- .../build.gradle | 10 +-- .../build.gradle | 10 +-- .../dev.galasa.liberty.manager/build.gradle | 10 +-- .../dev.galasa.openstack.manager/build.gradle | 10 +-- .../dev.galasa.common/build.gradle | 10 +-- .../dev.galasa.http.manager.ivt/build.gradle | 10 +-- .../dev.galasa.http.manager/build.gradle | 10 +-- .../dev.galasa.ipnetwork.manager/build.gradle | 10 +-- .../dev.galasa.mq.manager.ivt/build.gradle | 10 +-- .../dev.galasa.mq.manager/build.gradle | 10 +-- .../build.gradle | 10 +-- .../dev.galasa.artifact.manager/build.gradle | 10 +-- .../dev.galasa.core.manager.ivt/build.gradle | 10 +-- .../dev.galasa.core.manager/build.gradle | 10 +-- .../dev.galasa.textscan.manager/build.gradle | 10 +-- .../dev.galasa.db2.manager.ivt/build.gradle | 10 +-- .../dev.galasa.db2.manager/build.gradle | 10 +-- .../build.gradle | 10 +-- .../build.gradle | 10 +-- .../dev.galasa.sem.manager/build.gradle | 10 +-- .../dev.galasa.java.manager/build.gradle | 10 +-- .../build.gradle | 10 +-- .../build.gradle | 10 +-- .../build.gradle | 10 +-- .../build.gradle | 10 +-- .../dev.galasa.phoenix2.manager/build.gradle | 10 +-- .../build.gradle | 10 +-- .../build.gradle | 10 +-- .../build.gradle | 10 +-- .../src/main/res/jmeter.properties | 74 +++++++++---------- .../dev.galasa.jmeter.manager/build.gradle | 10 +-- .../build.gradle | 10 +-- .../dev.galasa.selenium.manager/build.gradle | 10 +-- .../dev.galasa.vtp.manager.ivt/build.gradle | 10 +-- .../dev.galasa.vtp.manager/build.gradle | 10 +-- .../dev.galasa.linux.manager.ivt/build.gradle | 10 +-- .../dev.galasa.linux.manager/build.gradle | 10 +-- .../dev.galasa.windows.manager/build.gradle | 10 +-- .../build.gradle | 10 +-- .../dev.galasa.zos.manager.ivt/build.gradle | 10 +-- .../dev.galasa.zos.manager/build.gradle | 10 +-- .../dev.galasa.zos3270.common/build.gradle | 10 +-- .../build.gradle | 10 +-- .../dev.galasa.zos3270.manager/build.gradle | 10 +-- .../build.gradle | 10 +-- .../build.gradle | 10 +-- galasa-managers-parent/gradle.properties | 4 +- 59 files changed, 303 insertions(+), 303 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/build.gradle index d1c66e706..b49fa15c5 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/build.gradle @@ -22,10 +22,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true +ext.includeInOBR = true ext.includeInMVP=true ext.includeInBOM=true ext.includeInIsolated=true -ext.includeInCodeCoverage=false -ext.includeInJavadoc=false +ext.includeInCodeCoverage= false +ext.includeInJavadoc= false diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/build.gradle index f22a1d13d..7fa475813 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/build.gradle @@ -18,7 +18,7 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true +ext.includeInOBR = true ext.includeInMVP=true ext.includeInBOM=true ext.includeInIsolated=true diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/build.gradle index 7474f6058..03f2056ee 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/build.gradle @@ -19,9 +19,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true +ext.includeInOBR = true ext.includeInMVP=true -ext.includeInBOM=false +ext.includeInBOM= false ext.includeInIsolated=true -ext.includeInCodeCoverage=false -ext.includeInJavadoc=false +ext.includeInCodeCoverage= false +ext.includeInJavadoc= false diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/build.gradle index ecbd68f1f..70c496277 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/build.gradle @@ -18,7 +18,7 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true +ext.includeInOBR = true ext.includeInMVP=true ext.includeInBOM=true ext.includeInIsolated=true diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/build.gradle index 894b16725..9c305c292 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/build.gradle @@ -20,9 +20,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true +ext.includeInOBR = true ext.includeInMVP=true ext.includeInIsolated=true -ext.includeInBOM=false -ext.includeInCodeCoverage=false -ext.includeInJavadoc=false +ext.includeInBOM= false +ext.includeInCodeCoverage= false +ext.includeInJavadoc= false diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/build.gradle index 3e72b017e..624db834c 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/build.gradle @@ -17,7 +17,7 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true +ext.includeInOBR = true ext.includeInMVP=true ext.includeInBOM=true ext.includeInIsolated=true diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/build.gradle index b61278b3c..91e4442ac 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/build.gradle @@ -21,12 +21,12 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true +ext.includeInOBR = true ext.includeInMVP=true ext.includeInBOM=true -ext.includeInIsolated=false -ext.includeInCodeCoverage=false -ext.includeInJavadoc=false +ext.includeInIsolated= false +ext.includeInCodeCoverage= false +ext.includeInJavadoc= false diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle index f65cdee94..fddd83c62 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle @@ -20,7 +20,7 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true +ext.includeInOBR = true ext.includeInMVP=true ext.includeInIsolated=true ext.includeInBOM=true diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle index ba7e7a04e..d53d1a3b3 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle @@ -22,9 +22,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = true \ No newline at end of file +ext.includeInJavadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/build.gradle index 56d5a4131..a1618c1c8 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/build.gradle @@ -15,9 +15,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = true \ No newline at end of file +ext.includeInJavadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/build.gradle index 97602a348..936c4aeb6 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/build.gradle @@ -19,10 +19,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = false -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle index 8f7d0a70c..df8620a4f 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle @@ -20,9 +20,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = true \ No newline at end of file +ext.includeInJavadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/build.gradle index d90972dd7..764190c14 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/build.gradle @@ -19,9 +19,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = false -ext.includeInBOM = false -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = false +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = false \ No newline at end of file +ext.includeInJavadoc = false \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle index eb11e5f5a..540240c81 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle @@ -61,9 +61,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = true \ No newline at end of file +ext.includeInJavadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/build.gradle index 79fc429e9..40e1514aa 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/build.gradle @@ -15,9 +15,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = true \ No newline at end of file +ext.includeInJavadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle index 14a3953d0..70c9dd095 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle @@ -22,9 +22,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = false -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/build.gradle b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/build.gradle index adc60745e..78db7f04c 100644 --- a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/build.gradle +++ b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/build.gradle @@ -12,9 +12,9 @@ version = '0.25.0' // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle index 701d46ce3..958026e6f 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle @@ -18,10 +18,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = false -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle index c4bcca9f7..ae67ae48c 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle @@ -27,9 +27,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/build.gradle index bd8482f71..f328fb953 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/build.gradle @@ -17,10 +17,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = false -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/build.gradle index 0bee972fa..0c1e2b9a6 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/build.gradle @@ -17,9 +17,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = false -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/build.gradle index a8cc4ebbe..b66dc26fb 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/build.gradle @@ -22,9 +22,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = false -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/build.gradle index 4eec032af..ea33ba5c3 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/build.gradle @@ -17,9 +17,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = false -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/build.gradle index 9e4252cc9..404054486 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/build.gradle @@ -19,10 +19,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/build.gradle index 3663f0cf5..6f5c3780a 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/build.gradle @@ -16,9 +16,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = false -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle index 1fac9881f..783073f86 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle @@ -15,10 +15,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/build.gradle index a53561dea..c59558e89 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/build.gradle @@ -16,10 +16,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/build.gradle index d1ea8ba63..c6a3f65df 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/build.gradle @@ -17,10 +17,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = false -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle index ee70333d7..2d8770ddc 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle @@ -18,11 +18,11 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/build.gradle b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/build.gradle index e761f2682..11a6018c5 100644 --- a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/build.gradle @@ -16,9 +16,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = false -ext.includeInMVP = false -ext.includeInBOM = false -ext.includeInIsolated = false +ext.includeInOBR = false +ext.includeInMVP = false +ext.includeInBOM = false +ext.includeInIsolated = false ext.includeInCodeCoverage = false -ext.includeInJavadoc = false \ No newline at end of file +ext.includeInJavadoc = false \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/build.gradle b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/build.gradle index d811d44d0..46ef10945 100644 --- a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/build.gradle @@ -17,9 +17,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = false -ext.includeInMVP = false -ext.includeInBOM = false -ext.includeInIsolated = false +ext.includeInOBR = false +ext.includeInMVP = false +ext.includeInBOM = false +ext.includeInIsolated = false ext.includeInCodeCoverage = false -ext.includeInJavadoc = false \ No newline at end of file +ext.includeInJavadoc = false \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle index abc65865f..79e2589b5 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle @@ -27,9 +27,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = false -ext.includeInMVP = false -ext.includeInBOM = false -ext.includeInIsolated = false +ext.includeInOBR = false +ext.includeInMVP = false +ext.includeInBOM = false +ext.includeInIsolated = false ext.includeInCodeCoverage = false -ext.includeInJavadoc = false \ No newline at end of file +ext.includeInJavadoc = false \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/build.gradle b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/build.gradle index 228f2f4f6..a37af53f8 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/build.gradle @@ -16,10 +16,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = false -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/build.gradle b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/build.gradle index f7085c49f..90fe25808 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/build.gradle @@ -17,10 +17,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = false -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/build.gradle b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/build.gradle index 16626c46e..7d25efd38 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/build.gradle @@ -17,10 +17,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = false -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/build.gradle index 11e1d9965..9efe5d568 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/build.gradle @@ -17,10 +17,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = false -ext.includeInBOM = false -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = false +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle index 56a092836..c262743c9 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle @@ -17,9 +17,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = false -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle index 1f5223138..d8caca6af 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle @@ -18,9 +18,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = false -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/build.gradle index 8fe1e2fd4..3181fdf98 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/build.gradle @@ -20,10 +20,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = false -ext.includeInBOM = false -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = false +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle index a85e2375a..c9a73fbea 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle @@ -27,10 +27,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = false -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/build.gradle index 7c680c4b9..6884b32f5 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/build.gradle @@ -18,9 +18,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = false -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/res/jmeter.properties b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/res/jmeter.properties index a002245bd..02bd43e0f 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/res/jmeter.properties +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/res/jmeter.properties @@ -70,7 +70,7 @@ # By default, SSL session contexts are now created per-thread, rather than being shared. # The original behaviour can be enabled by setting the JMeter property to true -#https.sessioncontext.shared=false +#https.sessioncontext.shared= false # Be aware that https default protocol may vary depending on the version of JVM # See https://blogs.oracle.com/java-platform-group/entry/diagnosing_tls_ssl_and_https @@ -140,7 +140,7 @@ # LoggerPanel display # default to false -#jmeter.loggerpanel.display=false +#jmeter.loggerpanel.display= false # Enable LogViewer Panel to receive log event even if closed # Enabled since 2.12 @@ -158,7 +158,7 @@ # HiDPI mode (default: false) # Activate a 'pseudo'-hidpi mode. Allows to increase size of some UI elements # which are not correctly managed by JVM with high resolution screens in Linux or Windows -#jmeter.hidpi.mode=false +#jmeter.hidpi.mode= false # To enable pseudo-hidpi mode change to true #jmeter.hidpi.mode=true # HiDPI scale factor @@ -290,7 +290,7 @@ remote_hosts=127.0.0.1 # When all initialization tries was made, test will fail if some remote engines are failed # Set following property to true to ignore failed nodes and proceed with test -#client.continue_on_fail=false +#client.continue_on_fail= false # To change the default port (1099) used to access the server: #server.rmi.port=1234 @@ -301,7 +301,7 @@ remote_hosts=127.0.0.1 # The jmeter server creates by default the RMI registry as part of the server process. # To stop the server creating the RMI registry: -#server.rmi.create=false +#server.rmi.create= false # Define the following property to cause JMeter to exit after the first test #server.exitaftertest=true @@ -331,7 +331,7 @@ remote_hosts=127.0.0.1 #server.rmi.ssl.truststore.password=changeit # # Set this if you don't want to use SSL for RMI -#server.rmi.ssl.disable=false +#server.rmi.ssl.disable= false #--------------------------------------------------------------------------- # Include Controller #--------------------------------------------------------------------------- @@ -347,7 +347,7 @@ remote_hosts=127.0.0.1 # Should JMeter add to POST request content-type header if missing: # Content-Type: application/x-www-form-urlencoded # Was true before version 5.0 -#post_add_content_type_if_missing=false +#post_add_content_type_if_missing= false #--------------------------------------------------------------------------- # HTTP Java configuration @@ -394,7 +394,7 @@ remote_hosts=127.0.0.1 # Should credentials be delegated to webservers when using # SPNEGO authentication -#kerberos.spnego.delegate_cred=false +#kerberos.spnego.delegate_cred= false #--------------------------------------------------------------------------- # Apache HttpComponents HTTPClient configuration (HTTPClient4) @@ -405,7 +405,7 @@ remote_hosts=127.0.0.1 #hc.parameters.file=hc.parameters # If true, default HC4 User-Agent will not be added -#httpclient4.default_user_agent_disabled=false +#httpclient4.default_user_agent_disabled= false # Preemptively send Authorization Header when BASIC auth is used #httpclient4.auth.preemptive=true @@ -417,7 +417,7 @@ remote_hosts=127.0.0.1 # This will retry Idempotent and non Idempotent requests # This should usually be false, but it can be useful # when testing against some Load Balancers like Amazon ELB -#httpclient4.request_sent_retry_enabled=false +#httpclient4.request_sent_retry_enabled= false # Idle connection timeout (Milliseconds) to apply if the server does not send # Keep-Alive headers (default 0) @@ -439,11 +439,11 @@ remote_hosts=127.0.0.1 # Ignore EOFException that some edgy application may emit to signal end of GZIP stream # Defaults to false -#httpclient4.gzip_relax_mode=false +#httpclient4.gzip_relax_mode= false # Ignore EOFException that some edgy application may emit to signal end of Deflated stream # Defaults to false -#httpclient4.deflate_relax_mode=false +#httpclient4.deflate_relax_mode= false #--------------------------------------------------------------------------- # HTTP Cache Manager configuration @@ -499,9 +499,9 @@ remote_hosts=127.0.0.1 #jmeter.save.saveservice.label=true #jmeter.save.saveservice.response_code=true # response_data is not currently supported for CSV output -#jmeter.save.saveservice.response_data=false +#jmeter.save.saveservice.response_data= false # Save ResponseData for failed samples -#jmeter.save.saveservice.response_data.on_error=false +#jmeter.save.saveservice.response_data.on_error= false #jmeter.save.saveservice.response_message=true #jmeter.save.saveservice.successful=true #jmeter.save.saveservice.thread_name=true @@ -511,18 +511,18 @@ remote_hosts=127.0.0.1 #jmeter.save.saveservice.latency=true # Only available with HttpClient4 #jmeter.save.saveservice.connect_time=true -#jmeter.save.saveservice.samplerData=false -#jmeter.save.saveservice.responseHeaders=false -#jmeter.save.saveservice.requestHeaders=false -#jmeter.save.saveservice.encoding=false +#jmeter.save.saveservice.samplerData= false +#jmeter.save.saveservice.responseHeaders= false +#jmeter.save.saveservice.requestHeaders= false +#jmeter.save.saveservice.encoding= false #jmeter.save.saveservice.bytes=true # Only available with HttpClient4 #jmeter.save.saveservice.sent_bytes=true #jmeter.save.saveservice.url=true -#jmeter.save.saveservice.filename=false -#jmeter.save.saveservice.hostname=false +#jmeter.save.saveservice.filename= false +#jmeter.save.saveservice.hostname= false #jmeter.save.saveservice.thread_counts=true -#jmeter.save.saveservice.sample_count=false +#jmeter.save.saveservice.sample_count= false #jmeter.save.saveservice.idle_time=true # Timestamp format - this only affects CSV output files @@ -562,7 +562,7 @@ remote_hosts=127.0.0.1 # Setting this to true will result in less test results data loss in case of Crash # but with impact on performances, particularly for intensive tests (low or no pauses) # Since JMeter 2.10, this is false by default -#jmeter.save.saveservice.autoflush=false +#jmeter.save.saveservice.autoflush= false #--------------------------------------------------------------------------- # Settings that affect SampleResults @@ -582,7 +582,7 @@ sampleresult.timestamp.start=true # Since version 5.0 JMeter has a new SubResult Naming Policy which numbers subresults by default # This property if set to true discards renaming policy. This can be required if you're using JMeter for functional testing. # Defaults to: false -#subresults.disable_renaming=false +#subresults.disable_renaming= false #--------------------------------------------------------------------------- # Upgrade property @@ -622,7 +622,7 @@ upgrade_properties=/bin/upgrade.properties # relative paths. # If you want to test strict conformance, set this value to true # When the property is true, JMeter follows http://tools.ietf.org/html/rfc3986#section-5.2 -#jmeter.httpclient.strict_rfc2616=false +#jmeter.httpclient.strict_rfc2616= false # Default content-type include filter to use #proxy.content_type_include=text/html|text/plain|text/xml @@ -757,7 +757,7 @@ wmlParser.types=text/vnd.wap.wml #mode=Batch #mode=Statistical #Set to true to key statistical samples on threadName rather than threadGroup -#key_on_threadname=false +#key_on_threadname= false #mode=Stripped #mode=StrippedBatch #mode=org.example.load.MySampleSender @@ -1068,14 +1068,14 @@ csvdataset.file.encoding_list=UTF-8|UTF-16|ISO-8859-15|US-ASCII # If embedded resources download fails due to missing resources or other reasons, if this property is true # Parent sample will not be marked as failed -#httpsampler.ignore_failed_embedded_resources=false +#httpsampler.ignore_failed_embedded_resources= false #keep alive time for the parallel download threads (in seconds) #httpsampler.parallel_download_thread_keepalive_inseconds=60 # Don't keep the embedded resources response data : just keep the size and the md5 # default to false -#httpsampler.embedded_resources_use_md5=false +#httpsampler.embedded_resources_use_md5= false # List of extra HTTP methods that should be available in select box #httpsampler.user_defined_methods=VERSION-CONTROL,REPORT,CHECKOUT,CHECKIN,UNCHECKOUT,MKWORKSPACE,UPDATE,LABEL,MERGE,BASELINE-CONTROL,MKACTIVITY @@ -1093,7 +1093,7 @@ csvdataset.file.encoding_list=UTF-8|UTF-16|ISO-8859-15|US-ASCII # CookieManager behaviour - should Cookies be stored as variables? # Default is false -#CookieManager.save.cookies=false +#CookieManager.save.cookies= false # CookieManager behaviour - prefix to add to cookie name before storing it as a variable # Default is COOKIE_; to remove the prefix, define it as one or more spaces @@ -1108,16 +1108,16 @@ cookies=cookies # Ability to switch to Nashorn as default Javascript Engine used by IfController and __javaScript function # JMeter works as following: -# - JDK >= 8 and javascript.use_rhino=false or not set : Nashorn +# - JDK >= 8 and javascript.use_rhino= false or not set : Nashorn # - JDK >= 8 and javascript.use_rhino=true: Rhino # If you want to use Rhino on JDK8, set this property to true -#javascript.use_rhino=false +#javascript.use_rhino= false # Number of milliseconds to wait for a thread to stop #jmeterengine.threadstop.wait=5000 #Whether to invoke System.exit(0) in server exit code after stopping RMI -#jmeterengine.remote.system.exit=false +#jmeterengine.remote.system.exit= false # Whether to call System.exit(1) on failure to stop threads in non-GUI mode. # This only takes effect if the test was explicitly requested to stop. @@ -1128,7 +1128,7 @@ cookies=cookies # there were no failures and the test was not explicitly asked to stop. # Without this, the JVM may never exit if there are other threads spawned by # the test which never exit. -#jmeterengine.force.system.exit=false +#jmeterengine.force.system.exit= false # How long to pause (in ms) in the daemon thread before reporting that the JVM has failed to exit. # If the value is <= 0, the JMeter does not start the daemon thread @@ -1147,7 +1147,7 @@ cookies=cookies #Should JMeter expand the tree when loading a test plan? # default value is false since JMeter 2.7 -#onload.expandtree=false +#onload.expandtree= false #JSyntaxTextArea configuration #jsyntaxtextarea.wrapstyleword=true @@ -1183,10 +1183,10 @@ view.results.tree.renderers_order=.RenderAsText,.RenderAsRegexp,.RenderAsBoundar #JMS options # Enable the following property to stop JMS Point-to-Point Sampler from using # the properties java.naming.security.[principal|credentials] when creating the queue connection -#JMSSampler.useSecurity.properties=false +#JMSSampler.useSecurity.properties= false # Set the following value to true in order to skip the delete confirmation dialogue -#confirm.delete.skip=false +#confirm.delete.skip= false # Used by JSR223 elements # Size of compiled scripts cache @@ -1281,7 +1281,7 @@ system.properties=system.properties # Force throuput controllers that work in percentage mode to be a 100% # Disabled by default -#testplan_validation.tpc_force_100_pct=false +#testplan_validation.tpc_force_100_pct= false #--------------------------------------------------------------------------- # Think Time configuration @@ -1335,7 +1335,7 @@ jmeter.reportgenerator.apdex_tolerated_threshold=1500 # Switch that allows using Local documentation opened in JMeter GUI # By default we use Online documentation opened in Browser -#help.local=false +#help.local= false #--------------------------------------------------------------------------- # Documentation generation diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/build.gradle index 82c385fea..6ca387a85 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/build.gradle @@ -17,10 +17,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = false -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/build.gradle index c851ac403..db90bc8f3 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/build.gradle @@ -17,10 +17,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = false -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle index 947770ab4..c2cf5afba 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle @@ -37,11 +37,11 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager.ivt/build.gradle index d6f33aed3..ada3f4ade 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager.ivt/build.gradle @@ -22,9 +22,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = false -ext.includeInMVP = false -ext.includeInBOM = false -ext.includeInIsolated = false +ext.includeInOBR = false +ext.includeInMVP = false +ext.includeInBOM = false +ext.includeInIsolated = false ext.includeInCodeCoverage = false -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/build.gradle index cfd5478d7..19a02114a 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/build.gradle @@ -18,10 +18,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/build.gradle index e21862a97..2f5595bab 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/build.gradle @@ -17,11 +17,11 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = false -ext.includeInBOM = false -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = false +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/build.gradle b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/build.gradle index ff37bf7e8..11cf1e2b4 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/build.gradle @@ -18,10 +18,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = false -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/build.gradle b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/build.gradle index a8ac0ca1f..3eb98c53c 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/build.gradle @@ -18,9 +18,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = false -ext.includeInBOM = false -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = false +ext.includeInBOM = false +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = false \ No newline at end of file +ext.includeInJavadoc = false \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/build.gradle b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/build.gradle index ee27e5056..5d2c0d7b7 100644 --- a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/build.gradle @@ -17,11 +17,11 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/build.gradle index ce534aef1..bb6bf4806 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/build.gradle @@ -18,10 +18,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = false -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle index 6cd176fce..56c89fb13 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle @@ -18,10 +18,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle index 78ec5b5af..10a7fd8eb 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle @@ -16,9 +16,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = false -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/build.gradle index 5ae0e1338..f4958df06 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/build.gradle @@ -17,10 +17,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = false -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true ext.includeInCodeCoverage = false -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle index 2d04e7416..6fbe6cc81 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle @@ -22,9 +22,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle index ad72ce9cf..b507f913c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle @@ -18,9 +18,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle index bfe4e7119..b9a9e69d4 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle @@ -18,10 +18,10 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = true -ext.includeInMVP = true -ext.includeInBOM = true -ext.includeInIsolated = true +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true ext.includeInCodeCoverage = true -ext.includeInJavadoc = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/gradle.properties b/galasa-managers-parent/gradle.properties index c20f7edfd..492e06796 100644 --- a/galasa-managers-parent/gradle.properties +++ b/galasa-managers-parent/gradle.properties @@ -1,8 +1,8 @@ org.gradle.jvmargs=-Xmx4096M -jacocoEnabled=false +jacocoEnabled= false -isMainOrRelease=false +isMainOrRelease= false sourceMaven=https://repo.maven.apache.org/maven2/ centralMaven=https://repo.maven.apache.org/maven2/ From 7ebe6d03dba7d1720da27311fff317a47957a917 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Sat, 15 Jul 2023 11:01:37 +0100 Subject: [PATCH 127/263] aligning property assignments to look better Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../dev.galasa.cicsts.ceci.manager.ivt/build.gradle | 10 +++++----- .../dev.galasa.cicsts.ceci.manager/build.gradle | 10 +++++----- .../dev.galasa.cicsts.ceda.manager.ivt/build.gradle | 10 +++++----- .../dev.galasa.cicsts.ceda.manager/build.gradle | 10 +++++----- .../dev.galasa.cicsts.cemt.manager.ivt/build.gradle | 10 +++++----- .../dev.galasa.cicsts.cemt.manager/build.gradle | 10 +++++----- .../dev.galasa.cicsts.manager.ivt/build.gradle | 10 +++++----- .../dev.galasa.cicsts.manager/build.gradle | 10 +++++----- 8 files changed, 40 insertions(+), 40 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/build.gradle index b49fa15c5..590bff3ec 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/build.gradle @@ -23,9 +23,9 @@ dependencies { // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name ext.includeInOBR = true -ext.includeInMVP=true -ext.includeInBOM=true -ext.includeInIsolated=true -ext.includeInCodeCoverage= false -ext.includeInJavadoc= false +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/build.gradle index 7fa475813..158a38a41 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/build.gradle @@ -19,10 +19,10 @@ dependencies { // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name ext.includeInOBR = true -ext.includeInMVP=true -ext.includeInBOM=true -ext.includeInIsolated=true -ext.includeInCodeCoverage=true -ext.includeInJavadoc=true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/build.gradle index 03f2056ee..0803187c7 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/build.gradle @@ -20,8 +20,8 @@ dependencies { // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name ext.includeInOBR = true -ext.includeInMVP=true -ext.includeInBOM= false -ext.includeInIsolated=true -ext.includeInCodeCoverage= false -ext.includeInJavadoc= false +ext.includeInMVP = true +ext.includeInBOM = false +ext.includeInIsolated = true +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/build.gradle index 70c496277..d1cea9b3a 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/build.gradle @@ -19,9 +19,9 @@ dependencies { // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name ext.includeInOBR = true -ext.includeInMVP=true -ext.includeInBOM=true -ext.includeInIsolated=true -ext.includeInCodeCoverage=true -ext.includeInJavadoc=true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/build.gradle index 9c305c292..4f5e4a0d4 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/build.gradle @@ -21,8 +21,8 @@ dependencies { // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name ext.includeInOBR = true -ext.includeInMVP=true -ext.includeInIsolated=true -ext.includeInBOM= false -ext.includeInCodeCoverage= false -ext.includeInJavadoc= false +ext.includeInMVP = true +ext.includeInIsolated = true +ext.includeInBOM = false +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/build.gradle index 624db834c..88e3c3793 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/build.gradle @@ -18,9 +18,9 @@ dependencies { // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name ext.includeInOBR = true -ext.includeInMVP=true -ext.includeInBOM=true -ext.includeInIsolated=true -ext.includeInCodeCoverage=true -ext.includeInJavadoc=true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/build.gradle index 91e4442ac..10b74f89a 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/build.gradle @@ -22,11 +22,11 @@ dependencies { // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name ext.includeInOBR = true -ext.includeInMVP=true -ext.includeInBOM=true -ext.includeInIsolated= false -ext.includeInCodeCoverage= false -ext.includeInJavadoc= false +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = false +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle index fddd83c62..2b9da7e5f 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle @@ -21,9 +21,9 @@ dependencies { // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name ext.includeInOBR = true -ext.includeInMVP=true -ext.includeInIsolated=true -ext.includeInBOM=true -ext.includeInCodeCoverage=true -ext.includeInJavadoc=true +ext.includeInMVP = true +ext.includeInIsolated = true +ext.includeInBOM = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true From 4c5400ba6e4476dcfd4868d0162318670aeb5e64 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Sat, 15 Jul 2023 11:07:29 +0100 Subject: [PATCH 128/263] remove redundant metadata in settings.gradle Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../dev.galasa.windows.manager/settings.gradle | 10 ---------- .../dev.galasa.zos.manager/settings.gradle | 11 ----------- 2 files changed, 21 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/settings.gradle b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/settings.gradle index 3361ab1fe..035638855 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/settings.gradle @@ -1,12 +1,2 @@ rootProject.name = 'dev.galasa.windows.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -includeInOBR = true -includeInJavadoc = true -includeInBOM = true -includeInIsolated = true -includeInCodeCoverage = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/settings.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/settings.gradle index 3a5c79c15..dc23bbc7d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/settings.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/settings.gradle @@ -1,13 +1,2 @@ rootProject.name = 'dev.galasa.zos.manager' -// Note: These values are consumed by the build process -// They indicate which packages of functionality this OSGi bundle should be delivered inside, -// or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file -// which gathers-up all the packaging metadata about all the OSGi bundles in this component. -includeInOBR = true -includeInJavadoc = true -includeInBOM = true -includeInMVP = true -includeInIsolated = true -includeInCodeCoverage = true \ No newline at end of file From 4c1b401382a998c5de90a5579d8c47b88d5f7f50 Mon Sep 17 00:00:00 2001 From: Will Yates Date: Mon, 17 Jul 2023 16:58:59 +0100 Subject: [PATCH 129/263] rollback release.yaml changes Signed-off-by: Will Yates --- .../dev.galasa.sem.manager/build.gradle | 4 +- release.yaml | 422 +++++++++--------- 2 files changed, 223 insertions(+), 203 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle index 79e2589b5..c8821a4a7 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle @@ -27,9 +27,9 @@ dependencies { // The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name -ext.includeInOBR = false +ext.includeInOBR = true ext.includeInMVP = false -ext.includeInBOM = false +ext.includeInBOM = true ext.includeInIsolated = false ext.includeInCodeCoverage = false ext.includeInJavadoc = false \ No newline at end of file diff --git a/release.yaml b/release.yaml index 6481fcf77..75568805f 100644 --- a/release.yaml +++ b/release.yaml @@ -1,16 +1,6 @@ # # Copyright contributors to the Galasa project # - -# ----------------------------------------------------------- -# -# WARNING -# -# This file is periodically re-generated from the contents of -# the repository, so don't make changes here manually please. -# ----------------------------------------------------------- - - apiVersion: galasa.dev/v1alpha kind: Release metadata: @@ -23,67 +13,83 @@ managers: # Manager # - - artifact: galasa-managers-parent - version: 0.30.0 - - - artifact: dev.galasa.cicsts.ceci.manager + - artifact: dev.galasa.artifact.manager version: 0.25.0 obr: true javadoc: true bom: true mvp: true isolated: true - - - artifact: dev.galasa.cicsts.ceci.manager.ivt + codecoverage: true + + - artifact: dev.galasa.artifact.manager.ivt version: 0.25.0 obr: true - bom: true mvp: true isolated: true - - - artifact: dev.galasa.cicsts.ceda.manager - version: 0.29.0 + + - artifact: dev.galasa.cicsts.manager + version: 0.28.0 obr: true + mvp: true javadoc: true bom: true - mvp: true isolated: true + codecoverage: true - - artifact: dev.galasa.cicsts.ceda.manager.ivt + - artifact: dev.galasa.cicsts.manager.ivt version: 0.22.0 obr: true mvp: true + bom: true isolated: true - - - artifact: dev.galasa.cicsts.cemt.manager + + - artifact: dev.galasa.cicsts.ceci.manager version: 0.25.0 obr: true + mvp: true javadoc: true bom: true - mvp: true isolated: true + codecoverage: true - - artifact: dev.galasa.cicsts.cemt.manager.ivt - version: 0.22.0 + - artifact: dev.galasa.cicsts.ceci.manager.ivt + version: 0.25.0 obr: true mvp: true + bom: true isolated: true - - - artifact: dev.galasa.cicsts.manager - version: 0.28.0 + + - artifact: dev.galasa.cicsts.ceda.manager + version: 0.29.0 obr: true + mvp: true javadoc: true bom: true + isolated: true + codecoverage: true + + - artifact: dev.galasa.cicsts.ceda.manager.ivt + version: 0.22.0 + obr: true mvp: true isolated: true - - - artifact: dev.galasa.cicsts.manager.ivt + + - artifact: dev.galasa.cicsts.cemt.manager version: 0.25.0 obr: true + mvp: true + javadoc: true bom: true + isolated: true + codecoverage: true + + - artifact: dev.galasa.cicsts.cemt.manager.ivt + version: 0.22.0 + obr: true mvp: true isolated: true - + - artifact: dev.galasa.cicsts.resource.manager version: 0.25.0 obr: true @@ -91,7 +97,8 @@ managers: bom: true mvp: true isolated: true - + codecoverage: true + - artifact: dev.galasa.cloud.manager version: 0.22.0 obr: true @@ -99,313 +106,268 @@ managers: bom: true mvp: true isolated: true + codecoverage: true - - artifact: dev.galasa.docker.manager + - artifact: dev.galasa.common version: 0.25.0 obr: true - javadoc: true bom: true mvp: true isolated: true - - - artifact: dev.galasa.docker.manager.ivt + + - artifact: dev.galasa.core.manager version: 0.25.0 obr: true - mvp: true - isolated: true - - - artifact: dev.galasa.kubernetes.manager - version: 0.29.0 - obr: true javadoc: true bom: true mvp: true isolated: true - - - artifact: dev.galasa.kubernetes.manager.ivt - version: 0.21.0 - obr: true - isolated: true - - - artifact: dev.galasa.liberty.manager + codecoverage: true + + - artifact: dev.galasa.core.manager.ivt version: 0.21.0 obr: true - javadoc: true - bom: true mvp: true isolated: true - - artifact: dev.galasa.openstack.manager - version: 0.26.0 - obr: true - javadoc: true - bom: true - isolated: true - - - artifact: dev.galasa.common + - artifact: dev.galasa.db2.manager version: 0.25.0 obr: true bom: true + javadoc: true mvp: true isolated: true - - artifact: dev.galasa.http.manager - version: 0.25.0 + - artifact: dev.galasa.db2.manager.ivt + version: 0.21.0 obr: true - javadoc: true - bom: true mvp: true isolated: true - - - artifact: dev.galasa.http.manager.ivt + + - artifact: dev.galasa.docker.manager version: 0.25.0 obr: true + javadoc: true + bom: true mvp: true isolated: true - - - artifact: dev.galasa.ipnetwork.manager + codecoverage: true + + - artifact: dev.galasa.docker.manager.ivt version: 0.25.0 obr: true - javadoc: true - bom: true mvp: true isolated: true - - - artifact: dev.galasa.mq.manager + + - artifact: dev.galasa.elasticlog.manager version: 0.25.0 obr: true - javadoc: true bom: true isolated: true - - - artifact: dev.galasa.mq.manager.ivt + codecoverage: true + + - artifact: dev.galasa.elasticlog.manager.ivt version: 0.21.0 obr: true - bom: true isolated: true - - - artifact: dev.galasa.artifact.manager - version: 0.25.0 + + - artifact: dev.galasa.galasaecosystem.manager + version: 0.27.0 obr: true - javadoc: true bom: true - mvp: true isolated: true codecoverage: true - - artifact: dev.galasa.artifact.manager.ivt - version: 0.25.0 + - artifact: dev.galasa.galasaecosystem.manager.ivt + version: 0.21.0 obr: true - mvp: true isolated: true - - artifact: dev.galasa.core.manager + - artifact: dev.galasa.githubissue.manager version: 0.25.0 obr: true - javadoc: true + mvp: false bom: true - mvp: true - isolated: true - - - artifact: dev.galasa.core.manager.ivt - version: 0.21.0 - obr: true - mvp: true - isolated: true - - - artifact: dev.galasa.textscan.manager - version: 0.21.0 + isolated: false + + - artifact: dev.galasa.http.manager + version: 0.25.0 obr: true javadoc: true bom: true mvp: true isolated: true - - - artifact: dev.galasa.db2.manager + codecoverage: true + + - artifact: dev.galasa.http.manager.ivt version: 0.25.0 obr: true - javadoc: true - bom: true mvp: true isolated: true - - - artifact: dev.galasa.db2.manager.ivt + + - artifact: dev.galasa.ipnetwork.manager version: 0.25.0 obr: true + javadoc: true + bom: true mvp: true isolated: true - - - artifact: dev.galasa.eclipseruntime - version: 0.18.0 - - - artifact: dev.galasa.eclipseruntime.ubuntu.manager - version: 0.18.0 - - - artifact: dev.galasa.sem.manager - version: 0.25.0 - + codecoverage: true + - artifact: dev.galasa.java.manager version: 0.21.0 obr: true javadoc: true bom: true isolated: true - + codecoverage: true + - artifact: dev.galasa.java.ubuntu.manager version: 0.21.0 obr: true javadoc: true bom: true isolated: true - + codecoverage: true + - artifact: dev.galasa.java.windows.manager version: 0.21.0 obr: true javadoc: true bom: true isolated: true - - - artifact: dev.galasa.elasticlog.manager - version: 0.25.0 - obr: true - bom: true - isolated: true - - - artifact: dev.galasa.elasticlog.manager.ivt - version: 0.21.0 - obr: true - isolated: true - - - artifact: dev.galasa.phoenix2.manager - version: 0.25.0 - obr: true - bom: true - isolated: true - - - artifact: dev.galasa.galasaecosystem.manager - version: 0.27.0 - obr: true - bom: true - isolated: true - - - artifact: dev.galasa.galasaecosystem.manager.ivt - version: 0.21.0 - obr: true - isolated: true - + codecoverage: true + - artifact: dev.galasa.jmeter.manager version: 0.25.0 obr: true javadoc: true bom: true isolated: true - + codecoverage: true + - artifact: dev.galasa.jmeter.manager.ivt version: 0.25.0 obr: true - javadoc: true - bom: true isolated: true - - - artifact: dev.galasa.selenium.manager - version: 0.25.0 + + - artifact: dev.galasa.kubernetes.manager + version: 0.29.0 obr: true javadoc: true bom: true mvp: true isolated: true - - - artifact: dev.galasa.selenium.manager.ivt + codecoverage: true + + - artifact: dev.galasa.kubernetes.manager.ivt version: 0.21.0 obr: true - mvp: true isolated: true - - - artifact: dev.galasa.vtp.manager - version: 0.25.0 + + - artifact: dev.galasa.liberty.manager + version: 0.21.0 obr: true + mvp: true javadoc: true bom: true - mvp: true isolated: true - - - artifact: dev.galasa.vtp.manager.ivt - version: 0.21.0 - + codecoverage: true + - artifact: dev.galasa.linux.manager version: 0.21.0 obr: true javadoc: true bom: true isolated: true - + codecoverage: true + - artifact: dev.galasa.linux.manager.ivt version: 0.21.0 obr: true isolated: true - - artifact: dev.galasa.windows.manager + - artifact: dev.galasa.mq.manager + version: 0.25.0 + obr: true + javadoc: true + bom: true + isolated: true + codecoverage: true + + - artifact: dev.galasa.mq.manager.ivt version: 0.21.0 obr: true + bom: true + isolated: true + + - artifact: dev.galasa.openstack.manager + version: 0.26.0 + obr: true javadoc: true bom: true isolated: true - - - artifact: dev.galasa.githubissue.manager + codecoverage: true + + - artifact: dev.galasa.phoenix2.manager version: 0.25.0 obr: true bom: true - mvp: true isolated: true - - - artifact: dev.galasa.zos.manager - version: 0.28.0 + + - artifact: dev.galasa.selenium.manager + version: 0.25.0 obr: true javadoc: true bom: true mvp: true isolated: true - - - artifact: dev.galasa.zos.manager.ivt - version: 0.28.0 + codecoverage: true + + - artifact: dev.galasa.selenium.manager.ivt + version: 0.21.0 obr: true mvp: true isolated: true - - - artifact: dev.galasa.zos3270.common - version: 0.28.0 + + - artifact: dev.galasa.sem.manager + version: 0.25.0 obr: true bom: true - mvp: true isolated: true - - - artifact: dev.galasa.zos3270.manager - version: 0.28.0 + + - artifact: dev.galasa.textscan.manager + version: 0.21.0 obr: true + mvp: true javadoc: true bom: true - mvp: true isolated: true - - - artifact: dev.galasa.zos3270.manager.ivt + codecoverage: true + + - artifact: dev.galasa.windows.manager version: 0.21.0 obr: true - mvp: true + javadoc: true + bom: true isolated: true - + codecoverage: true + - artifact: dev.galasa.zosbatch.rseapi.manager version: 0.26.0 obr: true bom: true mvp: true isolated: true - + codecoverage: true + - artifact: dev.galasa.zosbatch.zosmf.manager version: 0.26.0 obr: true bom: true mvp: true isolated: true + codecoverage: true - artifact: dev.galasa.zosconsole.oeconsol.manager version: 0.21.0 @@ -413,59 +375,82 @@ managers: bom: true mvp: true isolated: true - + codecoverage: true + - artifact: dev.galasa.zosconsole.zosmf.manager version: 0.25.0 obr: true bom: true mvp: true isolated: true - + codecoverage: true + - artifact: dev.galasa.zosfile.rseapi.manager version: 0.25.0 obr: true bom: true mvp: true isolated: true - + codecoverage: true + - artifact: dev.galasa.zosfile.zosmf.manager version: 0.25.0 obr: true bom: true mvp: true isolated: true - - - artifact: dev.galasa.zosliberty.angel.manager + codecoverage: true + + - artifact: dev.galasa.zosliberty.manager version: 0.21.0 obr: true + mvp: true javadoc: true bom: true isolated: true - - - artifact: dev.galasa.zosliberty.manager + codecoverage: true + + - artifact: dev.galasa.zosliberty.angel.manager version: 0.21.0 obr: true javadoc: true bom: true + isolated: true + codecoverage: true + + - artifact: dev.galasa.zos.manager + version: 0.28.0 + obr: true + javadoc: true + bom: true mvp: true isolated: true - - - artifact: dev.galasa.zosmf.manager + codecoverage: true + + - artifact: dev.galasa.zos.manager.ivt + version: 0.28.0 + obr: true + mvp: true + isolated: true + + - artifact: dev.galasa.zosprogram.manager version: 0.25.0 obr: true javadoc: true bom: true mvp: true isolated: true - - - artifact: dev.galasa.zosprogram.manager + codecoverage: true + + - artifact: dev.galasa.zosmf.manager version: 0.25.0 obr: true javadoc: true bom: true mvp: true isolated: true - + codecoverage: true + - artifact: dev.galasa.zosrseapi.manager version: 0.25.0 obr: true @@ -473,7 +458,8 @@ managers: bom: true mvp: true isolated: true - + codecoverage: true + - artifact: dev.galasa.zossecurity.manager version: 0.29.0 obr: true @@ -481,17 +467,51 @@ managers: bom: true mvp: true isolated: true - + codecoverage: true + - artifact: dev.galasa.zostsocommand.ssh.manager version: 0.21.0 obr: true bom: true mvp: true isolated: true - + codecoverage: true + - artifact: dev.galasa.zosunixcommand.ssh.manager version: 0.21.0 obr: true bom: true mvp: true isolated: true + codecoverage: true + + - artifact: dev.galasa.zos3270.common + version: 0.28.0 + obr: true + bom: true + mvp: true + isolated: true + codecoverage: true + + - artifact: dev.galasa.zos3270.manager + version: 0.28.0 + obr: true + javadoc: true + bom: true + mvp: true + isolated: true + codecoverage: true + + - artifact: dev.galasa.zos3270.manager.ivt + version: 0.21.0 + obr: true + mvp: true + isolated: true + + - artifact: dev.galasa.vtp.manager + version: 0.25.0 + obr: true + javadoc: true + bom: true + mvp: true + isolated: true \ No newline at end of file From 5638ee6566f5b3048c228f559825c95933a03a35 Mon Sep 17 00:00:00 2001 From: Fiona Ampofo <64271621+Akyiaa@users.noreply.github.com> Date: Fri, 21 Jul 2023 11:59:24 +0100 Subject: [PATCH 130/263] changed copyright statements Signed-off-by: Fiona Ampofo <64271621+Akyiaa@users.noreply.github.com> --- .../cicsts/ceci/manager/ivt/CECIManagerIVT.java | 3 ++- .../ceci/internal/CeciExecInterfaceBlockImpl.java | 10 +++++----- .../dev/galasa/cicsts/ceci/internal/CeciImpl.java | 2 ++ .../cicsts/ceci/internal/CeciManagerField.java | 6 +++--- .../cicsts/ceci/internal/CeciManagerImpl.java | 2 ++ .../cicsts/ceci/internal/CeciResponseImpl.java | 10 +++++----- .../ceci/internal/ResponseOutputValueImpl.java | 10 +++++----- .../galasa/cicsts/ceci/internal/package-info.java | 10 +++++----- .../properties/CeciPropertiesSingleton.java | 6 +++--- .../ceci/internal/properties/package-info.java | 10 +++++----- .../dev/galasa/cicsts/ceci/spi/ICeciManagerSpi.java | 2 ++ .../dev/galasa/cicsts/ceci/spi/package-info.java | 2 ++ .../internal/TestCeciExecInterfaceBlockImpl.java | 5 +++++ .../galasa/cicsts/ceci/internal/TestCeciImpl.java | 8 +++++--- .../cicsts/ceci/internal/TestCeciManagerImpl.java | 8 +++++--- .../cicsts/ceci/internal/TestCeciResponseImpl.java | 5 +++++ .../ceci/internal/TestResponseOutputValueImpl.java | 5 +++++ .../properties/TestCeciPropertiesSingleton.java | 10 +++++----- .../cicsts/ceda/manager/ivt/CedaManagerIVT.java | 8 +++++--- .../dev/galasa/cicsts/ceda/internal/CedaImpl.java | 8 +++++--- .../cicsts/ceda/internal/CedaManagerImpl.java | 10 +++++----- .../properties/CedaPropertiesSingleton.java | 6 +++--- .../java/dev/galasa/cicsts/ceda/package-info.java | 6 +++--- .../dev/galasa/cicsts/ceda/spi/ICedaManagerSpi.java | 6 +++--- .../cicsts/cemt/manager/ivt/CEMTManagerIVT.java | 3 ++- .../cicsts/cemt/manager/ivt/IVTException.java | 8 +++----- .../dev/galasa/cicsts/cemt/internal/CemtImpl.java | 2 ++ .../cicsts/cemt/internal/CemtManagerImpl.java | 8 +++++--- .../properties/CemtPropertiesSingleton.java | 7 +++---- .../dev/galasa/cicsts/cemt/spi/ICemtManagerSpi.java | 3 ++- .../dev/galasa/cicsts/cemt/spi/package-info.java | 2 ++ .../galasa/cicsts/manager/ivt/CICSTSManagerIVT.java | 3 ++- .../main/java/dev/galasa/cicsts/CeciException.java | 6 +++--- .../dev/galasa/cicsts/CeciManagerException.java | 6 +++--- .../main/java/dev/galasa/cicsts/CedaException.java | 6 +++--- .../dev/galasa/cicsts/CedaManagerException.java | 6 +++--- .../main/java/dev/galasa/cicsts/CemtException.java | 8 +++----- .../dev/galasa/cicsts/CemtManagerException.java | 6 +++--- .../src/main/java/dev/galasa/cicsts/CicsRegion.java | 6 +++--- .../main/java/dev/galasa/cicsts/CicsTerminal.java | 6 +++--- .../main/java/dev/galasa/cicsts/CicstsHashMap.java | 6 +++--- .../dev/galasa/cicsts/CicstsManagerException.java | 6 +++--- .../java/dev/galasa/cicsts/CicstsManagerField.java | 6 +++--- .../src/main/java/dev/galasa/cicsts/ICeci.java | 2 ++ .../main/java/dev/galasa/cicsts/ICeciResponse.java | 10 +++++----- .../dev/galasa/cicsts/ICeciResponseOutputValue.java | 8 +++++--- .../src/main/java/dev/galasa/cicsts/ICeda.java | 6 +++--- .../src/main/java/dev/galasa/cicsts/ICemt.java | 2 ++ .../main/java/dev/galasa/cicsts/ICicsRegion.java | 8 +++++--- .../main/java/dev/galasa/cicsts/ICicsTerminal.java | 2 ++ .../java/dev/galasa/cicsts/IExecInterfaceBlock.java | 10 +++++----- .../src/main/java/dev/galasa/cicsts/MasType.java | 6 +++--- .../cicsresource/CicsBundleResourceException.java | 2 ++ .../CicsJvmprofileResourceException.java | 2 ++ .../CicsJvmserverResourceException.java | 2 ++ .../cicsresource/CicsResourceManagerException.java | 2 ++ .../cicsts/cicsresource/CicsResourceStatus.java | 8 +++++--- .../dev/galasa/cicsts/cicsresource/ICicsBundle.java | 8 +++++--- .../galasa/cicsts/cicsresource/ICicsResource.java | 8 +++++--- .../dev/galasa/cicsts/cicsresource/IJvmprofile.java | 8 +++++--- .../dev/galasa/cicsts/cicsresource/IJvmserver.java | 8 +++++--- .../galasa/cicsts/cicsresource/IJvmserverLog.java | 8 +++++--- .../cicsts/internal/CicstsDefaultLogonProvider.java | 6 +++--- .../galasa/cicsts/internal/CicstsManagerImpl.java | 8 +++++--- .../dev/galasa/cicsts/internal/dse/DseCicsImpl.java | 8 +++++--- .../cicsts/internal/dse/DseProvisioningImpl.java | 6 +++--- .../properties/CicstsPropertiesSingleton.java | 6 +++--- .../internal/properties/DefaultLogonGmText.java | 6 +++--- .../properties/DefaultLogonInitialText.java | 6 +++--- .../cicsts/internal/properties/DefaultVersion.java | 6 +++--- .../cicsts/internal/properties/DseApplid.java | 2 ++ .../cicsts/internal/properties/DseJavaHome.java | 6 +++--- .../internal/properties/DseJvmProfileDir.java | 6 +++--- .../cicsts/internal/properties/DseUssHome.java | 6 +++--- .../cicsts/internal/properties/DseVersion.java | 6 +++--- .../cicsts/internal/properties/ExtraBundles.java | 10 +++++----- .../cicsts/internal/properties/ProvisionType.java | 6 +++--- .../main/java/dev/galasa/cicsts/package-info.java | 10 +++++----- .../java/dev/galasa/cicsts/spi/BaseCicsImpl.java | 8 +++++--- .../dev/galasa/cicsts/spi/CicsTerminalImpl.java | 8 +++++--- .../java/dev/galasa/cicsts/spi/ICeciProvider.java | 6 +++--- .../java/dev/galasa/cicsts/spi/ICedaProvider.java | 6 +++--- .../java/dev/galasa/cicsts/spi/ICemtProvider.java | 6 +++--- .../galasa/cicsts/spi/ICicsRegionLogonProvider.java | 6 +++--- .../galasa/cicsts/spi/ICicsRegionProvisioned.java | 6 +++--- .../galasa/cicsts/spi/ICicsRegionProvisioner.java | 6 +++--- .../galasa/cicsts/spi/ICicsResourceProvider.java | 6 +++--- .../dev/galasa/cicsts/spi/ICicstsManagerSpi.java | 8 +++++--- .../test/java/dev/galasa/tests/SampleGalasaTst.java | 6 +++--- .../test/java/dev/galasa/tests/TestGoldenPath.java | 8 +++++--- .../cicsts/resource/internal/CicsBundleImpl.java | 8 +++++--- .../resource/internal/CicsBundleResourceType.java | 8 +++++--- .../cicsts/resource/internal/CicsResourceImpl.java | 8 +++++--- .../resource/internal/CicsResourceManagerImpl.java | 2 ++ .../cicsts/resource/internal/JvmprofileImpl.java | 8 +++++--- .../cicsts/resource/internal/JvmserverImpl.java | 8 +++++--- .../cicsts/resource/internal/JvmserverLogImpl.java | 8 +++++--- .../cicsts/resource/internal/package-info.java | 8 +++++--- .../CicstsResourcePropertiesSingleton.java | 2 ++ .../internal/properties/DefaultResourceTimeout.java | 8 +++++--- .../resource/spi/ICicsResourceManagerSpi.java | 2 ++ .../galasa/cicsts/resource/spi/package-info.java | 2 ++ .../main/java/dev/galasa/cloud/CloudContainer.java | 2 ++ .../dev/galasa/cloud/CloudContainerEnvProp.java | 2 ++ .../java/dev/galasa/cloud/CloudContainerPort.java | 2 ++ .../dev/galasa/cloud/CloudManagerException.java | 2 ++ .../java/dev/galasa/cloud/CloudManagerField.java | 2 ++ .../main/java/dev/galasa/cloud/ICloudContainer.java | 6 ++++-- .../cloud/internal/CloudContainerPortImpl.java | 4 +++- .../dev/galasa/cloud/internal/CloudManagerImpl.java | 4 +++- .../properties/CloudPropertiesSingleton.java | 6 ++++-- .../internal/properties/ContainerOverrideImage.java | 4 +++- .../properties/ContainerOverridePlatform.java | 4 +++- .../cloud/internal/properties/DefaultPlatform.java | 4 +++- .../dev/galasa/cloud/spi/ICloudContainerPort.java | 6 ++++-- .../galasa/cloud/spi/ICloudContainerProvider.java | 6 ++++-- .../java/dev/galasa/cloud/spi/ICloudManagerSpi.java | 6 ++++-- .../galasa/docker/manager/ivt/DockerManagerIVT.java | 6 ++++-- .../dev/galasa/docker/manager/ivt/IvtException.java | 6 +++--- .../java/dev/galasa/docker/DockerContainer.java | 2 ++ .../dev/galasa/docker/DockerContainerConfig.java | 2 ++ .../main/java/dev/galasa/docker/DockerEngine.java | 2 ++ .../dev/galasa/docker/DockerManagerException.java | 2 ++ .../dev/galasa/docker/DockerNotFoundException.java | 2 ++ .../dev/galasa/docker/DockerProvisionException.java | 2 ++ .../main/java/dev/galasa/docker/DockerVolume.java | 3 ++- .../java/dev/galasa/docker/IDockerContainer.java | 6 ++++-- .../dev/galasa/docker/IDockerContainerConfig.java | 2 ++ .../main/java/dev/galasa/docker/IDockerEngine.java | 2 ++ .../main/java/dev/galasa/docker/IDockerExec.java | 2 ++ .../main/java/dev/galasa/docker/IDockerImage.java | 2 ++ .../main/java/dev/galasa/docker/IDockerManager.java | 2 ++ .../main/java/dev/galasa/docker/IDockerVolume.java | 6 ++++-- .../docker/internal/DockerContainerConfigImpl.java | 2 ++ .../galasa/docker/internal/DockerContainerImpl.java | 6 ++++-- .../internal/DockerContainerResourceMonitor.java | 2 ++ .../galasa/docker/internal/DockerEngineImpl.java | 2 ++ .../galasa/docker/internal/DockerEnvironment.java | 6 ++++-- .../dev/galasa/docker/internal/DockerExecImpl.java | 6 ++++-- .../docker/internal/DockerImageBuilderImpl.java | 6 ++++-- .../dev/galasa/docker/internal/DockerImageImpl.java | 2 ++ .../galasa/docker/internal/DockerManagerField.java | 2 ++ .../galasa/docker/internal/DockerManagerImpl.java | 6 ++++-- .../galasa/docker/internal/DockerRegistryImpl.java | 2 ++ .../docker/internal/DockerResourceManagement.java | 2 ++ .../dev/galasa/docker/internal/DockerSlotImpl.java | 2 ++ .../docker/internal/DockerSlotResourceMonitor.java | 2 ++ .../galasa/docker/internal/DockerVolumeImpl.java | 6 ++++-- .../internal/DockerVolumeResourceMonitor.java | 2 ++ .../galasa/docker/internal/IDockerEnvironment.java | 6 ++++-- .../galasa/docker/internal/IDockerImageBuilder.java | 6 ++++-- .../docker/internal/json/DockerContainerJSON.java | 2 ++ .../docker/internal/json/DockerContainerLabels.java | 2 ++ .../docker/internal/properties/DockerDSEEngine.java | 2 ++ .../docker/internal/properties/DockerEngine.java | 2 ++ .../internal/properties/DockerEnginePort.java | 2 ++ .../docker/internal/properties/DockerEngines.java | 2 ++ .../internal/properties/DockerImagePrefix.java | 2 ++ .../internal/properties/DockerLeaveRunning.java | 6 ++++-- .../properties/DockerPropertiesSingleton.java | 2 ++ .../docker/internal/properties/DockerRegistry.java | 2 ++ .../properties/DockerRegistryCredentials.java | 2 ++ .../internal/properties/DockerRegistryURL.java | 2 ++ .../docker/internal/properties/DockerSlots.java | 2 ++ .../main/java/dev/galasa/docker/package-info.java | 2 ++ .../dev/galasa/docker/spi/IDockerManagerSpi.java | 2 ++ .../docker/internal/TestDockerRegistryImpl.java | 6 ++++-- .../galasa/kubernetes/manager/ivt/IvtException.java | 6 +++--- .../manager/ivt/KubernetesManagerIVT.java | 6 +++--- .../src/main/resources/testConfigMap.yaml | 5 +++++ .../src/main/resources/testDeployment.yaml | 5 +++++ .../src/main/resources/testPvc.yaml | 5 +++++ .../src/main/resources/testSecret.yaml | 5 +++++ .../src/main/resources/testService.yaml | 5 +++++ .../src/main/resources/testStatefulSet.yaml | 5 +++++ .../examples/namespaces.yaml | 7 ++++++- .../examples/rbac.yaml | 5 +++++ .../main/java/dev/galasa/kubernetes/IConfigMap.java | 6 +++--- .../java/dev/galasa/kubernetes/IDeployment.java | 6 +++--- .../dev/galasa/kubernetes/IKubernetesNamespace.java | 6 +++--- .../galasa/kubernetes/IPersistentVolumeClaim.java | 6 +++--- .../main/java/dev/galasa/kubernetes/IPodLog.java | 6 +++--- .../java/dev/galasa/kubernetes/IReplicaSet.java | 6 +++--- .../main/java/dev/galasa/kubernetes/IResource.java | 6 +++--- .../main/java/dev/galasa/kubernetes/ISecret.java | 6 +++--- .../main/java/dev/galasa/kubernetes/IService.java | 6 +++--- .../java/dev/galasa/kubernetes/IStatefulSet.java | 6 +++--- .../kubernetes/KubernetesManagerException.java | 6 +++--- .../dev/galasa/kubernetes/KubernetesNamespace.java | 6 +++--- .../kubernetes/internal/KubernetesClusterImpl.java | 2 ++ .../kubernetes/internal/KubernetesManagerField.java | 6 +++--- .../kubernetes/internal/KubernetesManagerImpl.java | 2 ++ .../internal/KubernetesNamespaceImpl.java | 2 ++ .../KubernetesNamespaceResourceMonitor.java | 6 +++--- .../internal/KubernetesResourceManagement.java | 6 +++--- .../internal/properties/KubernetesClusters.java | 6 +++--- .../internal/properties/KubernetesCredentials.java | 6 +++--- .../internal/properties/KubernetesMaxSlots.java | 6 +++--- .../KubernetesNamespaceTagSharedEnvironment.java | 6 +++--- .../internal/properties/KubernetesNamespaces.java | 6 +++--- .../properties/KubernetesNodePortProxy.java | 6 +++--- .../properties/KubernetesPropertiesSingleton.java | 6 +++--- .../internal/properties/KubernetesStorageClass.java | 6 +++--- .../internal/properties/KubernetesUrl.java | 6 +++--- .../properties/KubernetesValidateCertificate.java | 6 +++--- .../internal/resources/ConfigMapImpl.java | 6 +++--- .../internal/resources/DeploymentImpl.java | 6 +++--- .../resources/PersistentVolumeClaimImpl.java | 6 +++--- .../kubernetes/internal/resources/PodLogImpl.java | 6 +++--- .../internal/resources/ReplicaSetHolder.java | 2 ++ .../kubernetes/internal/resources/SecretImpl.java | 6 +++--- .../kubernetes/internal/resources/ServiceImpl.java | 6 +++--- .../internal/resources/StatefulSetImpl.java | 2 ++ .../kubernetes/internal/resources/Utility.java | 6 +++--- .../java/dev/galasa/kubernetes/package-info.java | 5 +++++ .../kubernetes/spi/IKubernetesManagerSpi.java | 6 +++--- .../java/dev/galasa/liberty/ILibertyServer.java | 10 +++++----- .../java/dev/galasa/liberty/ILibertyServerXml.java | 10 +++++----- .../dev/galasa/liberty/LibertyManagerException.java | 6 +++--- .../dev/galasa/liberty/LibertyServerException.java | 6 +++--- .../main/java/dev/galasa/liberty/package-info.java | 10 +++++----- .../dev/galasa/liberty/spi/ILibertyServerSpi.java | 10 +++++----- .../java/dev/galasa/liberty/spi/package-info.java | 10 +++++----- .../manager/OpenstackLinuxManagerException.java | 5 +++++ .../manager/OpenstackManagerException.java | 6 +++--- .../manager/OpenstackWindowsManagerException.java | 5 +++++ .../manager/internal/FloatingIpResourceMonitor.java | 6 +++--- .../manager/internal/OpenstackHttpClient.java | 6 ++++-- .../openstack/manager/internal/OpenstackIpHost.java | 6 +++--- .../manager/internal/OpenstackLinuxImageImpl.java | 6 ++++-- .../manager/internal/OpenstackManagerImpl.java | 4 +++- .../internal/OpenstackResourceManagement.java | 6 +++--- .../manager/internal/OpenstackServerImpl.java | 6 ++++-- .../openstack/manager/internal/OpenstackToken.java | 6 +++--- .../OpenstackUsernamePasswordCredentials.java | 6 +++--- .../manager/internal/OpenstackWindowsImageImpl.java | 6 ++++-- .../manager/internal/ServerResourceMonitor.java | 6 +++--- .../galasa/openstack/manager/internal/json/Api.java | 6 +++--- .../openstack/manager/internal/json/Auth.java | 6 +++--- .../manager/internal/json/AuthTokenResponse.java | 6 +++--- .../openstack/manager/internal/json/AuthTokens.java | 6 +++--- .../manager/internal/json/DnsAssignment.java | 6 +++--- .../openstack/manager/internal/json/Domain.java | 6 +++--- .../openstack/manager/internal/json/Endpoint.java | 6 +++--- .../openstack/manager/internal/json/Flavor.java | 6 +++--- .../openstack/manager/internal/json/Flavors.java | 6 +++--- .../openstack/manager/internal/json/Floatingip.java | 6 +++--- .../internal/json/FloatingipRequestResponse.java | 6 +++--- .../manager/internal/json/Floatingips.java | 6 +++--- .../manager/internal/json/GalasaMetadata.java | 6 +++--- .../openstack/manager/internal/json/Identity.java | 6 +++--- .../openstack/manager/internal/json/Image.java | 6 +++--- .../openstack/manager/internal/json/Images.java | 6 +++--- .../openstack/manager/internal/json/Network.java | 6 +++--- .../openstack/manager/internal/json/Networks.java | 6 +++--- .../openstack/manager/internal/json/Password.java | 6 +++--- .../openstack/manager/internal/json/Port.java | 6 +++--- .../manager/internal/json/PortsResponse.java | 6 +++--- .../openstack/manager/internal/json/Project.java | 6 +++--- .../openstack/manager/internal/json/Scope.java | 6 +++--- .../manager/internal/json/SecurityGroup.java | 6 +++--- .../openstack/manager/internal/json/Server.java | 6 +++--- .../manager/internal/json/ServerRequest.java | 6 +++--- .../manager/internal/json/ServerResponse.java | 6 +++--- .../manager/internal/json/ServersResponse.java | 6 +++--- .../openstack/manager/internal/json/Token.java | 6 +++--- .../openstack/manager/internal/json/User.java | 6 +++--- .../manager/internal/json/package-info.java | 5 +++++ .../openstack/manager/internal/package-info.java | 5 +++++ .../manager/internal/properties/BuildTimeout.java | 6 +++--- .../internal/properties/LinuxArchivesDirectory.java | 2 ++ .../internal/properties/LinuxAvailablityZone.java | 6 +++--- .../internal/properties/LinuxCredentials.java | 6 +++--- .../manager/internal/properties/LinuxFlavor.java | 6 +++--- .../internal/properties/LinuxImageCapabilities.java | 6 +++--- .../manager/internal/properties/LinuxImages.java | 6 +++--- .../manager/internal/properties/LinuxKeyPair.java | 6 +++--- .../manager/internal/properties/LinuxName.java | 6 +++--- .../internal/properties/LinuxSecurityGroups.java | 6 +++--- .../internal/properties/MaximumInstances.java | 6 +++--- .../manager/internal/properties/NamePool.java | 6 +++--- .../internal/properties/OpenStackCredentialsId.java | 6 +++--- .../internal/properties/OpenStackDomainName.java | 6 +++--- .../internal/properties/OpenStackEnabled.java | 2 ++ .../internal/properties/OpenStackIdentityUri.java | 6 +++--- .../internal/properties/OpenStackLinuxPriority.java | 2 ++ .../internal/properties/OpenStackProjectName.java | 6 +++--- .../properties/OpenstackPropertiesSingleton.java | 6 +++--- .../internal/properties/WindowsAvailablityZone.java | 6 +++--- .../internal/properties/WindowsCredentials.java | 6 +++--- .../manager/internal/properties/WindowsFlavor.java | 6 +++--- .../properties/WindowsImageCapabilities.java | 6 +++--- .../manager/internal/properties/WindowsImages.java | 6 +++--- .../manager/internal/properties/WindowsKeyPair.java | 6 +++--- .../manager/internal/properties/WindowsName.java | 6 +++--- .../internal/properties/WindowsSecurityGroups.java | 6 +++--- .../manager/internal/properties/package-info.java | 5 +++++ .../dev/galasa/openstack/manager/package-info.java | 6 +++--- .../galasa/common/SSLTLSContextNameSelector.java | 2 ++ .../common/SSLTLSContextNameSelectorTest.java | 2 ++ .../dev/galasa/http/manager/ivt/HttpManagerIVT.java | 5 +++++ .../src/main/java/dev/galasa/http/ContentType.java | 6 +++--- .../src/main/java/dev/galasa/http/HttpClient.java | 6 +++--- .../java/dev/galasa/http/HttpClientException.java | 6 +++--- .../java/dev/galasa/http/HttpClientResponse.java | 6 +++--- .../src/main/java/dev/galasa/http/IHttpClient.java | 6 +++--- .../src/main/java/dev/galasa/http/IHttpManager.java | 6 +++--- .../java/dev/galasa/http/StandAloneHttpClient.java | 6 ++++++ .../http/internal/ClientAuthTrustManager.java | 6 +++--- .../dev/galasa/http/internal/HttpClientImpl.java | 2 ++ .../dev/galasa/http/internal/HttpClientRequest.java | 6 +++--- .../dev/galasa/http/internal/HttpManagerField.java | 6 +++--- .../dev/galasa/http/internal/HttpManagerImpl.java | 6 +++--- .../java/dev/galasa/http/internal/RequestPart.java | 6 +++--- .../http/internal/VeryTrustingTrustManager.java | 6 +++--- .../src/main/java/dev/galasa/http/package-info.java | 6 +++--- .../java/dev/galasa/http/spi/IHttpManagerSpi.java | 6 +++--- .../test/force/codecoverage/ExceptionsTest.java | 6 +++--- .../java/dev/galasa/ipnetwork/ICommandShell.java | 2 ++ .../java/dev/galasa/ipnetwork/IFileProcessor.java | 6 +++--- .../src/main/java/dev/galasa/ipnetwork/IIpHost.java | 6 +++--- .../src/main/java/dev/galasa/ipnetwork/IIpPort.java | 6 +++--- .../galasa/ipnetwork/IpNetworkManagerException.java | 6 +++--- .../dev/galasa/ipnetwork/SSHAuthFailException.java | 6 +++--- .../java/dev/galasa/ipnetwork/SSHException.java | 6 +++--- .../ipnetwork/internal/IpNetworkManagerImpl.java | 2 ++ .../internal/IpNetworkResourceManagement.java | 6 +++--- .../dev/galasa/ipnetwork/internal/IpPortImpl.java | 6 +++--- .../ipnetwork/internal/PortResourceMonitor.java | 6 +++--- .../internal/ssh/filesystem/SSHBasicAttributes.java | 6 +++--- .../ssh/filesystem/SSHBasicAttributesView.java | 6 +++--- .../internal/ssh/filesystem/SSHByteChannel.java | 6 +++--- .../internal/ssh/filesystem/SSHDirectoryStream.java | 6 +++--- .../internal/ssh/filesystem/SSHFileStore.java | 6 +++--- .../internal/ssh/filesystem/SSHFileSystem.java | 6 +++--- .../ssh/filesystem/SSHFileSystemProvider.java | 6 +++--- .../ipnetwork/internal/ssh/filesystem/SSHPath.java | 6 +++--- .../java/dev/galasa/ipnetwork/package-info.java | 6 +++--- .../galasa/ipnetwork/spi/AbstractGenericIpHost.java | 6 ++++-- .../galasa/ipnetwork/spi/AnsiEscapeSequences.java | 6 +++--- .../java/dev/galasa/ipnetwork/spi/IIpHostSpi.java | 6 +++--- .../galasa/ipnetwork/spi/IIpNetworkManagerSpi.java | 2 ++ .../java/dev/galasa/ipnetwork/spi/SSHClient.java | 2 ++ .../dev/galasa/mq/manager/ivt/MqManagerIVT.java | 2 ++ .../src/main/java/dev/galasa/mq/IMessageQueue.java | 2 ++ .../java/dev/galasa/mq/IMessageQueueManager.java | 2 ++ .../main/java/dev/galasa/mq/MqManagerException.java | 2 ++ .../src/main/java/dev/galasa/mq/MqManagerField.java | 2 ++ .../src/main/java/dev/galasa/mq/Queue.java | 2 ++ .../src/main/java/dev/galasa/mq/QueueManager.java | 2 ++ .../java/dev/galasa/mq/internal/MQManagerImpl.java | 2 ++ .../dev/galasa/mq/internal/MessageDirection.java | 2 ++ .../dev/galasa/mq/internal/MessageQueueImpl.java | 2 ++ .../galasa/mq/internal/MessageQueueManagerImpl.java | 2 ++ .../mq/internal/properties/InstanceChannelName.java | 2 ++ .../mq/internal/properties/InstanceCredentials.java | 2 ++ .../mq/internal/properties/InstanceForTag.java | 2 ++ .../galasa/mq/internal/properties/InstanceHost.java | 2 ++ .../galasa/mq/internal/properties/InstanceName.java | 2 ++ .../galasa/mq/internal/properties/InstancePort.java | 2 ++ .../internal/properties/MqPropertiesSingleton.java | 2 ++ .../mq/internal/properties/QueueNameForTag.java | 2 ++ .../src/main/java/dev/galasa/mq/package-info.java | 2 ++ .../artifact/manager/ivt/ArtifactManagerIVT.java | 2 ++ .../java/dev/galasa/artifact/ArtifactManager.java | 2 ++ .../dev/galasa/artifact/ArtifactManagerField.java | 2 ++ .../java/dev/galasa/artifact/BundleResources.java | 2 ++ .../java/dev/galasa/artifact/IArtifactManager.java | 2 ++ .../java/dev/galasa/artifact/IBundleResources.java | 2 ++ .../dev/galasa/artifact/ISkeletonProcessor.java | 2 ++ .../galasa/artifact/OutputRepositoryException.java | 2 ++ .../galasa/artifact/SkeletonProcessorException.java | 2 ++ .../artifact/TestBundleResourceException.java | 2 ++ .../artifact/internal/ArtifactManagerImpl.java | 2 ++ .../artifact/internal/BundleResourcesImpl.java | 2 ++ .../internal/PlusPlusSkeletonProcessor.java | 2 ++ .../internal/VelocitySkeletonProcessor.java | 2 ++ .../main/java/dev/galasa/artifact/package-info.java | 2 ++ .../java/dev/galasa/artifact/manager/DummyTest.java | 5 +++++ .../dev/galasa/core/manager/ivt/CoreManagerIVT.java | 6 +++--- .../java/dev/galasa/framework/ivt/BasicTest.java | 6 +++--- .../dev/galasa/framework/ivt/BasicTestExtended.java | 6 +++--- .../framework/ivt/BasicTestExtendedAgain.java | 6 +++--- .../dev/galasa/framework/ivt/BasicTestFail.java | 6 +++--- .../java/dev/galasa/core/manager/CoreManager.java | 6 ++++-- .../galasa/core/manager/CoreManagerException.java | 6 +++--- .../dev/galasa/core/manager/CoreManagerField.java | 6 ++++-- .../java/dev/galasa/core/manager/ICoreManager.java | 6 ++++-- .../dev/galasa/core/manager/IResourceString.java | 6 ++++-- .../main/java/dev/galasa/core/manager/Logger.java | 6 ++++-- .../dev/galasa/core/manager/ResourceString.java | 6 ++++-- .../main/java/dev/galasa/core/manager/RunName.java | 6 ++++-- .../dev/galasa/core/manager/StoredArtifactRoot.java | 6 ++++-- .../java/dev/galasa/core/manager/TestProperty.java | 6 ++++-- .../core/manager/internal/CoreManagerImpl.java | 6 ++++-- .../manager/internal/CorePropertiesSingleton.java | 6 ++++-- .../manager/internal/ResourceStringGenerator.java | 6 ++++-- .../core/manager/internal/ResourceStringImpl.java | 6 ++++-- .../internal/gherkin/CoreStatementOwner.java | 6 ++++-- .../galasa/core/manager/internal/package-info.java | 5 +++++ .../internal/properties/ResourceStringPattern.java | 4 +++- .../resourcemanagement/CoreResourceManagement.java | 2 ++ .../ResourceStringResourceManagement.java | 2 ++ .../testcatalog/CoreTestCatalogBuilder.java | 6 ++++-- .../java/dev/galasa/core/manager/package-info.java | 8 ++++---- .../core/manager/internal/CoreManagerTest.java | 6 ++++-- .../dev/galasa/textscan/CheckpointException.java | 6 +++--- .../dev/galasa/textscan/FailTextFoundException.java | 6 +++--- .../main/java/dev/galasa/textscan/ILogScanner.java | 10 +++++----- .../java/dev/galasa/textscan/ITextScannable.java | 6 +++--- .../main/java/dev/galasa/textscan/ITextScanner.java | 10 +++++----- .../textscan/IncorrectOccurrencesException.java | 6 +++--- .../main/java/dev/galasa/textscan/LogScanner.java | 2 ++ .../dev/galasa/textscan/MissingTextException.java | 6 +++--- .../java/dev/galasa/textscan/TextScanException.java | 6 +++--- .../galasa/textscan/TextScanManagerException.java | 6 +++--- .../dev/galasa/textscan/TextScanManagerField.java | 6 +++--- .../main/java/dev/galasa/textscan/TextScanner.java | 2 ++ .../textscan/internal/AbstractTextScannable.java | 10 +++++----- .../galasa/textscan/internal/LogScannerImpl.java | 2 ++ .../textscan/internal/TextScanManagerImpl.java | 10 +++++----- .../galasa/textscan/internal/TextScannerImpl.java | 10 +++++----- .../dev/galasa/textscan/internal/package-info.java | 10 +++++----- .../main/java/dev/galasa/textscan/package-info.java | 10 +++++----- .../galasa/textscan/spi/ITextScannerManagerSpi.java | 10 +++++----- .../java/dev/galasa/textscan/spi/package-info.java | 10 +++++----- .../java/dev/galasa/textscan/TestExceptions.java | 10 +++++----- .../galasa/textscan/internal/DummyInputStream.java | 10 +++++----- .../textscan/internal/DummyScannableEmpty.java | 6 +++--- .../internal/DummyScannableInputStream.java | 6 +++--- .../textscan/internal/DummyScannableString.java | 6 +++--- .../internal/TestAbstractTextScannable.java | 10 +++++----- .../textscan/internal/TestLogScannerImpl.java | 8 +++++--- .../textscan/internal/TestTextScanManagerImpl.java | 8 +++++--- .../TestTextScannerImplInputStreamLargeFile.java | 6 +++--- .../TestTextScannerImplInputStreamScan.java | 6 +++--- .../TestTextScannerImplInputStreamScanForMatch.java | 6 +++--- ...TestTextScannerImplMultilineInterleavedScan.java | 6 +++--- .../internal/TestTextScannerImplScannableScan.java | 6 +++--- .../TestTextScannerImplScannableScanForMatch.java | 6 +++--- .../internal/TestTextScannerImplStringScan.java | 6 +++--- .../TestTextScannerImplStringScanForMach.java | 6 +++--- .../dev/galasa/db2/manager/ivt/Db2ManagerIVT.java | 2 ++ .../src/main/java/dev/galasa/db2/Db2Instance.java | 2 ++ .../java/dev/galasa/db2/Db2ManagerException.java | 2 ++ .../main/java/dev/galasa/db2/Db2ManagerField.java | 2 ++ .../src/main/java/dev/galasa/db2/Db2Schema.java | 2 ++ .../src/main/java/dev/galasa/db2/IDb2Instance.java | 2 ++ .../src/main/java/dev/galasa/db2/IDb2Schema.java | 2 ++ .../src/main/java/dev/galasa/db2/IResultMap.java | 4 +++- .../dev/galasa/db2/internal/Db2InstanceImpl.java | 2 ++ .../dev/galasa/db2/internal/Db2ManagerImpl.java | 2 ++ .../java/dev/galasa/db2/internal/Db2SchemaImpl.java | 2 ++ .../java/dev/galasa/db2/internal/ResultMap.java | 2 ++ .../db2/internal/properties/Db2Credentials.java | 2 ++ .../db2/internal/properties/Db2DSEInstanceName.java | 2 ++ .../db2/internal/properties/Db2DSESchemaName.java | 2 ++ .../db2/internal/properties/Db2InstanceUrl.java | 2 ++ .../internal/properties/Db2PropertiesSingleton.java | 2 ++ .../java/dev/galasa/db2/spi/IDb2ManagerSpi.java | 2 ++ .../galasa/eclipseruntime/EclipseManagerField.java | 6 ++++-- .../java/dev/galasa/eclipseruntime/EclipseType.java | 7 ++++--- .../dev/galasa/eclipseruntime/EclipseVersion.java | 7 ++++--- .../dev/galasa/eclipseruntime/IEclipseInstall.java | 7 ++++--- .../eclipseruntime/ubuntu/EclipseInstallUbuntu.java | 7 ++++--- .../ubuntu/EclipseUbuntuManagerField.java | 7 ++++--- .../ubuntu/IEclipseInstallUbuntu.java | 7 ++++--- .../src/main/java/dev/galasa/sem/CSDInput.java | 6 ++++-- .../src/main/java/dev/galasa/sem/CSDInputs.java | 6 ++++-- .../src/main/java/dev/galasa/sem/DoNotBuild.java | 6 ++++-- .../main/java/dev/galasa/sem/DoNotStartCICS.java | 6 ++++-- .../java/dev/galasa/sem/SemManagerException.java | 6 ++++-- .../main/java/dev/galasa/sem/SemManagerField.java | 6 ++++-- .../src/main/java/dev/galasa/sem/SemTopology.java | 6 ++++-- .../src/main/java/dev/galasa/sem/Sit.java | 6 ++++-- .../src/main/java/dev/galasa/sem/Sits.java | 6 ++++-- .../dev/galasa/sem/internal/CsdInputGenerator.java | 6 ++++-- .../java/dev/galasa/sem/internal/SemCicsImpl.java | 6 ++++-- .../dev/galasa/sem/internal/SemManagerImpl.java | 6 ++++-- .../dev/galasa/sem/internal/SemPoolApplids.java | 6 ++++-- .../java/dev/galasa/sem/internal/SemPoolPorts.java | 6 ++++-- .../dev/galasa/sem/internal/SemPoolResolver.java | 6 ++++-- .../java/dev/galasa/sem/internal/SemZosHandler.java | 6 ++++-- .../java/dev/galasa/sem/internal/SitGenerator.java | 6 ++++-- .../galasa/sem/internal/properties/BaseModel.java | 6 ++++-- .../galasa/sem/internal/properties/CicsBuild.java | 6 ++++-- .../sem/internal/properties/ExternalVersion.java | 4 +++- .../sem/internal/properties/InteralVersion.java | 4 +++- .../sem/internal/properties/ModelApplids.java | 6 ++++-- .../galasa/sem/internal/properties/ModelPorts.java | 6 ++++-- .../galasa/sem/internal/properties/ModelUrl.java | 4 +++- .../internal/properties/SemPropertiesSingleton.java | 6 ++++-- .../resourcemanagement/ApplidResourceMonitor.java | 6 ++++-- .../resourcemanagement/PortResourceMonitor.java | 6 ++++-- .../resourcemanagement/SemResourceManagement.java | 6 ++++-- .../java/dev/galasa/java/IJavaInstallation.java | 6 +++--- .../java/dev/galasa/java/JavaManagerException.java | 6 +++--- .../main/java/dev/galasa/java/JavaManagerField.java | 6 +++--- .../src/main/java/dev/galasa/java/JavaType.java | 6 +++--- .../src/main/java/dev/galasa/java/JavaVersion.java | 6 +++--- .../dev/galasa/java/internal/JavaManagerImpl.java | 6 +++--- .../properties/CodeCoverageSaveCredentials.java | 6 +++--- .../properties/CodeCoverageSaveLocation.java | 6 +++--- .../java/internal/properties/DefaultVersion.java | 6 +++--- .../java/internal/properties/DownloadLocation.java | 6 +++--- .../internal/properties/JacocoAgentLocation.java | 6 +++--- .../properties/JavaPropertiesSingleton.java | 6 +++--- .../java/internal/properties/UseCodeCoverage.java | 6 +++--- .../java/dev/galasa/java/spi/IJavaManagerSpi.java | 6 +++--- .../dev/galasa/java/spi/JavaInstallationImpl.java | 6 +++--- .../galasa/java/ubuntu/IJavaUbuntuInstallation.java | 6 +++--- .../galasa/java/ubuntu/JavaUbuntuInstallation.java | 6 +++--- .../java/ubuntu/JavaUbuntuManagerException.java | 6 +++--- .../galasa/java/ubuntu/JavaUbuntuManagerField.java | 6 +++--- .../java/ubuntu/internal/JavaUbuntuManagerImpl.java | 2 ++ .../java/ubuntu/spi/IJavaUbuntuManagerSpi.java | 6 +++--- .../java/ubuntu/spi/JavaUbuntuInstallationImpl.java | 2 ++ .../java/windows/IJavaWindowsInstallation.java | 6 +++--- .../java/windows/JavaWindowsInstallation.java | 6 +++--- .../java/windows/JavaWindowsManagerException.java | 6 +++--- .../java/windows/JavaWindowsManagerField.java | 6 +++--- .../windows/internal/JavaWindowsManagerImpl.java | 6 +++--- .../java/windows/spi/IJavaWindowsManagerSpi.java | 6 +++--- .../windows/spi/JavaWindowsInstallationImpl.java | 6 +++--- .../manager/ivt/ElasticLogManagerIVT.java | 6 +++--- .../internal/ElasticLogManagerException.java | 6 +++--- .../elasticlog/internal/ElasticLogManagerImpl.java | 6 +++--- .../galasa/elasticlog/internal/package-info.java | 5 +++++ .../internal/properties/ElasticLogCredentials.java | 5 +++++ .../internal/properties/ElasticLogEndpoint.java | 6 +++--- .../internal/properties/ElasticLogIndex.java | 6 +++--- .../internal/properties/ElasticLogLocalRun.java | 6 +++--- .../properties/ElasticLogPropertiesSingleton.java | 6 +++--- .../phoenix2/internal/Phoenix2ManagerException.java | 6 +++--- .../phoenix2/internal/Phoenix2ManagerImpl.java | 6 +++--- .../internal/properties/Phoenix2Credentials.java | 6 +++--- .../properties/Phoenix2DefaultBuildLevel.java | 6 +++--- .../properties/Phoenix2DefaultCustomBuild.java | 6 +++--- .../properties/Phoenix2DefaultProductRelease.java | 6 +++--- .../Phoenix2DefaultTestingEnvironment.java | 6 +++--- .../internal/properties/Phoenix2Enabled.java | 6 +++--- .../internal/properties/Phoenix2Endpoint.java | 6 +++--- .../internal/properties/Phoenix2LocalRun.java | 6 +++--- .../properties/Phoenix2PropertiesSingleton.java | 6 +++--- .../galasaecosystem/manager/ivt/EcosystemTest.java | 6 +++--- .../galasa/galasaecosystem/EcosystemEndpoint.java | 6 +++--- .../GalasaEcosystemManagerException.java | 6 +++--- .../GalasaEcosystemManagerField.java | 6 +++--- .../galasa/galasaecosystem/IGenericEcosystem.java | 2 ++ .../galasaecosystem/IKubernetesEcosystem.java | 6 +++--- .../dev/galasa/galasaecosystem/ILocalEcosystem.java | 4 +++- .../galasaecosystem/IsolationInstallation.java | 5 +++++ .../galasa/galasaecosystem/KubernetesEcosystem.java | 6 +++--- .../dev/galasa/galasaecosystem/LocalEcosystem.java | 6 +++--- .../internal/AbstractEcosystemImpl.java | 4 +++- .../internal/GalasaEcosystemManagerImpl.java | 6 ++++-- .../internal/IInternalEcosystem.java | 5 +++++ .../internal/KubernetesEcosystemImpl.java | 4 +++- .../internal/LocalEcosystemImpl.java | 6 ++++-- .../internal/LocalLinuxEcosystemImpl.java | 6 ++++-- .../galasa/galasaecosystem/internal/LocalRun.java | 6 +++--- .../internal/LocalWindowsEcosystemImpl.java | 6 ++++-- .../galasaecosystem/internal/RunIdPrefixImpl.java | 6 ++++-- .../internal/SimPlatformInstance.java | 5 +++++ .../internal/properties/CentralRepo.java | 6 +++--- .../internal/properties/DockerRegistry.java | 6 +++--- .../internal/properties/DockerVersion.java | 6 +++--- .../internal/properties/GalasaBootVersion.java | 6 +++--- .../GalasaEcosystemPropertiesSingleton.java | 6 +++--- .../internal/properties/IsolatedFullZip.java | 6 +++--- .../internal/properties/IsolatedMvpZip.java | 6 +++--- .../KubernetesEcosystemTagSharedEnvironment.java | 6 +++--- .../properties/MavenUseDefaultLocalRepository.java | 6 +++--- .../internal/properties/RunIdPrefix.java | 6 ++++-- .../internal/properties/RuntimeRepo.java | 6 +++--- .../internal/properties/RuntimeVersion.java | 6 +++--- .../internal/properties/SimBankTestsVersion.java | 6 +++--- .../properties/SimplatformDockerVersion.java | 6 +++--- .../internal/properties/SimplatformRepo.java | 6 +++--- .../internal/properties/SimplatformVersion.java | 6 +++--- .../GalasaEcosystemResourceManagement.java | 6 ++++-- .../resourcemanagement/RunIdPrefixMonitor.java | 6 ++++-- .../resourcemanagement/RunResourceMonitor.java | 6 ++++-- .../dev/galasa/galasaecosystem/package-info.java | 5 +++++ .../src/main/resources/k8s/bootstrap-file.yaml | 5 +++++ .../src/main/resources/k8s/config-grafana.yaml | 5 +++++ .../src/main/resources/k8s/config-prometheus.yaml | 5 +++++ .../src/main/resources/k8s/config.yaml | 4 +++- .../src/main/resources/k8s/expose-simbank.yaml | 5 +++++ .../src/main/resources/k8s/expose-testing.yaml | 5 +++++ .../src/main/resources/k8s/expose.yaml | 5 +++++ .../src/main/resources/k8s/pvc-api.yaml | 5 +++++ .../src/main/resources/k8s/pvc-grafana.yaml | 5 +++++ .../src/main/resources/k8s/pvc-prometheus.yaml | 5 +++++ .../src/main/resources/k8s/server-api.yaml | 5 ++++- .../src/main/resources/k8s/server-cps-etcd3.yaml | 5 ++++- .../resources/k8s/server-engine-controller.yaml | 5 ++++- .../src/main/resources/k8s/server-grafana.yaml | 5 ++++- .../src/main/resources/k8s/server-metrics.yaml | 5 ++++- .../src/main/resources/k8s/server-prometheus.yaml | 5 ++++- .../src/main/resources/k8s/server-ras-couchdb.yaml | 5 ++++- .../main/resources/k8s/server-resource-monitor.yaml | 7 ++++++- .../src/main/resources/k8s/server-simbank.yaml | 5 +++++ .../src/main/resources/k8s/testcatalog-file.yaml | 5 +++++ .../galasa/jmeter/manager/ivt/JMeterManagerIVT.java | 13 ++++++------- .../main/java/dev/galasa/jmeter/IJMeterSession.java | 6 +++--- .../dev/galasa/jmeter/JMeterManagerException.java | 6 +++--- .../java/dev/galasa/jmeter/JMeterManagerField.java | 6 +++--- .../main/java/dev/galasa/jmeter/JMeterSession.java | 6 +++--- .../galasa/jmeter/internal/JMeterManagerImpl.java | 2 ++ .../galasa/jmeter/internal/JMeterSessionImpl.java | 3 ++- .../main/java/dev/galasa/jmeter/package-info.java | 6 +++--- .../selenium/manager/ivt/SeleniumManagerIVT.java | 2 ++ .../src/main/java/dev/galasa/selenium/Browser.java | 6 ++++-- .../java/dev/galasa/selenium/IChromeOptions.java | 6 ++++-- .../main/java/dev/galasa/selenium/IEdgeOptions.java | 6 ++++-- .../java/dev/galasa/selenium/IFirefoxOptions.java | 6 ++++-- .../galasa/selenium/IInternetExplorerOptions.java | 6 ++++-- .../java/dev/galasa/selenium/IOperaOptions.java | 2 ++ .../java/dev/galasa/selenium/ISeleniumManager.java | 6 ++++-- .../main/java/dev/galasa/selenium/IWebDriver.java | 6 ++++-- .../src/main/java/dev/galasa/selenium/IWebPage.java | 6 ++++-- .../java/dev/galasa/selenium/SeleniumManager.java | 6 ++++-- .../galasa/selenium/SeleniumManagerException.java | 6 ++++-- .../dev/galasa/selenium/SeleniumManagerField.java | 6 ++++-- .../main/java/dev/galasa/selenium/WebDriver.java | 6 ++++-- .../galasa/selenium/internal/ChromeOptionsImpl.java | 2 ++ .../dev/galasa/selenium/internal/DriverImpl.java | 2 ++ .../galasa/selenium/internal/EdgeOptionsImpl.java | 2 ++ .../selenium/internal/FirefoxOptionsImpl.java | 2 ++ .../internal/InternetExplorerOptionsImpl.java | 2 ++ .../dev/galasa/selenium/internal/LocalBrowser.java | 6 +++--- .../galasa/selenium/internal/LocalDriverImpl.java | 2 ++ .../galasa/selenium/internal/OperaOptionsImpl.java | 2 ++ .../galasa/selenium/internal/RemoteDriverImpl.java | 2 ++ .../selenium/internal/SeleniumEnvironment.java | 2 ++ .../internal/SeleniumGridSessionMonitor.java | 6 +++--- .../selenium/internal/SeleniumManagerImpl.java | 2 ++ .../internal/SeleniumResourceManagement.java | 6 +++--- .../internal/SeleniumSlotResourceMonitor.java | 6 +++--- .../dev/galasa/selenium/internal/WebPageImpl.java | 2 ++ .../properties/SeleniumAvailableDrivers.java | 6 +++--- .../internal/properties/SeleniumDefaultDriver.java | 6 +++--- .../properties/SeleniumDockerNodeVersion.java | 6 +++--- .../internal/properties/SeleniumDriverMaxSlots.java | 6 +++--- .../properties/SeleniumGeckoPreferences.java | 6 +++--- .../internal/properties/SeleniumGeckoProfile.java | 6 +++--- .../internal/properties/SeleniumGridEndpoint.java | 6 +++--- .../properties/SeleniumKubernetesNamespace.java | 6 +++--- .../properties/SeleniumKubernetesNodeSelector.java | 6 +++--- .../properties/SeleniumLocalDriverPath.java | 6 +++--- .../properties/SeleniumPropertiesSingleton.java | 6 +++--- .../properties/SeleniumScreenshotFailure.java | 6 +++--- .../internal/properties/SeleniumWebDriverType.java | 6 +++--- .../main/java/dev/galasa/selenium/package-info.java | 6 ++++-- .../galasa/selenium/spi/ISeleniumManagerSpi.java | 6 +++--- .../main/resources/selenium-node-deployment.yaml | 5 +++++ .../src/main/resources/selenium-node-expose.yaml | 5 +++++ .../src/main/resources/selenium-node-pod.yaml | 5 +++++ .../dev/galasa/vtp/manager/ivt/VtpManagerIVT.java | 3 ++- .../galasa/vtp/internal/properties/DataSetHLQ.java | 2 ++ .../internal/properties/TransactionNamesForTag.java | 2 ++ .../dev/galasa/vtp/internal/properties/VtpAPI.java | 2 ++ .../galasa/vtp/internal/properties/VtpEnable.java | 2 ++ .../internal/properties/VtpPropertiesSingleton.java | 2 ++ .../dev/galasa/vtp/manager/VtpManagerException.java | 2 ++ .../galasa/vtp/manager/internal/RecordingData.java | 2 ++ .../vtp/manager/internal/VtpApiRecorderImp.java | 2 ++ .../galasa/vtp/manager/internal/VtpManagerImpl.java | 2 ++ .../vtp/manager/internal/VtpRecorderImpl.java | 2 ++ .../vtp/manager/internal/VtpTxnRecorderImpl.java | 2 ++ .../galasa/linux/manager/ivt/LinuxManagerIVT.java | 6 +++--- .../src/main/java/dev/galasa/linux/ILinuxImage.java | 2 ++ .../main/java/dev/galasa/linux/ILinuxManager.java | 6 +++--- .../src/main/java/dev/galasa/linux/LinuxImage.java | 6 +++--- .../src/main/java/dev/galasa/linux/LinuxIpHost.java | 6 +++--- .../dev/galasa/linux/LinuxManagerException.java | 6 +++--- .../java/dev/galasa/linux/LinuxManagerField.java | 6 +++--- .../main/java/dev/galasa/linux/OperatingSystem.java | 6 +++--- .../dev/galasa/linux/internal/LinuxManagerImpl.java | 6 ++++-- .../dev/galasa/linux/internal/LinuxProperties.java | 6 +++--- .../galasa/linux/internal/dse/LinuxDSEImage.java | 2 ++ .../galasa/linux/internal/dse/LinuxDSEIpHost.java | 6 ++++-- .../linux/internal/dse/LinuxDSEProvisioner.java | 6 ++++-- .../internal/properties/LinuxArchivesDirectory.java | 2 ++ .../internal/properties/LinuxCapabilities.java | 2 ++ .../internal/properties/LinuxOperatingSystem.java | 2 ++ .../properties/LinuxPropertiesSingleton.java | 6 +++--- .../linux/internal/properties/MaximumSlots.java | 2 ++ .../internal/properties/RetainRunDirectory.java | 6 +++--- .../internal/properties/SharedLinuxImages.java | 2 ++ .../internal/properties/SharedLinuxPriority.java | 2 ++ .../linux/internal/properties/UsernamePool.java | 2 ++ .../linux/internal/properties/package-info.java | 5 +++++ .../resourcemanagement/LinuxResourceManagement.java | 2 ++ .../resourcemanagement/SlotResourceManagement.java | 2 ++ .../UsernameResourceManagement.java | 2 ++ .../linux/internal/shared/LinuxSharedImage.java | 2 ++ .../linux/internal/shared/LinuxSharedIpHost.java | 2 ++ .../internal/shared/LinuxSharedProvisioner.java | 2 ++ .../main/java/dev/galasa/linux/package-info.java | 6 +++--- .../java/dev/galasa/linux/spi/ILinuxManagerSpi.java | 6 +++--- .../galasa/linux/spi/ILinuxProvisionedImage.java | 6 +++--- .../dev/galasa/linux/spi/ILinuxProvisioner.java | 2 ++ .../main/java/dev/galasa/windows/IWindowsImage.java | 6 +++--- .../java/dev/galasa/windows/IWindowsManager.java | 6 +++--- .../main/java/dev/galasa/windows/WindowsImage.java | 6 +++--- .../main/java/dev/galasa/windows/WindowsIpHost.java | 6 +++--- .../dev/galasa/windows/WindowsManagerException.java | 6 +++--- .../dev/galasa/windows/WindowsManagerField.java | 6 +++--- .../galasa/windows/internal/WindowsDSEImage.java | 6 +++--- .../galasa/windows/internal/WindowsDSEIpHost.java | 6 +++--- .../windows/internal/WindowsDSEProvisioner.java | 6 +++--- .../windows/internal/WindowsDefaultProvisioner.java | 6 +++--- .../galasa/windows/internal/WindowsManagerImpl.java | 6 +++--- .../galasa/windows/internal/WindowsProperties.java | 6 +++--- .../internal/properties/RetainRunDirectory.java | 6 +++--- .../properties/WindowsPropertiesSingleton.java | 6 +++--- .../dev/galasa/windows/spi/IWindowsManagerSpi.java | 6 +++--- .../windows/spi/IWindowsProvisionedImage.java | 6 +++--- .../dev/galasa/windows/spi/IWindowsProvisioner.java | 6 +++--- .../java/dev/galasa/githubissue/GitHubIssue.java | 2 ++ .../githubissue/GitHubIssueManagerException.java | 2 ++ .../src/main/java/dev/galasa/githubissue/Issue.java | 2 ++ .../internal/GitHubIssueManagerImpl.java | 2 ++ .../internal/properties/GitHubCredentials.java | 2 ++ .../properties/GitHubIssueInstanceRepository.java | 2 ++ .../internal/properties/GitHubIssueInstanceUrl.java | 2 ++ .../properties/GitHubIssuePropertiesSingleton.java | 2 ++ .../galasa/zos/manager/ivt/ZosManagerBatchIVT.java | 2 ++ .../zos/manager/ivt/ZosManagerFileDatasetIVT.java | 3 ++- .../galasa/zos/manager/ivt/ZosManagerFileIVT.java | 10 +++++----- .../zos/manager/ivt/ZosManagerFileVSAMIVT.java | 2 ++ .../dev/galasa/zos/manager/ivt/ZosManagerIVT.java | 6 +++--- .../zos/manager/ivt/ZosManagerTSOCommandIVT.java | 6 +++--- .../src/main/java/dev/galasa/zos/IZosImage.java | 8 +++++--- .../src/main/java/dev/galasa/zos/IZosManager.java | 6 +++--- .../src/main/java/dev/galasa/zos/ZosImage.java | 6 +++--- .../src/main/java/dev/galasa/zos/ZosIpHost.java | 6 +++--- .../src/main/java/dev/galasa/zos/ZosIpPort.java | 6 ++++-- .../java/dev/galasa/zos/ZosManagerException.java | 6 +++--- .../main/java/dev/galasa/zos/ZosManagerField.java | 6 +++--- .../galasa/zos/internal/SlotResourceMonitor.java | 6 +++--- .../dev/galasa/zos/internal/ZosBaseImageImpl.java | 8 +++++--- .../dev/galasa/zos/internal/ZosDseImageImpl.java | 6 +++--- .../java/dev/galasa/zos/internal/ZosIpHostImpl.java | 6 ++++-- .../java/dev/galasa/zos/internal/ZosIpPortImpl.java | 6 ++++-- .../dev/galasa/zos/internal/ZosManagerImpl.java | 8 +++++--- .../java/dev/galasa/zos/internal/ZosPoolPorts.java | 6 ++++-- .../galasa/zos/internal/ZosPortResourceMonitor.java | 6 ++++-- .../zos/internal/ZosProvisionedImageImpl.java | 6 +++--- .../galasa/zos/internal/ZosResourceManagement.java | 6 ++++-- .../dev/galasa/zos/internal/metrics/ZosMetrics.java | 6 +++--- .../zos/internal/properties/BatchExtraBundle.java | 6 +++--- .../zos/internal/properties/ClusterIdForTag.java | 6 +++--- .../zos/internal/properties/ClusterImages.java | 6 +++--- .../zos/internal/properties/ConsoleExtraBundle.java | 6 +++--- .../zos/internal/properties/DseClusterIdForTag.java | 6 +++--- .../zos/internal/properties/DseImageIdForTag.java | 6 +++--- .../zos/internal/properties/FileExtraBundle.java | 6 +++--- .../dev/galasa/zos/internal/properties/HostId.java | 6 +++--- .../zos/internal/properties/ImageCodePage.java | 2 ++ .../zos/internal/properties/ImageIdForTag.java | 6 +++--- .../zos/internal/properties/ImageMaxSlots.java | 6 +++--- .../zos/internal/properties/ImageSysname.java | 10 +++++----- .../galasa/zos/internal/properties/JavaHome.java | 10 +++++----- .../zos/internal/properties/LibertyInstallDir.java | 10 +++++----- .../galasa/zos/internal/properties/PoolPorts.java | 6 ++++-- .../zos/internal/properties/RunDatasetHLQ.java | 6 +++--- .../zos/internal/properties/RunUNIXPathPrefix.java | 10 +++++----- .../internal/properties/TSOCommandExtraBundle.java | 6 +++--- .../internal/properties/UNIXCommandExtraBundle.java | 6 +++--- .../internal/properties/ZosConnectInstallDir.java | 10 +++++----- .../internal/properties/ZosPropertiesSingleton.java | 6 +++--- .../zos/internal/properties/package-info.java | 5 +++++ .../src/main/java/dev/galasa/zos/package-info.java | 6 +++--- .../java/dev/galasa/zos/spi/IZosManagerSpi.java | 8 +++++--- .../dev/galasa/zos/spi/ZosImageDependencyField.java | 6 +++--- .../main/java/dev/galasa/zosbatch/IZosBatch.java | 6 +++--- .../main/java/dev/galasa/zosbatch/IZosBatchJob.java | 8 +++++--- .../dev/galasa/zosbatch/IZosBatchJobOutput.java | 6 +++--- .../zosbatch/IZosBatchJobOutputSpoolFile.java | 8 +++++--- .../java/dev/galasa/zosbatch/IZosBatchJobname.java | 6 +++--- .../src/main/java/dev/galasa/zosbatch/ZosBatch.java | 6 +++--- .../java/dev/galasa/zosbatch/ZosBatchException.java | 6 +++--- .../java/dev/galasa/zosbatch/ZosBatchField.java | 6 +++--- .../java/dev/galasa/zosbatch/ZosBatchJobcard.java | 2 ++ .../java/dev/galasa/zosbatch/ZosBatchJobname.java | 6 +++--- .../galasa/zosbatch/ZosBatchManagerException.java | 6 +++--- .../zosbatch/internal/ZosBatchJobOutputImpl.java | 8 +++++--- .../internal/ZosBatchJobOutputSpoolFileImpl.java | 8 +++++--- .../zosbatch/internal/ZosBatchJobnameImpl.java | 10 +++++----- .../internal/properties/BatchRestrictToImage.java | 6 +++--- .../zosbatch/internal/properties/InputClass.java | 6 +++--- .../internal/properties/JobWaitTimeout.java | 6 +++--- .../zosbatch/internal/properties/JobnamePrefix.java | 6 +++--- .../zosbatch/internal/properties/MsgClass.java | 6 +++--- .../zosbatch/internal/properties/MsgLevel.java | 6 +++--- .../internal/properties/TruncateJCLRecords.java | 6 +++--- .../zosbatch/internal/properties/UseSysaff.java | 6 +++--- .../properties/ZosBatchPropertiesSingleton.java | 6 +++--- .../zosbatch/internal/properties/package-info.java | 10 +++++----- .../main/java/dev/galasa/zosbatch/package-info.java | 6 +++--- .../galasa/zosbatch/spi/IZosBatchJobOutputSpi.java | 10 +++++----- .../java/dev/galasa/zosbatch/spi/IZosBatchSpi.java | 6 +++--- .../java/dev/galasa/zosconsole/IZosConsole.java | 6 +++--- .../dev/galasa/zosconsole/IZosConsoleCommand.java | 6 +++--- .../main/java/dev/galasa/zosconsole/ZosConsole.java | 2 ++ .../dev/galasa/zosconsole/ZosConsoleException.java | 6 +++--- .../java/dev/galasa/zosconsole/ZosConsoleField.java | 6 +++--- .../zosconsole/ZosConsoleManagerException.java | 6 +++--- .../internal/properties/ConsoleRestrictToImage.java | 6 +++--- .../properties/ZosConsolePropertiesSingleton.java | 6 +++--- .../java/dev/galasa/zosconsole/package-info.java | 10 +++++----- .../dev/galasa/zosconsole/spi/IZosConsoleSpi.java | 6 +++--- .../main/java/dev/galasa/zosfile/IZosDataset.java | 8 +++++--- .../java/dev/galasa/zosfile/IZosFileHandler.java | 2 ++ .../main/java/dev/galasa/zosfile/IZosUNIXFile.java | 8 +++++--- .../java/dev/galasa/zosfile/IZosVSAMDataset.java | 8 +++++--- .../dev/galasa/zosfile/ZosDatasetException.java | 6 +++--- .../main/java/dev/galasa/zosfile/ZosFileField.java | 6 +++--- .../java/dev/galasa/zosfile/ZosFileHandler.java | 6 +++--- .../dev/galasa/zosfile/ZosFileManagerException.java | 6 +++--- .../dev/galasa/zosfile/ZosUNIXFileException.java | 6 +++--- .../dev/galasa/zosfile/ZosVSAMDatasetException.java | 6 +++--- .../internal/properties/DirectoryListMaxItems.java | 6 +++--- .../internal/properties/FileRestrictToImage.java | 6 +++--- .../internal/properties/UnixFilePermissions.java | 6 +++--- .../properties/ZosFilePropertiesSingleton.java | 6 +++--- .../zosfile/internal/properties/package-info.java | 5 +++++ .../main/java/dev/galasa/zosfile/package-info.java | 10 +++++----- .../java/dev/galasa/zosfile/spi/IZosFileSpi.java | 6 +++--- .../dev/galasa/zostsocommand/IZosTSOCommand.java | 6 +++--- .../dev/galasa/zostsocommand/ZosTSOCommand.java | 2 ++ .../zostsocommand/ZosTSOCommandException.java | 6 +++--- .../galasa/zostsocommand/ZosTSOCommandField.java | 6 +++--- .../ZosTSOCommandManagerException.java | 6 +++--- .../java/dev/galasa/zostsocommand/package-info.java | 10 +++++----- .../galasa/zostsocommand/spi/IZosTSOCommandSpi.java | 6 +++--- .../dev/galasa/zosunixcommand/IZosUNIXCommand.java | 6 +++--- .../dev/galasa/zosunixcommand/ZosUNIXCommand.java | 2 ++ .../ZosUNIXCommandAuthFailException.java | 6 +++--- .../zosunixcommand/ZosUNIXCommandException.java | 6 +++--- .../galasa/zosunixcommand/ZosUNIXCommandField.java | 6 +++--- .../ZosUNIXCommandManagerException.java | 6 +++--- .../dev/galasa/zosunixcommand/package-info.java | 10 +++++----- .../zosunixcommand/spi/IZosUNIXCommandSpi.java | 6 +++--- .../dev/galasa/zos/TestZosManagerException.java | 6 +++--- .../zos/internal/TestSlotResourceMonitor.java | 8 +++++--- .../galasa/zos/internal/TestZosBaseImageImpl.java | 8 +++++--- .../galasa/zos/internal/TestZosDseImageImpl.java | 8 +++++--- .../dev/galasa/zos/internal/TestZosIpHostImpl.java | 8 +++++--- .../dev/galasa/zos/internal/TestZosManagerImpl.java | 8 +++++--- .../zos/internal/TestZosProvisionedImageImpl.java | 8 +++++--- .../zos/internal/TestZosResourceManagement.java | 8 +++++--- .../galasa/zos/internal/metrics/TestZosMetrics.java | 8 +++++--- .../internal/properties/TestBatchExtraBundle.java | 8 +++++--- .../internal/properties/TestClusterIdForTag.java | 8 +++++--- .../zos/internal/properties/TestClusterImages.java | 8 +++++--- .../internal/properties/TestConsoleExtraBundle.java | 8 +++++--- .../internal/properties/TestDseClusterIdForTag.java | 8 +++++--- .../internal/properties/TestDseImageIdForTag.java | 8 +++++--- .../internal/properties/TestFileExtraBundle.java | 8 +++++--- .../galasa/zos/internal/properties/TestHostId.java | 8 +++++--- .../zos/internal/properties/TestImageIdForTag.java | 8 +++++--- .../zos/internal/properties/TestImageMaxSlots.java | 8 +++++--- .../zos/internal/properties/TestImageSysname.java | 8 +++++--- .../zos/internal/properties/TestJavaHome.java | 8 +++++--- .../internal/properties/TestLibertyInstallDir.java | 8 +++++--- .../zos/internal/properties/TestRunDatasetHLQ.java | 8 +++++--- .../internal/properties/TestRunUNIXPathPrefix.java | 8 +++++--- .../properties/TestTSOCommandExtraBundle.java | 8 +++++--- .../properties/TestUNIXCommandExtraBundle.java | 8 +++++--- .../properties/TestZosConnectInstallDir.java | 8 +++++--- .../properties/TestZosPropertiesSingleton.java | 10 +++++----- .../zosbatch/TestZosBatchEnumsAndExceptions.java | 6 +++--- .../dev/galasa/zosbatch/TestZosBatchJobcard.java | 8 +++++--- .../internal/TestZosBatchJobOutputImpl.java | 10 +++++----- .../TestZosBatchJobOutputSpoolFileImpl.java | 10 +++++----- .../zosbatch/internal/TestZosBatchJobnameImpl.java | 8 +++++--- .../properties/TestBatchRestrictToImage.java | 8 +++++--- .../internal/properties/TestInputClass.java | 8 +++++--- .../internal/properties/TestJobWaitTimeout.java | 8 +++++--- .../internal/properties/TestJobnamePrefix.java | 8 +++++--- .../zosbatch/internal/properties/TestMsgClass.java | 8 +++++--- .../zosbatch/internal/properties/TestMsgLevel.java | 8 +++++--- .../internal/properties/TestTruncateJCLRecords.java | 8 +++++--- .../zosbatch/internal/properties/TestUseSysaff.java | 8 +++++--- .../TestZosBatchZosmfPropertiesSingleton.java | 10 +++++----- .../galasa/zosconsole/TestZosConsoleExceptions.java | 6 +++--- .../internal/properties/TestRestrictToImage.java | 8 +++++--- .../TestZosConsoleZosmfPropertiesSingleton.java | 10 +++++----- .../zosfile/TestZosFileEnumsAndExceptions.java | 6 +++--- .../properties/TestDirectoryListMaxItems.java | 8 +++++--- .../properties/TestFileRestrictToImage.java | 8 +++++--- .../properties/TestUnixFilePermissions.java | 8 +++++--- .../TestZosFileZosmfPropertiesSingleton.java | 10 +++++----- .../zostsocommand/TestZosTSOCommandExceptions.java | 6 +++--- .../TestZosUNIXCommandEnumsAndExceptions.java | 10 +++++----- .../zos3270/common/screens/FieldContents.java | 6 +++--- .../dev/galasa/zos3270/common/screens/Terminal.java | 6 +++--- .../zos3270/common/screens/TerminalField.java | 2 ++ .../zos3270/common/screens/TerminalImage.java | 6 +++--- .../galasa/zos3270/common/screens/TerminalSize.java | 6 +++--- .../screens/images/TerminalImageException.java | 2 ++ .../screens/images/TerminalImageTransform.java | 2 ++ .../common/screens/json/TerminalJsonTransform.java | 2 ++ .../screens/images/TerminalImageExceptionTest.java | 2 ++ .../screens/images/TerminalImageTransformTest.java | 2 ++ .../screens/json/TerminalJsonTransformTest.java | 2 ++ .../dev/galasa/zos3270/manager/ivt/Zos3270IVT.java | 2 ++ .../zos3270/manager/ivt/Zos3270IVTSimframe.java | 6 +++--- .../dev/galasa/zos3270/AttentionIdentification.java | 6 +++--- .../dev/galasa/zos3270/ErrorTextFoundException.java | 6 +++--- .../dev/galasa/zos3270/FieldNotFoundException.java | 6 +++--- .../dev/galasa/zos3270/IDatastreamListener.java | 5 +++++ .../dev/galasa/zos3270/IScreenUpdateListener.java | 6 +++--- .../src/main/java/dev/galasa/zos3270/ITerminal.java | 2 ++ .../java/dev/galasa/zos3270/IZos3270Manager.java | 6 +++--- .../dev/galasa/zos3270/KeyboardLockedException.java | 6 +++--- .../zos3270/TerminalInterruptedException.java | 6 +++--- .../dev/galasa/zos3270/TextNotFoundException.java | 6 +++--- .../java/dev/galasa/zos3270/TimeoutException.java | 6 +++--- .../java/dev/galasa/zos3270/Zos3270Exception.java | 6 +++--- .../dev/galasa/zos3270/Zos3270ManagerException.java | 6 +++--- .../java/dev/galasa/zos3270/Zos3270Terminal.java | 6 +++--- .../zos3270/internal/Zos3270ManagerField.java | 6 +++--- .../galasa/zos3270/internal/Zos3270ManagerImpl.java | 2 ++ .../zos3270/internal/comms/Inbound3270Message.java | 6 +++--- .../dev/galasa/zos3270/internal/comms/Network.java | 2 ++ .../zos3270/internal/comms/NetworkServer.java | 6 +++--- .../zos3270/internal/comms/NetworkThread.java | 2 ++ .../galasa/zos3270/internal/comms/package-info.java | 4 ++-- .../internal/datastream/AbstractCommandCode.java | 6 +++--- .../zos3270/internal/datastream/AbstractOrder.java | 6 +++--- .../internal/datastream/AbstractQueryReply.java | 6 +++--- .../datastream/AttributeBackgroundColour.java | 2 ++ .../internal/datastream/AttributeCharacterSet.java | 6 +++--- .../datastream/AttributeExtendedHighlighting.java | 2 ++ .../datastream/AttributeFieldOutlining.java | 6 +++--- .../datastream/AttributeFieldValidation.java | 6 +++--- .../datastream/AttributeForegroundColour.java | 2 ++ .../datastream/AttributeResetAllAttributes.java | 6 +++--- .../internal/datastream/AttributeTransparency.java | 6 +++--- .../zos3270/internal/datastream/BufferAddress.java | 6 +++--- .../internal/datastream/CommandEraseWrite.java | 6 +++--- .../datastream/CommandEraseWriteAlternate.java | 6 +++--- .../internal/datastream/CommandReadBuffer.java | 6 +++--- .../internal/datastream/CommandReadModified.java | 6 +++--- .../internal/datastream/CommandReadModifiedAll.java | 6 +++--- .../zos3270/internal/datastream/CommandWrite.java | 6 +++--- .../internal/datastream/CommandWriteStructured.java | 6 +++--- .../zos3270/internal/datastream/IAttribute.java | 6 +++--- .../internal/datastream/OrderCarrageReturn.java | 6 +++--- .../internal/datastream/OrderEndOfMedium.java | 6 +++--- .../datastream/OrderEraseUnprotectedToAddress.java | 6 +++--- .../zos3270/internal/datastream/OrderFormFeed.java | 6 +++--- .../internal/datastream/OrderGraphicsEscape.java | 6 +++--- .../internal/datastream/OrderInsertCursor.java | 6 +++--- .../internal/datastream/OrderModifyField.java | 2 ++ .../zos3270/internal/datastream/OrderNewLine.java | 6 +++--- .../internal/datastream/OrderRepeatToAddress.java | 2 ++ .../internal/datastream/OrderSetAttribute.java | 6 +++--- .../internal/datastream/OrderSetBufferAddress.java | 6 +++--- .../internal/datastream/OrderStartField.java | 6 +++--- .../datastream/OrderStartFieldExtended.java | 2 ++ .../zos3270/internal/datastream/OrderText.java | 2 ++ .../datastream/QueryReplyCharactersets.java | 6 +++--- .../internal/datastream/QueryReplyColor.java | 2 ++ .../internal/datastream/QueryReplyHighlite.java | 6 +++--- .../datastream/QueryReplyImplicitPartition.java | 6 +++--- .../zos3270/internal/datastream/QueryReplyNull.java | 4 ++-- .../internal/datastream/QueryReplySummary.java | 6 +++--- .../internal/datastream/QueryReplyUsableArea.java | 6 +++--- .../internal/datastream/StructuredField.java | 2 ++ .../internal/datastream/StructuredField3270DS.java | 2 ++ .../datastream/StructuredFieldReadPartition.java | 6 +++--- .../internal/datastream/WriteControlCharacter.java | 6 +++--- .../zos3270/internal/datastream/package-info.java | 4 ++-- .../gherkin/Gherkin3270CheckAppearsOnce.java | 5 +++++ .../internal/gherkin/Gherkin3270Credentials.java | 5 +++++ .../internal/gherkin/Gherkin3270GivenTerminal.java | 2 ++ .../internal/gherkin/Gherkin3270MoveCursor.java | 5 +++++ .../internal/gherkin/Gherkin3270PressBasicKeys.java | 5 +++++ .../internal/gherkin/Gherkin3270PressPfKeys.java | 5 +++++ .../zos3270/internal/gherkin/Gherkin3270Type.java | 5 +++++ .../internal/gherkin/Gherkin3270TypeInField.java | 5 +++++ .../internal/gherkin/Gherkin3270WaitKeyboard.java | 5 +++++ .../internal/gherkin/Gherkin3270WaitTextField.java | 5 +++++ .../properties/ApplyConfidentialTextFiltering.java | 6 +++--- .../zos3270/internal/properties/ExtraBundles.java | 8 +++++--- .../internal/properties/LiveTerminalUrl.java | 6 +++--- .../internal/properties/LogConsoleTerminals.java | 6 +++--- .../internal/properties/TerminalDeviceTypes.java | 6 +++--- .../zos3270/internal/properties/TerminalOutput.java | 2 ++ .../properties/Zos3270PropertiesSingleton.java | 6 +++--- .../internal/terminal/ScreenUpdateTextListener.java | 6 +++--- .../zos3270/internal/terminal/package-info.java | 4 ++-- .../main/java/dev/galasa/zos3270/package-info.java | 6 +++--- .../dev/galasa/zos3270/spi/BufferCarrageReturn.java | 2 ++ .../java/dev/galasa/zos3270/spi/BufferChar.java | 2 ++ .../dev/galasa/zos3270/spi/BufferEndOfMedium.java | 2 ++ .../java/dev/galasa/zos3270/spi/BufferFormFeed.java | 2 ++ .../galasa/zos3270/spi/BufferGraphicsEscape.java | 2 ++ .../java/dev/galasa/zos3270/spi/BufferNewLine.java | 2 ++ .../dev/galasa/zos3270/spi/BufferStartOfField.java | 2 ++ .../main/java/dev/galasa/zos3270/spi/Colour.java | 2 ++ .../dev/galasa/zos3270/spi/DatastreamException.java | 6 +++--- .../src/main/java/dev/galasa/zos3270/spi/Field.java | 2 ++ .../main/java/dev/galasa/zos3270/spi/Highlight.java | 2 ++ .../java/dev/galasa/zos3270/spi/IBufferHolder.java | 6 +++--- .../dev/galasa/zos3270/spi/IZos3270ManagerSpi.java | 6 +++--- .../dev/galasa/zos3270/spi/NetworkException.java | 6 +++--- .../main/java/dev/galasa/zos3270/spi/Screen.java | 2 ++ .../main/java/dev/galasa/zos3270/spi/Terminal.java | 2 ++ .../dev/galasa/zos3270/spi/Zos3270TerminalImpl.java | 2 ++ .../java/dev/galasa/zos3270/spi/package-info.java | 4 ++-- .../zos3270/commandcodes/ReadModifiedTest.java | 2 ++ .../dev/galasa/zos3270/cursor/BackSpaceTest.java | 2 ++ .../java/dev/galasa/zos3270/cursor/BackTabTest.java | 2 ++ .../galasa/zos3270/cursor/FieldOverflowTest.java | 2 ++ .../java/dev/galasa/zos3270/cursor/HomeTest.java | 2 ++ .../java/dev/galasa/zos3270/cursor/NewLineTest.java | 2 ++ .../java/dev/galasa/zos3270/cursor/TabTest.java | 2 ++ .../galasa/zos3270/datastream/ByteAddressTest.java | 2 ++ .../galasa/zos3270/datastream/CommandCodeTest.java | 2 ++ .../datastream/EraseUnprotectedToAddressTest.java | 2 ++ .../zos3270/datastream/GraphicsEscapeTest.java | 2 ++ .../dev/galasa/zos3270/datastream/InboundTest.java | 2 ++ .../zos3270/datastream/OrderInsertCursorTest.java | 2 ++ .../galasa/zos3270/datastream/OrderTextTest.java | 2 ++ .../zos3270/datastream/QueryReplySummaryTest.java | 2 ++ .../datastream/QueryReplyUsableAreaTest.java | 2 ++ .../zos3270/datastream/RepeatToAddressTest.java | 2 ++ .../zos3270/datastream/SetBufferAddressTest.java | 2 ++ .../galasa/zos3270/datastream/StartFieldTest.java | 2 ++ .../galasa/zos3270/datastream/VampScreenTest.java | 2 ++ .../datastream/WriteControlCharacterTest.java | 2 ++ .../datastream/extended/ExtendedDatastreamTest.java | 2 ++ .../structuredfields/ReadPartitionTest.java | 2 ++ .../dev/galasa/zos3270/network/ConnectTest.java | 2 ++ .../dev/galasa/zos3270/network/Message3270Test.java | 2 ++ .../dev/galasa/zos3270/network/NegotiationTest.java | 2 ++ .../dev/galasa/zos3270/network/Network3270Test.java | 2 ++ .../zos3270/orders/EraseAllUnprotectedTest.java | 2 ++ .../galasa/zos3270/orders/GraphicsEscapeTest.java | 2 ++ .../dev/galasa/zos3270/terminal/CursorTest.java | 2 ++ .../dev/galasa/zos3270/terminal/EraseInputTest.java | 2 ++ .../dev/galasa/zos3270/terminal/FindTextTest.java | 2 ++ .../galasa/zos3270/terminal/RetrieveTextTest.java | 2 ++ .../dev/galasa/zos3270/terminal/ScreenTest.java | 2 ++ .../java/dev/galasa/zos3270/util/DummySocket.java | 2 ++ .../dev/galasa/zos3270/util/DummySocketImpl.java | 2 ++ .../galasa/zos3270/util/IOExceptionInputStream.java | 2 ++ .../dev/galasa/zos3270/util/Zos3270TestBase.java | 2 ++ .../src/test/java/t/TestColour.java | 2 ++ .../src/test/java/t/TestInbound.java | 2 ++ .../rseapi/manager/internal/RseapiZosBatchImpl.java | 8 +++++--- .../manager/internal/RseapiZosBatchJobImpl.java | 8 +++++--- .../manager/internal/RseapiZosBatchManagerImpl.java | 8 +++++--- .../rseapi/manager/internal/package-info.java | 6 +++--- .../manager/internal/TestRseapiZosBatchImpl.java | 8 +++++--- .../manager/internal/TestRseapiZosBatchJobImpl.java | 8 +++++--- .../internal/TestRseapiZosBatchManagerImpl.java | 8 +++++--- .../zosmf/manager/internal/ZosmfZosBatchImpl.java | 10 +++++----- .../manager/internal/ZosmfZosBatchJobImpl.java | 8 +++++--- .../manager/internal/ZosmfZosBatchManagerImpl.java | 8 +++++--- .../zosmf/manager/internal/package-info.java | 6 +++--- .../manager/internal/TestZosmfZosBatchImpl.java | 8 +++++--- .../manager/internal/TestZosmfZosBatchJobImpl.java | 8 +++++--- .../internal/TestZosmfZosBatchManagerImpl.java | 8 +++++--- .../manager/OeconsolZosConsoleCommandImpl.java | 10 +++++----- .../oeconsol/manager/OeconsolZosConsoleImpl.java | 10 +++++----- .../manager/OeconsolZosConsoleManagerImpl.java | 10 +++++----- .../manager/internal/properties/OeconsolPath.java | 6 +++--- .../properties/OeconsolPropertiesSingleton.java | 6 +++--- .../manager/internal/properties/package-info.java | 10 +++++----- .../zosconsole/oeconsol/manager/package-info.java | 10 +++++----- .../manager/TestOeconsolZosConsoleCommandImpl.java | 8 +++++--- .../manager/TestOeconsolZosConsoleImpl.java | 8 +++++--- .../manager/TestOeconsolZosConsoleManagerImpl.java | 8 +++++--- .../internal/properties/TestOeconsolPath.java | 8 +++++--- .../properties/TestOeconsolPropertiesSingleton.java | 10 +++++----- .../internal/ZosmfZosConsoleCommandImpl.java | 10 +++++----- .../zosmf/manager/internal/ZosmfZosConsoleImpl.java | 10 +++++----- .../internal/ZosmfZosConsoleManagerImpl.java | 10 +++++----- .../zosmf/manager/internal/package-info.java | 10 +++++----- .../internal/TestZosmfZosConsoleCommandImpl.java | 8 +++++--- .../manager/internal/TestZosmfZosConsoleImpl.java | 8 +++++--- .../internal/TestZosmfZosConsoleManagerImpl.java | 8 +++++--- .../internal/RseapiZosDatasetAttributesListdsi.java | 8 +++++--- .../manager/internal/RseapiZosDatasetImpl.java | 8 +++++--- .../manager/internal/RseapiZosFileHandlerImpl.java | 8 +++++--- .../manager/internal/RseapiZosFileManagerImpl.java | 8 +++++--- .../manager/internal/RseapiZosUNIXFileImpl.java | 2 ++ .../manager/internal/RseapiZosUnixCommand.java | 10 +++++----- .../manager/internal/RseapiZosVSAMDatasetImpl.java | 8 +++++--- .../rseapi/manager/internal/package-info.java | 6 +++--- .../TestRseapiZosDatasetAttributesListdsi.java | 8 +++++--- .../manager/internal/TestRseapiZosDatasetImpl.java | 8 +++++--- .../internal/TestRseapiZosFileHandlerImpl.java | 8 +++++--- .../internal/TestRseapiZosFileManagerImpl.java | 8 +++++--- .../manager/internal/TestRseapiZosUNIXFileImpl.java | 8 +++++--- .../manager/internal/TestRseapiZosUnixCommand.java | 8 +++++--- .../internal/TestRseapiZosVSAMDatasetImpl.java | 8 +++++--- .../internal/ZosmfZosDatasetAttributesListdsi.java | 10 +++++----- .../zosmf/manager/internal/ZosmfZosDatasetImpl.java | 8 +++++--- .../manager/internal/ZosmfZosFileHandlerImpl.java | 8 +++++--- .../manager/internal/ZosmfZosFileManagerImpl.java | 8 +++++--- .../manager/internal/ZosmfZosUNIXFileImpl.java | 8 +++++--- .../manager/internal/ZosmfZosVSAMDatasetImpl.java | 8 +++++--- .../zosmf/manager/internal/package-info.java | 6 +++--- .../TestZosmfZosDatasetAttributesListdsi.java | 8 +++++--- .../manager/internal/TestZosmfZosDatasetImpl.java | 8 +++++--- .../internal/TestZosmfZosFileHandlerImpl.java | 8 +++++--- .../internal/TestZosmfZosFileManagerImpl.java | 8 +++++--- .../manager/internal/TestZosmfZosUNIXFileImpl.java | 8 +++++--- .../internal/TestZosmfZosVSAMDatasetImpl.java | 8 +++++--- .../manager/internal/ZosUNIXCommandManagerImpl.java | 6 ++++++ .../galasa/zosliberty/angel/IZosLibertyAngel.java | 8 +++++--- .../galasa/zosliberty/angel/ZosLibertyAngel.java | 8 +++++--- .../zosliberty/angel/ZosLibertyAngelException.java | 2 ++ .../angel/ZosLibertyAngelManagerException.java | 2 ++ .../angel/internal/ZosLibertyAngelField.java | 2 ++ .../angel/internal/ZosLibertyAngelImpl.java | 8 +++++--- .../angel/internal/ZosLibertyAngelManagerImpl.java | 8 +++++--- .../zosliberty/angel/internal/package-info.java | 8 +++++--- .../angel/internal/properties/DefaultTimeout.java | 9 +++++---- .../angel/internal/properties/Procname.java | 9 +++++---- .../ZosLibertyAngelPropertiesSingleton.java | 2 ++ .../dev/galasa/zosliberty/angel/package-info.java | 8 +++++--- .../zosliberty/angel/spi/IZosLibertyAngelSpi.java | 8 +++++--- .../galasa/zosliberty/angel/spi/package-info.java | 8 +++++--- .../java/dev/galasa/zosliberty/IZosLiberty.java | 8 +++++--- .../dev/galasa/zosliberty/IZosLibertyServer.java | 8 +++++--- .../dev/galasa/zosliberty/IZosLibertyServerLog.java | 8 +++++--- .../galasa/zosliberty/IZosLibertyServerLogs.java | 8 +++++--- .../dev/galasa/zosliberty/IZosLibertyServerXml.java | 8 +++++--- .../zosliberty/IZosLibertyServerXmlElementList.java | 8 +++++--- .../main/java/dev/galasa/zosliberty/ZosLiberty.java | 8 +++++--- .../zosliberty/ZosLibertyManagerException.java | 2 ++ .../zosliberty/ZosLibertyServerException.java | 2 ++ .../galasa/zosliberty/internal/ZosLibertyField.java | 2 ++ .../galasa/zosliberty/internal/ZosLibertyImpl.java | 8 +++++--- .../zosliberty/internal/ZosLibertyManagerImpl.java | 8 +++++--- .../zosliberty/internal/ZosLibertyServerImpl.java | 8 +++++--- .../internal/ZosLibertyServerLogImpl.java | 8 +++++--- .../internal/ZosLibertyServerLogsImpl.java | 8 +++++--- .../ZosLibertyServerXmlElementListImpl.java | 8 +++++--- .../internal/ZosLibertyServerXmlImpl.java | 8 +++++--- .../galasa/zosliberty/internal/package-info.java | 8 +++++--- .../internal/properties/DefaultTimeout.java | 9 +++++---- .../properties/ZosLibertyPropertiesSingleton.java | 2 ++ .../java/dev/galasa/zosliberty/package-info.java | 8 +++++--- .../dev/galasa/zosliberty/spi/IZosLibertySpi.java | 8 +++++--- .../dev/galasa/zosliberty/spi/package-info.java | 8 +++++--- .../src/main/java/dev/galasa/zosmf/IZosmf.java | 8 +++++--- .../main/java/dev/galasa/zosmf/IZosmfManager.java | 6 +++--- .../main/java/dev/galasa/zosmf/IZosmfResponse.java | 6 +++--- .../dev/galasa/zosmf/IZosmfRestApiProcessor.java | 6 +++--- .../src/main/java/dev/galasa/zosmf/Zosmf.java | 2 ++ .../main/java/dev/galasa/zosmf/ZosmfException.java | 6 +++--- .../dev/galasa/zosmf/ZosmfManagerException.java | 6 +++--- .../java/dev/galasa/zosmf/internal/ZosmfImpl.java | 10 +++++----- .../galasa/zosmf/internal/ZosmfManagerField.java | 6 +++--- .../dev/galasa/zosmf/internal/ZosmfManagerImpl.java | 6 +++--- .../galasa/zosmf/internal/ZosmfResponseImpl.java | 6 +++--- .../zosmf/internal/ZosmfRestApiProcessor.java | 6 +++--- .../dev/galasa/zosmf/internal/package-info.java | 5 +++++ .../dev/galasa/zosmf/internal/properties/Https.java | 6 +++--- .../zosmf/internal/properties/ImageServers.java | 6 +++--- .../zosmf/internal/properties/RequestRetry.java | 6 +++--- .../zosmf/internal/properties/ServerCreds.java | 6 +++--- .../zosmf/internal/properties/ServerImage.java | 6 +++--- .../zosmf/internal/properties/ServerPort.java | 6 +++--- .../zosmf/internal/properties/SysplexServers.java | 6 +++--- .../properties/ZosmfPropertiesSingleton.java | 6 +++--- .../zosmf/internal/properties/package-info.java | 5 +++++ .../main/java/dev/galasa/zosmf/package-info.java | 6 +++--- .../java/dev/galasa/zosmf/spi/IZosmfManagerSpi.java | 6 +++--- .../java/dev/galasa/zosmf/spi/package-info.java | 5 +++++ .../dev/galasa/zosmf/TestEnumsAndExeptions.java | 6 +++--- .../dev/galasa/zosmf/internal/TestZosmfImpl.java | 8 +++++--- .../galasa/zosmf/internal/TestZosmfManagerImpl.java | 8 +++++--- .../zosmf/internal/TestZosmfResponseImpl.java | 8 +++++--- .../zosmf/internal/TestZosmfRestApiProcessor.java | 8 +++++--- .../galasa/zosmf/internal/properties/TestHttps.java | 8 +++++--- .../zosmf/internal/properties/TestImageServers.java | 8 +++++--- .../zosmf/internal/properties/TestRequestRetry.java | 8 +++++--- .../zosmf/internal/properties/TestServerCreds.java | 8 +++++--- .../zosmf/internal/properties/TestServerImage.java | 8 +++++--- .../zosmf/internal/properties/TestServerPort.java | 8 +++++--- .../internal/properties/TestSysplexServers.java | 8 +++++--- .../properties/TestZosmfPropertiesSingleton.java | 10 +++++----- .../java/dev/galasa/zosprogram/IZosProgram.java | 6 +++--- .../main/java/dev/galasa/zosprogram/ZosProgram.java | 2 ++ .../dev/galasa/zosprogram/ZosProgramException.java | 6 +++--- .../zosprogram/ZosProgramManagerException.java | 6 +++--- .../internal/AbstractZosProgramCompiler.java | 10 +++++----- .../internal/ZosAssemblerProgramCompiler.java | 10 +++++----- .../zosprogram/internal/ZosCProgramCompiler.java | 10 +++++----- .../internal/ZosCobolProgramCompiler.java | 10 +++++----- .../zosprogram/internal/ZosPl1ProgramCompiler.java | 10 +++++----- .../galasa/zosprogram/internal/ZosProgramImpl.java | 6 +++--- .../zosprogram/internal/ZosProgramManagerField.java | 6 +++--- .../zosprogram/internal/ZosProgramManagerImpl.java | 8 +++++--- .../galasa/zosprogram/internal/package-info.java | 5 +++++ .../internal/properties/CICSDatasetPrefix.java | 2 ++ .../LanguageEnvironmentDatasetPrefix.java | 2 ++ .../properties/ProgramLanguageCompileSyslibs.java | 2 ++ .../properties/ProgramLanguageDatasetPrefix.java | 2 ++ .../properties/ProgramLanguageLinkSyslibs.java | 2 ++ .../properties/ZosProgramPropertiesSingleton.java | 2 ++ .../internal/properties/package-info.java | 5 +++++ .../java/dev/galasa/zosprogram/package-info.java | 2 ++ .../zosprogram/spi/IZosProgramManagerSpi.java | 6 +++--- .../dev/galasa/zosprogram/spi/package-info.java | 5 +++++ .../galasa/zosprogram/TestExeptionsAndEnums.java | 2 ++ .../internal/TestAbstractZosProgramCompiler.java | 8 +++++--- .../internal/TestZosAssemblerProgramCompiler.java | 8 +++++--- .../internal/TestZosCProgramCompiler.java | 8 +++++--- .../internal/TestZosCobolProgramCompiler.java | 8 +++++--- .../internal/TestZosPl1ProgramCompiler.java | 8 +++++--- .../zosprogram/internal/TestZosProgramImpl.java | 8 +++++--- .../internal/TestZosProgramManagerImpl.java | 8 +++++--- .../internal/properties/TestCICSDatasetPrefix.java | 8 +++++--- .../TestLanguageEnvironmentDatasetPrefix.java | 8 +++++--- .../TestProgramLanguageCompileSyslibs.java | 8 +++++--- .../TestProgramLanguageDatasetPrefix.java | 8 +++++--- .../properties/TestProgramLanguageLinkSyslibs.java | 8 +++++--- .../properties/TestProgramPropertiesSingleton.java | 10 +++++----- .../src/main/java/dev/galasa/zosrseapi/IRseapi.java | 8 +++++--- .../java/dev/galasa/zosrseapi/IRseapiManager.java | 6 +++--- .../java/dev/galasa/zosrseapi/IRseapiResponse.java | 6 +++--- .../galasa/zosrseapi/IRseapiRestApiProcessor.java | 2 ++ .../src/main/java/dev/galasa/zosrseapi/Rseapi.java | 2 ++ .../java/dev/galasa/zosrseapi/RseapiException.java | 6 +++--- .../galasa/zosrseapi/RseapiManagerException.java | 6 +++--- .../dev/galasa/zosrseapi/internal/RseapiImpl.java | 10 +++++----- .../zosrseapi/internal/RseapiManagerField.java | 6 +++--- .../zosrseapi/internal/RseapiManagerImpl.java | 6 +++--- .../zosrseapi/internal/RseapiResponseImpl.java | 10 +++++----- .../zosrseapi/internal/RseapiRestApiProcessor.java | 8 +++++--- .../dev/galasa/zosrseapi/internal/package-info.java | 5 +++++ .../galasa/zosrseapi/internal/properties/Https.java | 6 +++--- .../zosrseapi/internal/properties/ImageServers.java | 6 +++--- .../zosrseapi/internal/properties/RequestRetry.java | 2 ++ .../properties/RseapiPropertiesSingleton.java | 6 +++--- .../zosrseapi/internal/properties/ServerCreds.java | 6 +++--- .../zosrseapi/internal/properties/ServerImage.java | 6 +++--- .../zosrseapi/internal/properties/ServerPort.java | 6 +++--- .../internal/properties/SysplexServers.java | 6 +++--- .../zosrseapi/internal/properties/package-info.java | 5 +++++ .../java/dev/galasa/zosrseapi/package-info.java | 2 ++ .../dev/galasa/zosrseapi/spi/IRseapiManagerSpi.java | 6 +++--- .../java/dev/galasa/zosrseapi/spi/package-info.java | 5 +++++ .../dev/galasa/zosrseapi/TestEnumsAndExeptions.java | 6 +++--- .../galasa/zosrseapi/internal/TestRseapiImpl.java | 8 +++++--- .../zosrseapi/internal/TestRseapiManagerImpl.java | 8 +++++--- .../zosrseapi/internal/TestRseapiResponseImpl.java | 8 +++++--- .../internal/TestRseapiRestApiProcessor.java | 8 +++++--- .../zosrseapi/internal/properties/TestHttps.java | 8 +++++--- .../internal/properties/TestImageServers.java | 8 +++++--- .../internal/properties/TestRequestRetry.java | 8 +++++--- .../properties/TestRseapiPropertiesSingleton.java | 10 +++++----- .../internal/properties/TestServerCreds.java | 8 +++++--- .../internal/properties/TestServerImage.java | 8 +++++--- .../internal/properties/TestServerPort.java | 8 +++++--- .../internal/properties/TestSysplexServers.java | 8 +++++--- .../dev/galasa/zossecurity/IZosCertificate.java | 8 +++++--- .../dev/galasa/zossecurity/IZosCicsClassSet.java | 8 +++++--- .../dev/galasa/zossecurity/IZosCicsProfile.java | 8 +++++--- .../main/java/dev/galasa/zossecurity/IZosGroup.java | 8 +++++--- .../main/java/dev/galasa/zossecurity/IZosIdMap.java | 8 +++++--- .../galasa/zossecurity/IZosKerberosPrincipal.java | 8 +++++--- .../java/dev/galasa/zossecurity/IZosKeyring.java | 8 +++++--- .../galasa/zossecurity/IZosPreDefinedProfile.java | 8 +++++--- .../java/dev/galasa/zossecurity/IZosProfile.java | 8 +++++--- .../java/dev/galasa/zossecurity/IZosSecurity.java | 8 +++++--- .../java/dev/galasa/zossecurity/IZosUserid.java | 8 +++++--- .../dev/galasa/zossecurity/KerberosInitiator.java | 8 +++++--- .../java/dev/galasa/zossecurity/KerberosToken.java | 8 +++++--- .../zossecurity/KeyringAlreadyExistsException.java | 8 +++++--- .../zossecurity/ProfileAlreadyExistsException.java | 8 +++++--- .../zossecurity/ProfileConfigurationException.java | 8 +++++--- .../zossecurity/ProfileNotFoundException.java | 8 +++++--- .../zossecurity/RacfSyntaxErrorException.java | 8 +++++--- .../zossecurity/RestrictedResourceException.java | 8 +++++--- .../galasa/zossecurity/UseridNotFoundException.java | 8 +++++--- .../dev/galasa/zossecurity/ZosCicsClassSet.java | 8 +++++--- .../galasa/zossecurity/ZosPreDefinedProfile.java | 8 +++++--- .../java/dev/galasa/zossecurity/ZosSecurity.java | 8 +++++--- .../zossecurity/ZosSecurityManagerException.java | 8 +++++--- .../zossecurity/ZosSecurityProvisionException.java | 8 +++++--- .../main/java/dev/galasa/zossecurity/ZosUserid.java | 8 +++++--- .../dev/galasa/zossecurity/datatypes/Action.java | 8 +++++--- .../galasa/zossecurity/datatypes/RACFAccess.java | 8 +++++--- .../zossecurity/datatypes/RACFAccessType.java | 8 +++++--- .../zossecurity/datatypes/RACFCertificateTrust.java | 8 +++++--- .../zossecurity/datatypes/RACFCertificateType.java | 8 +++++--- .../zossecurity/datatypes/ZosCicsClassResource.java | 8 +++++--- .../zossecurity/datatypes/ZosCicsClassType.java | 8 +++++--- .../galasa/zossecurity/internal/RACFMessages.java | 8 +++++--- .../zossecurity/internal/ZosCicsClassSetField.java | 2 ++ .../internal/ZosPreDefinedProfileField.java | 2 ++ .../zossecurity/internal/ZosSecurityField.java | 2 ++ .../zossecurity/internal/ZosSecurityImpl.java | 8 +++++--- .../internal/ZosSecurityManagerImpl.java | 8 +++++--- .../galasa/zossecurity/internal/ZosUseridField.java | 2 ++ .../properties/CicsClassSetMinimumFree.java | 2 ++ .../internal/properties/CicsSharedClassets.java | 2 ++ .../internal/properties/ClassAllowedPrefixes.java | 2 ++ .../zossecurity/internal/properties/CommandRac.java | 2 ++ .../internal/properties/CreateUserid.java | 2 ++ .../properties/KerberosDomainController.java | 2 ++ .../internal/properties/KerberosRealm.java | 2 ++ .../internal/properties/OutputReporting.java | 2 ++ .../internal/properties/PredefinedProfiles.java | 2 ++ .../internal/properties/ResourceReporting.java | 2 ++ .../internal/properties/ServerApikey.java | 2 ++ .../zossecurity/internal/properties/ServerUrl.java | 2 ++ .../internal/properties/SetroptsDelay.java | 2 ++ .../internal/properties/UseridBypassCleanup.java | 2 ++ .../internal/properties/UseridBypassPassword.java | 2 ++ .../internal/properties/UseridDefaultGroup.java | 2 ++ .../internal/properties/UseridDefaultGroups.java | 2 ++ .../internal/properties/UseridDefaultPassword.java | 2 ++ .../internal/properties/UseridMinimumFree.java | 2 ++ .../zossecurity/internal/properties/UseridPool.java | 2 ++ .../internal/properties/UseridSysplexGroups.java | 2 ++ .../properties/ZosSecurityPropertiesSingleton.java | 2 ++ .../ZosCertificateResourceManagement.java | 8 +++++--- .../ZosCicsClassSetResourceManagement.java | 8 +++++--- .../ZosIdMapResourceManagement.java | 8 +++++--- .../ZosKerberosPrincipalResourceManagement.java | 8 +++++--- .../ZosKeyringResourceManagement.java | 8 +++++--- ...osPredefinedProfilePermitResourceManagement.java | 8 +++++--- .../ZosProfileResourceManagement.java | 8 +++++--- .../ZosSecurityResourceManagement.java | 8 +++++--- .../ZosUseridResourceManagement.java | 8 +++++--- .../internal/resources/RacfOutputProcessing.java | 8 +++++--- .../internal/resources/ZosCertificateImpl.java | 8 +++++--- .../internal/resources/ZosCicsClassSetImpl.java | 8 +++++--- .../internal/resources/ZosCicsProfileImpl.java | 8 +++++--- .../resources/ZosCicsSharedClassSetImpl.java | 8 +++++--- .../internal/resources/ZosGroupImpl.java | 8 +++++--- .../internal/resources/ZosIdMapImpl.java | 8 +++++--- .../resources/ZosKerberosClientPrincipalImpl.java | 8 +++++--- .../resources/ZosKerberosPrincipalImpl.java | 8 +++++--- .../internal/resources/ZosKeyringImpl.java | 8 +++++--- .../resources/ZosPreDefinedProfileImpl.java | 8 +++++--- .../resources/ZosPredefinedProfilePermitImpl.java | 8 +++++--- .../internal/resources/ZosProfileImpl.java | 8 +++++--- .../internal/resources/ZosUseridImpl.java | 8 +++++--- .../java/dev/galasa/zossecurity/package-info.java | 8 +++++--- .../zossecurity/spi/IZosSecurityManagerSpi.java | 8 +++++--- .../ssh/manager/internal/ZosTSOCommandImpl.java | 6 +++--- .../manager/internal/ZosTSOCommandManagerImpl.java | 10 +++++----- .../ssh/manager/internal/package-info.java | 8 +++++--- .../ssh/manager/internal/properties/TsocmdPath.java | 2 ++ .../ZosTSOCommandSshPropertiesSingleton.java | 6 +++--- .../manager/internal/properties/package-info.java | 10 +++++----- .../ssh/manager/internal/TestZosTSOCommandImpl.java | 8 +++++--- .../internal/TestZosTSOCommandManagerImpl.java | 8 +++++--- .../manager/internal/properties/TestTsocmdPath.java | 8 +++++--- .../TestZosTSOCommandSshPropertiesSingleton.java | 10 +++++----- .../ssh/manager/internal/ZosUNIXCommandImpl.java | 6 +++--- .../manager/internal/ZosUNIXCommandManagerImpl.java | 10 +++++----- .../ssh/manager/internal/package-info.java | 8 +++++--- .../ZosUNIXCommandSshPropertiesSingleton.java | 6 +++--- .../manager/internal/properties/package-info.java | 10 +++++----- .../manager/internal/TestZosUNIXCommandImpl.java | 8 +++++--- .../internal/TestZosUNIXCommandManagerImpl.java | 8 +++++--- .../TestZosUNIXCommandSshPropertiesSingleton.java | 10 +++++----- .../galasa-uber-javadoc/src/main/java/dummy/X.java | 6 +++--- release.yaml | 5 ++++- 1376 files changed, 4717 insertions(+), 2989 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/src/main/java/dev/galasa/cicsts/ceci/manager/ivt/CECIManagerIVT.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/src/main/java/dev/galasa/cicsts/ceci/manager/ivt/CECIManagerIVT.java index bea1b901d..fdc09046a 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/src/main/java/dev/galasa/cicsts/ceci/manager/ivt/CECIManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager.ivt/src/main/java/dev/galasa/cicsts/ceci/manager/ivt/CECIManagerIVT.java @@ -1,7 +1,8 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ - package dev.galasa.cicsts.ceci.manager.ivt; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciExecInterfaceBlockImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciExecInterfaceBlockImpl.java index dc0341876..1416014b6 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciExecInterfaceBlockImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciExecInterfaceBlockImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.ceci.internal; import dev.galasa.cicsts.IExecInterfaceBlock; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciImpl.java index a4b2c9922..d9476c16a 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.ceci.internal; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciManagerField.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciManagerField.java index e199f58f7..6e9690181 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciManagerField.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciManagerField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.ceci.internal; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciManagerImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciManagerImpl.java index da1fa9216..f892e2e24 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciManagerImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.ceci.internal; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciResponseImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciResponseImpl.java index 947195c61..52365c06a 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciResponseImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/CeciResponseImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.ceci.internal; import java.util.Map; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/ResponseOutputValueImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/ResponseOutputValueImpl.java index 4fc040d6a..02a06b2d5 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/ResponseOutputValueImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/ResponseOutputValueImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.ceci.internal; import dev.galasa.cicsts.CeciException; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/package-info.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/package-info.java index 1ad43fba0..e5e8ce84a 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/package-info.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/package-info.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * CICS/TS CECI Manager - Internal Implementation */ diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/properties/CeciPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/properties/CeciPropertiesSingleton.java index 2d1f8c3bc..1c29f20fd 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/properties/CeciPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/properties/CeciPropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.ceci.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/properties/package-info.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/properties/package-info.java index dd50075b1..c10137ec3 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/properties/package-info.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/internal/properties/package-info.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * CICS/TS CECI Manager - CPS Properties * diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/ICeciManagerSpi.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/ICeciManagerSpi.java index bb64ed6e9..9060537e6 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/ICeciManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/ICeciManagerSpi.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.ceci.spi; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/package-info.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/package-info.java index 97dade872..3a8ab9141 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/package-info.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/main/java/dev/galasa/cicsts/ceci/spi/package-info.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ /** * zOSMF Batch Manager - Internal SPI diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestCeciExecInterfaceBlockImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestCeciExecInterfaceBlockImpl.java index 66be21d96..136e657b1 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestCeciExecInterfaceBlockImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestCeciExecInterfaceBlockImpl.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.ceci.internal; import java.util.Arrays; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestCeciImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestCeciImpl.java index c2303eb60..280cd8a31 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestCeciImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestCeciImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.ceci.internal; import java.lang.reflect.Field; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestCeciManagerImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestCeciManagerImpl.java index 6ddf7f4e3..00be975ec 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestCeciManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestCeciManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.ceci.internal; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestCeciResponseImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestCeciResponseImpl.java index b943b3640..37c2d52b3 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestCeciResponseImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestCeciResponseImpl.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.ceci.internal; import java.util.LinkedHashMap; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestResponseOutputValueImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestResponseOutputValueImpl.java index b54f74f82..fa6af08f9 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestResponseOutputValueImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/TestResponseOutputValueImpl.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.ceci.internal; import java.util.Arrays; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/properties/TestCeciPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/properties/TestCeciPropertiesSingleton.java index cb80140b4..88d0f83cb 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/properties/TestCeciPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceci.manager/src/test/java/dev/galasa/cicsts/ceci/internal/properties/TestCeciPropertiesSingleton.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.ceci.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/src/main/java/dev/galasa/cicsts/ceda/manager/ivt/CedaManagerIVT.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/src/main/java/dev/galasa/cicsts/ceda/manager/ivt/CedaManagerIVT.java index 5c1367724..01ecb4213 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/src/main/java/dev/galasa/cicsts/ceda/manager/ivt/CedaManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager.ivt/src/main/java/dev/galasa/cicsts/ceda/manager/ivt/CedaManagerIVT.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.ceda.manager.ivt; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/internal/CedaImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/internal/CedaImpl.java index 51a016012..3a64fb4c5 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/internal/CedaImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/internal/CedaImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.ceda.internal; import javax.validation.constraints.NotNull; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/internal/CedaManagerImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/internal/CedaManagerImpl.java index 9c2e62df6..d33448314 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/internal/CedaManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/internal/CedaManagerImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.ceda.internal; import java.util.HashMap; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/internal/properties/CedaPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/internal/properties/CedaPropertiesSingleton.java index d9c2fe90b..945d598da 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/internal/properties/CedaPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/internal/properties/CedaPropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.ceda.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/package-info.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/package-info.java index b5b372686..d99912756 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/package-info.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/package-info.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.ceda; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/spi/ICedaManagerSpi.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/spi/ICedaManagerSpi.java index 1635e3332..a0ff149da 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/spi/ICedaManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.ceda.manager/src/main/java/dev/galasa/cicsts/ceda/spi/ICedaManagerSpi.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.ceda.spi; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/src/main/java/dev/galasa/cicsts/cemt/manager/ivt/CEMTManagerIVT.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/src/main/java/dev/galasa/cicsts/cemt/manager/ivt/CEMTManagerIVT.java index c04df0b62..13b6992ed 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/src/main/java/dev/galasa/cicsts/cemt/manager/ivt/CEMTManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/src/main/java/dev/galasa/cicsts/cemt/manager/ivt/CEMTManagerIVT.java @@ -1,7 +1,8 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ - package dev.galasa.cicsts.cemt.manager.ivt; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/src/main/java/dev/galasa/cicsts/cemt/manager/ivt/IVTException.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/src/main/java/dev/galasa/cicsts/cemt/manager/ivt/IVTException.java index 57c8cea90..5bf4eaf58 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/src/main/java/dev/galasa/cicsts/cemt/manager/ivt/IVTException.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager.ivt/src/main/java/dev/galasa/cicsts/cemt/manager/ivt/IVTException.java @@ -1,10 +1,8 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ - - package dev.galasa.cicsts.cemt.manager.ivt; public class IVTException extends Exception { diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/internal/CemtImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/internal/CemtImpl.java index 5df288fc7..25d990725 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/internal/CemtImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/internal/CemtImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.cemt.internal; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/internal/CemtManagerImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/internal/CemtManagerImpl.java index 95742fcca..e0c10d7a7 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/internal/CemtManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/internal/CemtManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.cemt.internal; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/internal/properties/CemtPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/internal/properties/CemtPropertiesSingleton.java index f48fcf53c..3a5e91740 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/internal/properties/CemtPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/internal/properties/CemtPropertiesSingleton.java @@ -1,9 +1,8 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ - package dev.galasa.cicsts.cemt.internal.properties; import org.osgi.service.component.annotations.Activate; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/ICemtManagerSpi.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/ICemtManagerSpi.java index 270131cad..75bca1ad2 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/ICemtManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/ICemtManagerSpi.java @@ -1,7 +1,8 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ - package dev.galasa.cicsts.cemt.spi; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/package-info.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/package-info.java index 73c2b5a1d..926a30ba6 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/package-info.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.cemt.manager/src/main/java/dev/galasa/cicsts/cemt/spi/package-info.java @@ -1,4 +1,6 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.cemt.spi; \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/src/main/java/dev/galasa/cicsts/manager/ivt/CICSTSManagerIVT.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/src/main/java/dev/galasa/cicsts/manager/ivt/CICSTSManagerIVT.java index d3f6a08e3..e91be9568 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/src/main/java/dev/galasa/cicsts/manager/ivt/CICSTSManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager.ivt/src/main/java/dev/galasa/cicsts/manager/ivt/CICSTSManagerIVT.java @@ -1,7 +1,8 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ - package dev.galasa.cicsts.manager.ivt; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CeciException.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CeciException.java index d5acc8ff2..a5ec84c80 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CeciException.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CeciException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CeciManagerException.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CeciManagerException.java index b2f1f2084..6cb47ace5 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CeciManagerException.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CeciManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CedaException.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CedaException.java index 613519c40..77443fac4 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CedaException.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CedaException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CedaManagerException.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CedaManagerException.java index 0ec1d9026..fdbf12f09 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CedaManagerException.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CedaManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CemtException.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CemtException.java index 1826f7d9c..cd24c97b1 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CemtException.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CemtException.java @@ -1,10 +1,8 @@ - /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ - package dev.galasa.cicsts; public class CemtException extends CemtManagerException { diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CemtManagerException.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CemtManagerException.java index 3c3d0ed79..0aabbccd7 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CemtManagerException.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CemtManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsRegion.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsRegion.java index 44a510eb4..6bd645139 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsRegion.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsRegion.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsTerminal.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsTerminal.java index c32fb4d82..fdb55e94f 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsTerminal.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsTerminal.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicstsHashMap.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicstsHashMap.java index 3d9b502d5..ce85f1531 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicstsHashMap.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicstsHashMap.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicstsManagerException.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicstsManagerException.java index a6b772bfb..c2a2dd65f 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicstsManagerException.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicstsManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicstsManagerField.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicstsManagerField.java index 2912c5711..6c498f2b7 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicstsManagerField.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicstsManagerField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeci.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeci.java index 8d65e6298..b31024f55 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeci.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeci.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeciResponse.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeciResponse.java index edc29fb43..194afbfad 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeciResponse.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeciResponse.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts; import java.util.Map; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeciResponseOutputValue.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeciResponseOutputValue.java index 3d15a75b5..589811c9b 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeciResponseOutputValue.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeciResponseOutputValue.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeda.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeda.java index 331b28bfa..d682b8b6a 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeda.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeda.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICemt.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICemt.java index 1180a625f..2cb9990a8 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICemt.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICemt.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsRegion.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsRegion.java index 433d50c05..1e76c7686 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsRegion.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsRegion.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts; import javax.validation.constraints.NotNull; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsTerminal.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsTerminal.java index 881a3b7b7..82a729a53 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsTerminal.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsTerminal.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/IExecInterfaceBlock.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/IExecInterfaceBlock.java index 8527380d4..9102e2ee6 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/IExecInterfaceBlock.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/IExecInterfaceBlock.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts; /** diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/MasType.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/MasType.java index 3365b5d1c..42b67830c 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/MasType.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/MasType.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/CicsBundleResourceException.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/CicsBundleResourceException.java index 164042635..2e18fbae4 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/CicsBundleResourceException.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/CicsBundleResourceException.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.cicsresource; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/CicsJvmprofileResourceException.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/CicsJvmprofileResourceException.java index c128274e9..6a0faf49a 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/CicsJvmprofileResourceException.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/CicsJvmprofileResourceException.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.cicsresource; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/CicsJvmserverResourceException.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/CicsJvmserverResourceException.java index cbeee423d..c586ee05c 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/CicsJvmserverResourceException.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/CicsJvmserverResourceException.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.cicsresource; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/CicsResourceManagerException.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/CicsResourceManagerException.java index ece29e4ca..929de3f64 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/CicsResourceManagerException.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/CicsResourceManagerException.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.cicsresource; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/CicsResourceStatus.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/CicsResourceStatus.java index e6539b4bc..9d461f7b3 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/CicsResourceStatus.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/CicsResourceStatus.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.cicsresource; public enum CicsResourceStatus { diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsBundle.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsBundle.java index e574d74b0..3c7fb5094 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsBundle.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsBundle.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.cicsresource; /** diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsResource.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsResource.java index 95f805026..f67382d69 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsResource.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsResource.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.cicsresource; import java.util.Map; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmprofile.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmprofile.java index 79d432ab8..44a960cf1 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmprofile.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmprofile.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.cicsresource; import java.util.Map; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserver.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserver.java index 2617e7d07..b324a94b9 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserver.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserver.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.cicsresource; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserverLog.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserverLog.java index b45313655..64b971a03 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserverLog.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserverLog.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.cicsresource; import java.io.OutputStream; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java index 421693fe4..5d3cde25b 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.internal; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java index 4aa58aef7..52b3fa3d6 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.internal; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/dse/DseCicsImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/dse/DseCicsImpl.java index 92753db00..ff1d85893 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/dse/DseCicsImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/dse/DseCicsImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.internal.dse; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/dse/DseProvisioningImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/dse/DseProvisioningImpl.java index 84051b7fc..56e7466af 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/dse/DseProvisioningImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/dse/DseProvisioningImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.internal.dse; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/CicstsPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/CicstsPropertiesSingleton.java index b6d457cad..675b90200 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/CicstsPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/CicstsPropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DefaultLogonGmText.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DefaultLogonGmText.java index 458e94a2e..66b30e563 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DefaultLogonGmText.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DefaultLogonGmText.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DefaultLogonInitialText.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DefaultLogonInitialText.java index cd3531b61..05d1b66f8 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DefaultLogonInitialText.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DefaultLogonInitialText.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DefaultVersion.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DefaultVersion.java index 08bd6cb42..e60644bc3 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DefaultVersion.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DefaultVersion.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DseApplid.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DseApplid.java index 4912c160e..bf46735a4 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DseApplid.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DseApplid.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DseJavaHome.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DseJavaHome.java index 77a827d77..2bd9cc7b6 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DseJavaHome.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DseJavaHome.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DseJvmProfileDir.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DseJvmProfileDir.java index 7f18616b5..6a700bba8 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DseJvmProfileDir.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DseJvmProfileDir.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DseUssHome.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DseUssHome.java index f13172f65..27499a116 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DseUssHome.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DseUssHome.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DseVersion.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DseVersion.java index bc89a730f..b86875e8c 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DseVersion.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/DseVersion.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/ExtraBundles.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/ExtraBundles.java index 4382e6eb2..80212006f 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/ExtraBundles.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/ExtraBundles.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.internal.properties; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/ProvisionType.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/ProvisionType.java index 3d738eaf9..f0c504dd8 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/ProvisionType.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/properties/ProvisionType.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/package-info.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/package-info.java index 76a77d9a2..f0c325937 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/package-info.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/package-info.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * CICS/TS Manager * diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/BaseCicsImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/BaseCicsImpl.java index cea2a4d33..b94673d6f 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/BaseCicsImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/BaseCicsImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.spi; import dev.galasa.cicsts.CicstsManagerException; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java index e26246719..3fec117e3 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.spi; import org.apache.commons.logging.Log; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICeciProvider.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICeciProvider.java index 91a32e5bb..61d78ee56 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICeciProvider.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICeciProvider.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.spi; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICedaProvider.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICedaProvider.java index 08c6d1c28..dcc5d9f2b 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICedaProvider.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICedaProvider.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.spi; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICemtProvider.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICemtProvider.java index 2d50ca0d3..611112126 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICemtProvider.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICemtProvider.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.spi; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicsRegionLogonProvider.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicsRegionLogonProvider.java index 0f941b3b8..4adc1ef83 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicsRegionLogonProvider.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicsRegionLogonProvider.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.spi; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicsRegionProvisioned.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicsRegionProvisioned.java index 616664be7..9e1d6e681 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicsRegionProvisioned.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicsRegionProvisioned.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.spi; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicsRegionProvisioner.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicsRegionProvisioner.java index 450a8c103..5a44ecf71 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicsRegionProvisioner.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicsRegionProvisioner.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.spi; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicsResourceProvider.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicsResourceProvider.java index 9334990d4..e00ba6c00 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicsResourceProvider.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicsResourceProvider.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.spi; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicstsManagerSpi.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicstsManagerSpi.java index 6f540c1c5..3b6c79737 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicstsManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/ICicstsManagerSpi.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.spi; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/test/java/dev/galasa/tests/SampleGalasaTst.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/test/java/dev/galasa/tests/SampleGalasaTst.java index 46e9ffdfd..d8a7975e8 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/test/java/dev/galasa/tests/SampleGalasaTst.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/test/java/dev/galasa/tests/SampleGalasaTst.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.tests; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/test/java/dev/galasa/tests/TestGoldenPath.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/test/java/dev/galasa/tests/TestGoldenPath.java index 1113e27a6..ab5259ea1 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/test/java/dev/galasa/tests/TestGoldenPath.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/test/java/dev/galasa/tests/TestGoldenPath.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.tests; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/CicsBundleImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/CicsBundleImpl.java index 51bad5670..a51bc5010 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/CicsBundleImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/CicsBundleImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.resource.internal; import java.io.ByteArrayInputStream; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/CicsBundleResourceType.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/CicsBundleResourceType.java index b0ad7b621..5bf89100d 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/CicsBundleResourceType.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/CicsBundleResourceType.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.resource.internal; /** diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/CicsResourceImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/CicsResourceImpl.java index 6a4f5e983..622ba57d7 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/CicsResourceImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/CicsResourceImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.resource.internal; import java.util.Map; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/CicsResourceManagerImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/CicsResourceManagerImpl.java index 22b44f2e5..7e9d98d8c 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/CicsResourceManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/CicsResourceManagerImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.resource.internal; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmprofileImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmprofileImpl.java index 50a611b3e..440a227f9 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmprofileImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmprofileImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.resource.internal; import java.nio.file.attribute.PosixFilePermissions; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmserverImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmserverImpl.java index 96a58126e..8b5e9ce34 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmserverImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmserverImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.resource.internal; import java.io.ByteArrayOutputStream; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmserverLogImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmserverLogImpl.java index fa53643c7..c543c8cb3 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmserverLogImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmserverLogImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.resource.internal; import java.io.ByteArrayInputStream; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/package-info.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/package-info.java index 771621da5..601ff3b2b 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/package-info.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/package-info.java @@ -1,4 +1,6 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.resource.internal; \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/properties/CicstsResourcePropertiesSingleton.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/properties/CicstsResourcePropertiesSingleton.java index 13d38b443..1f617e1f7 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/properties/CicstsResourcePropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/properties/CicstsResourcePropertiesSingleton.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.resource.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/properties/DefaultResourceTimeout.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/properties/DefaultResourceTimeout.java index fad58577f..4508f45fe 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/properties/DefaultResourceTimeout.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/properties/DefaultResourceTimeout.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.resource.internal.properties; import dev.galasa.cicsts.cicsresource.CicsResourceManagerException; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/spi/ICicsResourceManagerSpi.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/spi/ICicsResourceManagerSpi.java index 78bbde1c1..7bc5ee90b 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/spi/ICicsResourceManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/spi/ICicsResourceManagerSpi.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.resource.spi; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/spi/package-info.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/spi/package-info.java index aa37a32c4..abc898288 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/spi/package-info.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/spi/package-info.java @@ -1,4 +1,6 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cicsts.resource.spi; \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudContainer.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudContainer.java index 7ca02c3b7..9fbd5f436 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudContainer.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudContainer.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cloud; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudContainerEnvProp.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudContainerEnvProp.java index d01d56c2c..46853a5ce 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudContainerEnvProp.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudContainerEnvProp.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cloud; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudContainerPort.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudContainerPort.java index 0a57a377e..055937b1f 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudContainerPort.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudContainerPort.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cloud; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudManagerException.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudManagerException.java index 4dd8ac000..51b8191b9 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudManagerException.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudManagerException.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cloud; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudManagerField.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudManagerField.java index b008d1565..de3ed74f2 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudManagerField.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudManagerField.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cloud; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/ICloudContainer.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/ICloudContainer.java index ccd15ce56..1f1bcfa02 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/ICloudContainer.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/ICloudContainer.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cloud; import java.net.InetSocketAddress; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/CloudContainerPortImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/CloudContainerPortImpl.java index 6a605a039..f283577ac 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/CloudContainerPortImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/CloudContainerPortImpl.java @@ -1,5 +1,7 @@ /* - * Copyright contributors to the Galasa project + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cloud.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/CloudManagerImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/CloudManagerImpl.java index 8356dd6d7..9ee52b4f0 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/CloudManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/CloudManagerImpl.java @@ -1,5 +1,7 @@ /* - * Copyright contributors to the Galasa project + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cloud.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/properties/CloudPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/properties/CloudPropertiesSingleton.java index 111172ea3..277e75b5d 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/properties/CloudPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/properties/CloudPropertiesSingleton.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cloud.internal.properties; import org.osgi.service.component.annotations.Activate; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/properties/ContainerOverrideImage.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/properties/ContainerOverrideImage.java index bf0a24673..e3bac14bb 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/properties/ContainerOverrideImage.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/properties/ContainerOverrideImage.java @@ -1,5 +1,7 @@ /* - * Copyright contributors to the Galasa project + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cloud.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/properties/ContainerOverridePlatform.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/properties/ContainerOverridePlatform.java index 3d5d3e81b..0aa1e98d6 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/properties/ContainerOverridePlatform.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/properties/ContainerOverridePlatform.java @@ -1,5 +1,7 @@ /* - * Copyright contributors to the Galasa project + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cloud.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/properties/DefaultPlatform.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/properties/DefaultPlatform.java index 563023aa6..6df32695f 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/properties/DefaultPlatform.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/properties/DefaultPlatform.java @@ -1,5 +1,7 @@ /* - * Copyright contributors to the Galasa project + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.cloud.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/spi/ICloudContainerPort.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/spi/ICloudContainerPort.java index 74306558f..c285ba085 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/spi/ICloudContainerPort.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/spi/ICloudContainerPort.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cloud.spi; public interface ICloudContainerPort { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/spi/ICloudContainerProvider.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/spi/ICloudContainerProvider.java index aa8e5fb0b..548ed7d63 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/spi/ICloudContainerProvider.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/spi/ICloudContainerProvider.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cloud.spi; import java.util.Properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/spi/ICloudManagerSpi.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/spi/ICloudManagerSpi.java index 7c350f8fe..168859536 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/spi/ICloudManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/spi/ICloudManagerSpi.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cloud.spi; import java.util.Properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/java/dev/galasa/docker/manager/ivt/DockerManagerIVT.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/java/dev/galasa/docker/manager/ivt/DockerManagerIVT.java index dc3af3ea5..6b32219d9 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/java/dev/galasa/docker/manager/ivt/DockerManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/java/dev/galasa/docker/manager/ivt/DockerManagerIVT.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.docker.manager.ivt; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/java/dev/galasa/docker/manager/ivt/IvtException.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/java/dev/galasa/docker/manager/ivt/IvtException.java index 16b446613..db58d1d71 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/java/dev/galasa/docker/manager/ivt/IvtException.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/java/dev/galasa/docker/manager/ivt/IvtException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.manager.ivt; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerContainer.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerContainer.java index 38d7f08e4..1ab18f38a 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerContainer.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerContainer.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerContainerConfig.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerContainerConfig.java index 0a8ddb010..35c771396 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerContainerConfig.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerContainerConfig.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerEngine.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerEngine.java index 87ae973d0..c516d79f9 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerEngine.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerEngine.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerManagerException.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerManagerException.java index acf62e2cc..66113eaec 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerManagerException.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerManagerException.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerNotFoundException.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerNotFoundException.java index 44bcb49ea..a333e91f0 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerNotFoundException.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerNotFoundException.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerProvisionException.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerProvisionException.java index f2cc25367..528c9b642 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerProvisionException.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerProvisionException.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerVolume.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerVolume.java index 7d148e8b3..3c1ee611c 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerVolume.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/DockerVolume.java @@ -1,7 +1,8 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ - package dev.galasa.docker; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainer.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainer.java index 79150541a..a277fb4ab 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainer.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainer.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.docker; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainerConfig.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainerConfig.java index 5855701a2..1bdd9e310 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainerConfig.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainerConfig.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerEngine.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerEngine.java index 97c9fe8b7..de7b20d17 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerEngine.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerEngine.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerExec.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerExec.java index 32dfca368..2e178ffbf 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerExec.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerExec.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerImage.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerImage.java index 872a93afb..3540ce7fb 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerImage.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerImage.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerManager.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerManager.java index 06f2b8d41..a973fe65c 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerManager.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerManager.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerVolume.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerVolume.java index d27734d7c..fc9636bdd 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerVolume.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerVolume.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.docker; import java.io.InputStream; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerConfigImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerConfigImpl.java index fa9504302..9fe740efe 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerConfigImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerConfigImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerImpl.java index 79c7d75e6..bd5571d88 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.docker.internal; import java.io.BufferedInputStream; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerResourceMonitor.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerResourceMonitor.java index 4bed38a19..9fd904b8c 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerResourceMonitor.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerEngineImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerEngineImpl.java index 990c28ef4..5555aa703 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerEngineImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerEngineImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerEnvironment.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerEnvironment.java index ea5d49586..bdcce9297 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerEnvironment.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerEnvironment.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.docker.internal; import java.time.Instant; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerExecImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerExecImpl.java index 777fabe5c..fc64c108d 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerExecImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerExecImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.docker.internal; import java.io.IOException; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerImageBuilderImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerImageBuilderImpl.java index 279200ce7..afb75c5a6 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerImageBuilderImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerImageBuilderImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.docker.internal; import java.io.BufferedOutputStream; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerImageImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerImageImpl.java index f4b785a73..cf9ea85c7 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerImageImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerImageImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerField.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerField.java index 8aea08519..5ed700f13 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerField.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerField.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerImpl.java index ee455dd99..cf7273976 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.docker.internal; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerRegistryImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerRegistryImpl.java index 573dd795e..86a4bbeb7 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerRegistryImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerRegistryImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerResourceManagement.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerResourceManagement.java index ef88717ed..30ba3a5c4 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerResourceManagement.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerSlotImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerSlotImpl.java index 6aaa496b3..94796a8b0 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerSlotImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerSlotImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerSlotResourceMonitor.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerSlotResourceMonitor.java index 33be01846..6aad5dd92 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerSlotResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerSlotResourceMonitor.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerVolumeImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerVolumeImpl.java index 3860f3e51..ba49967b4 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerVolumeImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerVolumeImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.docker.internal; import java.io.ByteArrayInputStream; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerVolumeResourceMonitor.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerVolumeResourceMonitor.java index da26c3fe4..16e38bf74 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerVolumeResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerVolumeResourceMonitor.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/IDockerEnvironment.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/IDockerEnvironment.java index de302bfdc..31eca75e7 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/IDockerEnvironment.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/IDockerEnvironment.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.docker.internal; import java.util.Collection; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/IDockerImageBuilder.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/IDockerImageBuilder.java index b8ab0cbcf..cce6b4e87 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/IDockerImageBuilder.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/IDockerImageBuilder.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.docker.internal; import java.io.InputStream; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/json/DockerContainerJSON.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/json/DockerContainerJSON.java index e9a986ad2..6671c5c42 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/json/DockerContainerJSON.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/json/DockerContainerJSON.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/json/DockerContainerLabels.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/json/DockerContainerLabels.java index f5cc39c17..cfd303cd8 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/json/DockerContainerLabels.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/json/DockerContainerLabels.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerDSEEngine.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerDSEEngine.java index f3289ea31..241cd4d01 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerDSEEngine.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerDSEEngine.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEngine.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEngine.java index c02147f61..5f1100f23 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEngine.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEngine.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEnginePort.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEnginePort.java index 641467686..e890d1320 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEnginePort.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEnginePort.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEngines.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEngines.java index 3b5585bb4..a9080c8ba 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEngines.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerEngines.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerImagePrefix.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerImagePrefix.java index a1f53a368..3a041bb60 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerImagePrefix.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerImagePrefix.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerLeaveRunning.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerLeaveRunning.java index 354228853..ca1338fb7 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerLeaveRunning.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerLeaveRunning.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.docker.internal.properties; import java.util.Map; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerPropertiesSingleton.java index 36b9c7d3b..89975ef6e 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerPropertiesSingleton.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistry.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistry.java index 7aedb9bfd..385c690ec 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistry.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistry.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistryCredentials.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistryCredentials.java index 461b5b43d..553e4819b 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistryCredentials.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistryCredentials.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistryURL.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistryURL.java index c87c5c36f..e508bdf26 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistryURL.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerRegistryURL.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerSlots.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerSlots.java index 8f444bc43..24e19bd2d 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerSlots.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/properties/DockerSlots.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/package-info.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/package-info.java index 553f0bd8e..03b282d04 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/package-info.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/package-info.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ /** * Docker Manager diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/spi/IDockerManagerSpi.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/spi/IDockerManagerSpi.java index a2b09f908..c850659ef 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/spi/IDockerManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/spi/IDockerManagerSpi.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.docker.spi; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/test/java/dev/galasa/docker/internal/TestDockerRegistryImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/test/java/dev/galasa/docker/internal/TestDockerRegistryImpl.java index 8fe2207ff..74196d93a 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/test/java/dev/galasa/docker/internal/TestDockerRegistryImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/test/java/dev/galasa/docker/internal/TestDockerRegistryImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.docker.internal; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.times; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/java/dev/galasa/kubernetes/manager/ivt/IvtException.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/java/dev/galasa/kubernetes/manager/ivt/IvtException.java index 5a5d4412b..b436df124 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/java/dev/galasa/kubernetes/manager/ivt/IvtException.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/java/dev/galasa/kubernetes/manager/ivt/IvtException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.manager.ivt; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/java/dev/galasa/kubernetes/manager/ivt/KubernetesManagerIVT.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/java/dev/galasa/kubernetes/manager/ivt/KubernetesManagerIVT.java index dfbef5d19..fdc852cb1 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/java/dev/galasa/kubernetes/manager/ivt/KubernetesManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/java/dev/galasa/kubernetes/manager/ivt/KubernetesManagerIVT.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.manager.ivt; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testConfigMap.yaml b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testConfigMap.yaml index 97b27c2b0..cdb2e1fc8 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testConfigMap.yaml +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testConfigMap.yaml @@ -1,4 +1,9 @@ +# # Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: v1 kind: ConfigMap metadata: diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testDeployment.yaml b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testDeployment.yaml index 1b69990ea..ae8c6da4a 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testDeployment.yaml +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testDeployment.yaml @@ -1,4 +1,9 @@ +# # Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testPvc.yaml b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testPvc.yaml index 6dc9f9fe9..b8b492dfe 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testPvc.yaml +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testPvc.yaml @@ -1,4 +1,9 @@ +# # Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: v1 kind: PersistentVolumeClaim metadata: diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testSecret.yaml b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testSecret.yaml index 075440bba..fb0caea30 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testSecret.yaml +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testSecret.yaml @@ -1,4 +1,9 @@ +# # Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: v1 kind: Secret metadata: diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testService.yaml b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testService.yaml index 1a259d912..1e08e9776 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testService.yaml +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testService.yaml @@ -1,4 +1,9 @@ +# # Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: v1 kind: Service metadata: diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testStatefulSet.yaml b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testStatefulSet.yaml index 4b8ad07a7..8abf701c0 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testStatefulSet.yaml +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testStatefulSet.yaml @@ -1,4 +1,9 @@ +# # Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: apps/v1 kind: StatefulSet metadata: diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/examples/namespaces.yaml b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/examples/namespaces.yaml index 9a46bfde3..1b5a13b6e 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/examples/namespaces.yaml +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/examples/namespaces.yaml @@ -1,4 +1,9 @@ -#Create a number of namespaces to be used by Galasa +# +# Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: v1 kind: Namespace metadata: diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/examples/rbac.yaml b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/examples/rbac.yaml index 760a7659e..8069cf64b 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/examples/rbac.yaml +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/examples/rbac.yaml @@ -1,3 +1,8 @@ +# +# Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IConfigMap.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IConfigMap.java index a50661e33..6783d6eb6 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IConfigMap.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IConfigMap.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IDeployment.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IDeployment.java index 02a66986c..a5fe8a97f 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IDeployment.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IDeployment.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IKubernetesNamespace.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IKubernetesNamespace.java index 4d13b5ff3..32150d827 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IKubernetesNamespace.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IKubernetesNamespace.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IPersistentVolumeClaim.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IPersistentVolumeClaim.java index 4368873d6..5c5765447 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IPersistentVolumeClaim.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IPersistentVolumeClaim.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IPodLog.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IPodLog.java index 69237df02..40fae3cd3 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IPodLog.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IPodLog.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IReplicaSet.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IReplicaSet.java index 120a38ac1..f00c574c2 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IReplicaSet.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IReplicaSet.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IResource.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IResource.java index 3cf7e00a9..021680749 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IResource.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IResource.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/ISecret.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/ISecret.java index 246f83448..d25515173 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/ISecret.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/ISecret.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IService.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IService.java index 771f45d81..84227c42e 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IService.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IService.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IStatefulSet.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IStatefulSet.java index 8d58423a7..bc842160a 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IStatefulSet.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IStatefulSet.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/KubernetesManagerException.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/KubernetesManagerException.java index 29cbe65d8..34439aee1 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/KubernetesManagerException.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/KubernetesManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/KubernetesNamespace.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/KubernetesNamespace.java index 27e7aa014..fac8bf3ec 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/KubernetesNamespace.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/KubernetesNamespace.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesClusterImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesClusterImpl.java index 3eb4135db..a8e2c398a 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesClusterImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesClusterImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesManagerField.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesManagerField.java index 4016f1ebb..6e3dbe92a 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesManagerField.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesManagerField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesManagerImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesManagerImpl.java index 8371ffb54..d26ff0df7 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesManagerImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesNamespaceImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesNamespaceImpl.java index e20e5ddb2..ea2a53705 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesNamespaceImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesNamespaceImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesNamespaceResourceMonitor.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesNamespaceResourceMonitor.java index 051e3ac60..7cb9c47fa 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesNamespaceResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesNamespaceResourceMonitor.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesResourceManagement.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesResourceManagement.java index b175c9bb6..42743606c 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesResourceManagement.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesClusters.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesClusters.java index b6f74ac14..b6b0fa0c2 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesClusters.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesClusters.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesCredentials.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesCredentials.java index c6cc87c5b..b08193ab5 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesCredentials.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesCredentials.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesMaxSlots.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesMaxSlots.java index 6c8453757..748931be7 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesMaxSlots.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesMaxSlots.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesNamespaceTagSharedEnvironment.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesNamespaceTagSharedEnvironment.java index c52ad3646..8bfcbc29c 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesNamespaceTagSharedEnvironment.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesNamespaceTagSharedEnvironment.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesNamespaces.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesNamespaces.java index 76f1867cd..65d774566 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesNamespaces.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesNamespaces.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesNodePortProxy.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesNodePortProxy.java index b506846c5..8738f4f8a 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesNodePortProxy.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesNodePortProxy.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesPropertiesSingleton.java index cb06105da..c0b1a34dc 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesPropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesStorageClass.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesStorageClass.java index 34e2484f8..0b6dae0b1 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesStorageClass.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesStorageClass.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesUrl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesUrl.java index 850d8abcf..597f9c4f9 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesUrl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesUrl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesValidateCertificate.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesValidateCertificate.java index 27cd6835c..93e98200c 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesValidateCertificate.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesValidateCertificate.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ConfigMapImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ConfigMapImpl.java index fd4c4238a..05626c309 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ConfigMapImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ConfigMapImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal.resources; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/DeploymentImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/DeploymentImpl.java index 9cbef09b7..c875a4315 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/DeploymentImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/DeploymentImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal.resources; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/PersistentVolumeClaimImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/PersistentVolumeClaimImpl.java index 10146fbff..2c8020d7d 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/PersistentVolumeClaimImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/PersistentVolumeClaimImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal.resources; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/PodLogImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/PodLogImpl.java index 256ec2a11..3430b4733 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/PodLogImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/PodLogImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal.resources; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ReplicaSetHolder.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ReplicaSetHolder.java index d66117775..28e629367 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ReplicaSetHolder.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ReplicaSetHolder.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal.resources; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/SecretImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/SecretImpl.java index f76dce47c..33b38de15 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/SecretImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/SecretImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal.resources; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ServiceImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ServiceImpl.java index d5ee2c5c0..484cc8fe4 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ServiceImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ServiceImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal.resources; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/StatefulSetImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/StatefulSetImpl.java index b4c745904..c0b4a31f8 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/StatefulSetImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/StatefulSetImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal.resources; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/Utility.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/Utility.java index fab9b6e3a..58b013937 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/Utility.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/Utility.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.internal.resources; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/package-info.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/package-info.java index bafad6750..e62a98738 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/package-info.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/package-info.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * Kubernetes Manager * diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/spi/IKubernetesManagerSpi.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/spi/IKubernetesManagerSpi.java index e59c0fb11..e7c712ec4 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/spi/IKubernetesManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/spi/IKubernetesManagerSpi.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.kubernetes.spi; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/ILibertyServer.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/ILibertyServer.java index 11ecf0f0a..77f809da1 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/ILibertyServer.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/ILibertyServer.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.liberty; public interface ILibertyServer { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/ILibertyServerXml.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/ILibertyServerXml.java index eaa9fc043..227107ff4 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/ILibertyServerXml.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/ILibertyServerXml.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.liberty; public interface ILibertyServerXml { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/LibertyManagerException.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/LibertyManagerException.java index d541e2d2d..5835f2151 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/LibertyManagerException.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/LibertyManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.liberty; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/LibertyServerException.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/LibertyServerException.java index d2b308fe0..c4b085a31 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/LibertyServerException.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/LibertyServerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.liberty; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/package-info.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/package-info.java index fb6cb951b..3ccfdc221 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/package-info.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/package-info.java @@ -1,6 +1,6 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.liberty; \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/spi/ILibertyServerSpi.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/spi/ILibertyServerSpi.java index 1ad9e3d78..6d011bd49 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/spi/ILibertyServerSpi.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/spi/ILibertyServerSpi.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.liberty.spi; public interface ILibertyServerSpi { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/spi/package-info.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/spi/package-info.java index 2b60015ad..6e10b8f91 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/spi/package-info.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.liberty.manager/src/main/java/dev/galasa/liberty/spi/package-info.java @@ -1,6 +1,6 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.liberty.spi; \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/OpenstackLinuxManagerException.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/OpenstackLinuxManagerException.java index 2ebd97dbe..cca46253d 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/OpenstackLinuxManagerException.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/OpenstackLinuxManagerException.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.openstack.manager; import dev.galasa.linux.LinuxManagerException; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/OpenstackManagerException.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/OpenstackManagerException.java index e5dc0ff91..31d86e364 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/OpenstackManagerException.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/OpenstackManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/OpenstackWindowsManagerException.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/OpenstackWindowsManagerException.java index 18899b423..512776c2f 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/OpenstackWindowsManagerException.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/OpenstackWindowsManagerException.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.openstack.manager; import dev.galasa.windows.WindowsManagerException; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/FloatingIpResourceMonitor.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/FloatingIpResourceMonitor.java index 209116ab0..a0f77cf22 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/FloatingIpResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/FloatingIpResourceMonitor.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java index bf3018754..5707b3619 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.openstack.manager.internal; import java.time.ZonedDateTime; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackIpHost.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackIpHost.java index e1be1dfea..225cd50ab 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackIpHost.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackIpHost.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackLinuxImageImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackLinuxImageImpl.java index 1c85bca75..b4f735753 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackLinuxImageImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackLinuxImageImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.openstack.manager.internal; import java.nio.file.FileSystem; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackManagerImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackManagerImpl.java index 378729c0f..4097363d6 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackManagerImpl.java @@ -1,5 +1,7 @@ /* - * Copyright contributors to the Galasa project + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackResourceManagement.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackResourceManagement.java index 74c515fd5..52899b9da 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackResourceManagement.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackServerImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackServerImpl.java index c3e340980..d7c4598da 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackServerImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackServerImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.openstack.manager.internal; import java.security.SecureRandom; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackToken.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackToken.java index 04d98545c..4e76ce220 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackToken.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackToken.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackUsernamePasswordCredentials.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackUsernamePasswordCredentials.java index 86781ccff..2ef03dffa 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackUsernamePasswordCredentials.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackUsernamePasswordCredentials.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackWindowsImageImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackWindowsImageImpl.java index 003e42a2d..62de4ff67 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackWindowsImageImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackWindowsImageImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.openstack.manager.internal; import java.nio.file.FileSystem; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/ServerResourceMonitor.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/ServerResourceMonitor.java index 0ff7eb021..6021a0a25 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/ServerResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/ServerResourceMonitor.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Api.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Api.java index 91e15ff89..bdabefa0a 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Api.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Api.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Auth.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Auth.java index 4ec13dd53..853ca2f62 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Auth.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Auth.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/AuthTokenResponse.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/AuthTokenResponse.java index 0afe76399..3195122c3 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/AuthTokenResponse.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/AuthTokenResponse.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/AuthTokens.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/AuthTokens.java index 052a8889c..365ffab1d 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/AuthTokens.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/AuthTokens.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/DnsAssignment.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/DnsAssignment.java index 352c8a87b..d50dc8818 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/DnsAssignment.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/DnsAssignment.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Domain.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Domain.java index 29b4d1858..0d7e92f4f 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Domain.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Domain.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Endpoint.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Endpoint.java index d418ce919..f26c8ca87 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Endpoint.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Endpoint.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Flavor.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Flavor.java index b7c6bc886..8d876ee0d 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Flavor.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Flavor.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Flavors.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Flavors.java index d057d8542..afca90b93 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Flavors.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Flavors.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Floatingip.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Floatingip.java index ccde3eb14..5b5c691fb 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Floatingip.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Floatingip.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/FloatingipRequestResponse.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/FloatingipRequestResponse.java index 7a8e7d08c..a188e33c1 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/FloatingipRequestResponse.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/FloatingipRequestResponse.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Floatingips.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Floatingips.java index dffe233b7..6edc60758 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Floatingips.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Floatingips.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/GalasaMetadata.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/GalasaMetadata.java index 1a42f1ee5..49ebb6167 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/GalasaMetadata.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/GalasaMetadata.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Identity.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Identity.java index 5582ba13a..c3e2a32cd 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Identity.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Identity.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Image.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Image.java index b44152bb4..6ff9e0af1 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Image.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Image.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Images.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Images.java index d230be4c3..e4f011428 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Images.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Images.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Network.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Network.java index da2d0816e..b8afc1289 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Network.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Network.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Networks.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Networks.java index 3e3c26969..aeafd7b43 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Networks.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Networks.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Password.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Password.java index 7d044962c..e08e4df1f 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Password.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Password.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Port.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Port.java index 24293d50c..b7c45ffab 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Port.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Port.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/PortsResponse.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/PortsResponse.java index b998ae4bd..140bfa21a 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/PortsResponse.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/PortsResponse.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Project.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Project.java index 0f87c776c..3182ac79c 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Project.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Project.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Scope.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Scope.java index fdb67351e..0a1ccf7ef 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Scope.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Scope.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/SecurityGroup.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/SecurityGroup.java index 6c9e0474a..b18d15359 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/SecurityGroup.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/SecurityGroup.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Server.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Server.java index 74150f394..51fd5114e 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Server.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Server.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/ServerRequest.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/ServerRequest.java index 4134037bc..002c04961 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/ServerRequest.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/ServerRequest.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/ServerResponse.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/ServerResponse.java index c5adbe86d..2a5b2a1f4 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/ServerResponse.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/ServerResponse.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/ServersResponse.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/ServersResponse.java index 27e5269cf..312aa906f 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/ServersResponse.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/ServersResponse.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Token.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Token.java index 9578abc78..511645f7b 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Token.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/Token.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/User.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/User.java index e573db28e..60dbf52cd 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/User.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/User.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.json; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/package-info.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/package-info.java index 7003c1960..b478ac325 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/package-info.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/json/package-info.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * OpenStack Manager - OpenStack API JSON POJOs */ diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/package-info.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/package-info.java index 02a5cd87c..55fef2ae7 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/package-info.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/package-info.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * OpenStack Manager - Internal */ diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/BuildTimeout.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/BuildTimeout.java index f14889f4d..2ddc012be 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/BuildTimeout.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/BuildTimeout.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxArchivesDirectory.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxArchivesDirectory.java index 120eb1279..00a1dcd21 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxArchivesDirectory.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxArchivesDirectory.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxAvailablityZone.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxAvailablityZone.java index 9320d0f1d..3c6c3e152 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxAvailablityZone.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxAvailablityZone.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxCredentials.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxCredentials.java index 9b138d104..d5e528fb6 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxCredentials.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxCredentials.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxFlavor.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxFlavor.java index ed305d811..2856f29b3 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxFlavor.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxFlavor.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImageCapabilities.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImageCapabilities.java index 943b9723a..ba34338dc 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImageCapabilities.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImageCapabilities.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImages.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImages.java index e56fb5445..e1de464dd 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImages.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImages.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxKeyPair.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxKeyPair.java index 2c4d98edf..194017c00 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxKeyPair.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxKeyPair.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxName.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxName.java index 7f6515bcd..35097ccde 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxName.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxName.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxSecurityGroups.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxSecurityGroups.java index 2e599f9ae..234545f8d 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxSecurityGroups.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxSecurityGroups.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/MaximumInstances.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/MaximumInstances.java index 9d89fd910..c02bf59b2 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/MaximumInstances.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/MaximumInstances.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/NamePool.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/NamePool.java index 6fd1536a2..f7d5afc4f 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/NamePool.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/NamePool.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackCredentialsId.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackCredentialsId.java index 9813a8643..2548ae994 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackCredentialsId.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackCredentialsId.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackDomainName.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackDomainName.java index ce2a1ad1f..177150713 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackDomainName.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackDomainName.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackEnabled.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackEnabled.java index faf9e5304..20bf5451d 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackEnabled.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackEnabled.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackIdentityUri.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackIdentityUri.java index 4994fd715..02e1a4d75 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackIdentityUri.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackIdentityUri.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackLinuxPriority.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackLinuxPriority.java index 8df76cc80..d9636e65f 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackLinuxPriority.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackLinuxPriority.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackProjectName.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackProjectName.java index 20cb21f5e..7e0613737 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackProjectName.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackProjectName.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenstackPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenstackPropertiesSingleton.java index a20413d3b..674ac3923 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenstackPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenstackPropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsAvailablityZone.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsAvailablityZone.java index c049d85bc..1497b7569 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsAvailablityZone.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsAvailablityZone.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsCredentials.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsCredentials.java index a2979af57..2466ca93f 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsCredentials.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsCredentials.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsFlavor.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsFlavor.java index 2abc0a9e1..bfccbf9c8 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsFlavor.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsFlavor.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImageCapabilities.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImageCapabilities.java index 3925211d7..9131ee276 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImageCapabilities.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImageCapabilities.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImages.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImages.java index 6a6869d2d..102b19746 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImages.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImages.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsKeyPair.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsKeyPair.java index be5909c13..c25d8e9dd 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsKeyPair.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsKeyPair.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsName.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsName.java index 8ec78144f..98b3e2a49 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsName.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsName.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsSecurityGroups.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsSecurityGroups.java index 24e9ead69..e21e5b980 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsSecurityGroups.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsSecurityGroups.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.openstack.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/package-info.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/package-info.java index 4627305fe..24668df1d 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/package-info.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/package-info.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * OpenStack Manager - CPS Properties * diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/package-info.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/package-info.java index 6e7de7cc0..5ada464c0 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/package-info.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/package-info.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ /** * Open Stack Manager diff --git a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/src/main/java/dev/galasa/common/SSLTLSContextNameSelector.java b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/src/main/java/dev/galasa/common/SSLTLSContextNameSelector.java index 5d1258454..e4fa05850 100644 --- a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/src/main/java/dev/galasa/common/SSLTLSContextNameSelector.java +++ b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/src/main/java/dev/galasa/common/SSLTLSContextNameSelector.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.common; diff --git a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/src/test/java/dev/galasa/common/SSLTLSContextNameSelectorTest.java b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/src/test/java/dev/galasa/common/SSLTLSContextNameSelectorTest.java index b683c84a7..e0f7f2482 100644 --- a/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/src/test/java/dev/galasa/common/SSLTLSContextNameSelectorTest.java +++ b/galasa-managers-parent/galasa-managers-common-parent/dev.galasa.common/src/test/java/dev/galasa/common/SSLTLSContextNameSelectorTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.common; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/src/main/java/dev/galasa/http/manager/ivt/HttpManagerIVT.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/src/main/java/dev/galasa/http/manager/ivt/HttpManagerIVT.java index d414d8c30..ad8c389b4 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/src/main/java/dev/galasa/http/manager/ivt/HttpManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/src/main/java/dev/galasa/http/manager/ivt/HttpManagerIVT.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.http.manager.ivt; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/ContentType.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/ContentType.java index 30cd84426..e5e2b17a0 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/ContentType.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/ContentType.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.http; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClient.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClient.java index 58afae708..c083e0508 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClient.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClient.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.http; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientException.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientException.java index 0aed6b1a9..8367b98fc 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientException.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.http; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java index 7c35bf650..76f9380bf 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.http; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpClient.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpClient.java index f08e00c9f..5e03102ef 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpClient.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpClient.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019-2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.http; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpManager.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpManager.java index 5302db515..f0fc54e23 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpManager.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpManager.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.http; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/StandAloneHttpClient.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/StandAloneHttpClient.java index 48bd2584b..56efbe277 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/StandAloneHttpClient.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/StandAloneHttpClient.java @@ -1,9 +1,15 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.http; import org.apache.commons.logging.Log; import dev.galasa.http.internal.HttpClientImpl; + /** * This is a class to allow the HTTP manager implementations be used without the need for the manager to be active */ diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/ClientAuthTrustManager.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/ClientAuthTrustManager.java index 6848cc7e5..b905fe774 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/ClientAuthTrustManager.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/ClientAuthTrustManager.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.http.internal; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientImpl.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientImpl.java index 06914da8b..41837df46 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientImpl.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.http.internal; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientRequest.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientRequest.java index 81c8f7fbf..b3e571501 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientRequest.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientRequest.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.http.internal; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpManagerField.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpManagerField.java index 02755aa57..77ae17507 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpManagerField.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpManagerField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.http.internal; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpManagerImpl.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpManagerImpl.java index 87633c5fe..550050246 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpManagerImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.http.internal; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/RequestPart.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/RequestPart.java index 3fe4f60f5..b3bff83f2 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/RequestPart.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/RequestPart.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.http.internal; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/VeryTrustingTrustManager.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/VeryTrustingTrustManager.java index 89774ea76..da37ba933 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/VeryTrustingTrustManager.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/VeryTrustingTrustManager.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.http.internal; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/package-info.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/package-info.java index 31b4b4b8d..eb8d41c99 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/package-info.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/package-info.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ /** * HTTP Client Manager diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/spi/IHttpManagerSpi.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/spi/IHttpManagerSpi.java index bee59d266..35ef71be4 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/spi/IHttpManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/spi/IHttpManagerSpi.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.http.spi; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/test/java/test/force/codecoverage/ExceptionsTest.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/test/java/test/force/codecoverage/ExceptionsTest.java index bf6f44386..7590164c8 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/test/java/test/force/codecoverage/ExceptionsTest.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/test/java/test/force/codecoverage/ExceptionsTest.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package test.force.codecoverage; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/ICommandShell.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/ICommandShell.java index 1ba4ab031..b9a9b7679 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/ICommandShell.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/ICommandShell.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IFileProcessor.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IFileProcessor.java index 3c6573376..301354555 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IFileProcessor.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IFileProcessor.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IIpHost.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IIpHost.java index d27a0b6cf..eafe4d00a 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IIpHost.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IIpHost.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IIpPort.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IIpPort.java index 79fc0d54d..78a181fde 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IIpPort.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IIpPort.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IpNetworkManagerException.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IpNetworkManagerException.java index d4b1f013c..3c38d4295 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IpNetworkManagerException.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IpNetworkManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/SSHAuthFailException.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/SSHAuthFailException.java index 8bab7b76c..4fd3663ea 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/SSHAuthFailException.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/SSHAuthFailException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/SSHException.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/SSHException.java index 1f86c30c1..c30633321 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/SSHException.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/SSHException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/IpNetworkManagerImpl.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/IpNetworkManagerImpl.java index ea3442963..2607e6532 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/IpNetworkManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/IpNetworkManagerImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork.internal; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/IpNetworkResourceManagement.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/IpNetworkResourceManagement.java index a781355c6..2f35082cc 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/IpNetworkResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/IpNetworkResourceManagement.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork.internal; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/IpPortImpl.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/IpPortImpl.java index 8bc9ff139..3332f93f4 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/IpPortImpl.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/IpPortImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork.internal; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/PortResourceMonitor.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/PortResourceMonitor.java index a88adec36..8dce94c36 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/PortResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/PortResourceMonitor.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork.internal; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHBasicAttributes.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHBasicAttributes.java index 267eb7bd6..e94a0aec3 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHBasicAttributes.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHBasicAttributes.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork.internal.ssh.filesystem; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHBasicAttributesView.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHBasicAttributesView.java index e8f120537..f57790cf7 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHBasicAttributesView.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHBasicAttributesView.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork.internal.ssh.filesystem; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHByteChannel.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHByteChannel.java index 354ebe110..d39c0fa28 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHByteChannel.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHByteChannel.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020,2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork.internal.ssh.filesystem; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHDirectoryStream.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHDirectoryStream.java index 6e49e6eba..0a54ea904 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHDirectoryStream.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHDirectoryStream.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork.internal.ssh.filesystem; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHFileStore.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHFileStore.java index 0c378c99c..449f252c2 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHFileStore.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHFileStore.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork.internal.ssh.filesystem; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHFileSystem.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHFileSystem.java index eb4ee2bdf..1aa404da9 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHFileSystem.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHFileSystem.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork.internal.ssh.filesystem; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHFileSystemProvider.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHFileSystemProvider.java index 9aca54b94..7a4a3b1a3 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHFileSystemProvider.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHFileSystemProvider.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019-2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork.internal.ssh.filesystem; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHPath.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHPath.java index 118f42d8c..ead811d4d 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHPath.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHPath.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019-2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork.internal.ssh.filesystem; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/package-info.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/package-info.java index caf2b03dc..5bd1a06e6 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/package-info.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/package-info.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ /** * IP Network Manager diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/AbstractGenericIpHost.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/AbstractGenericIpHost.java index a87f0e3f8..c0f9a1775 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/AbstractGenericIpHost.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/AbstractGenericIpHost.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.ipnetwork.spi; import javax.validation.constraints.NotNull; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/AnsiEscapeSequences.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/AnsiEscapeSequences.java index 05a899f08..462bc6d54 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/AnsiEscapeSequences.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/AnsiEscapeSequences.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork.spi; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/IIpHostSpi.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/IIpHostSpi.java index 24e983150..5162a8594 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/IIpHostSpi.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/IIpHostSpi.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork.spi; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/IIpNetworkManagerSpi.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/IIpNetworkManagerSpi.java index 1d97a8494..6e8a058b0 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/IIpNetworkManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/IIpNetworkManagerSpi.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork.spi; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/SSHClient.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/SSHClient.java index d74d490ba..c25c254b1 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/SSHClient.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/SSHClient.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.ipnetwork.spi; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/src/main/java/dev/galasa/mq/manager/ivt/MqManagerIVT.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/src/main/java/dev/galasa/mq/manager/ivt/MqManagerIVT.java index a404ff20e..e261d0017 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/src/main/java/dev/galasa/mq/manager/ivt/MqManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager.ivt/src/main/java/dev/galasa/mq/manager/ivt/MqManagerIVT.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.mq.manager.ivt; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/IMessageQueue.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/IMessageQueue.java index 4ab00ff40..c03cc06aa 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/IMessageQueue.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/IMessageQueue.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.mq; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/IMessageQueueManager.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/IMessageQueueManager.java index 427f066f9..153977c83 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/IMessageQueueManager.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/IMessageQueueManager.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.mq; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/MqManagerException.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/MqManagerException.java index 31cc80717..110c397d8 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/MqManagerException.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/MqManagerException.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.mq; import dev.galasa.ManagerException; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/MqManagerField.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/MqManagerField.java index 6a161c005..6bdd3a02c 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/MqManagerField.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/MqManagerField.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.mq; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/Queue.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/Queue.java index 5769e2b35..d9f45d4d8 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/Queue.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/Queue.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.mq; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/QueueManager.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/QueueManager.java index 3dd071dda..d9488572b 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/QueueManager.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/QueueManager.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.mq; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/MQManagerImpl.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/MQManagerImpl.java index e88c73ee1..f0008ac31 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/MQManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/MQManagerImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.mq.internal; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/MessageDirection.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/MessageDirection.java index b6b656466..e9c5615b6 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/MessageDirection.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/MessageDirection.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.mq.internal; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/MessageQueueImpl.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/MessageQueueImpl.java index 92e232020..7b59a4f4a 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/MessageQueueImpl.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/MessageQueueImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.mq.internal; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/MessageQueueManagerImpl.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/MessageQueueManagerImpl.java index a56f21a9d..28f184ef2 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/MessageQueueManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/MessageQueueManagerImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.mq.internal; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstanceChannelName.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstanceChannelName.java index 7316a102d..29700a389 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstanceChannelName.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstanceChannelName.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.mq.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstanceCredentials.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstanceCredentials.java index 7c334e613..60d6e72fc 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstanceCredentials.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstanceCredentials.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.mq.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstanceForTag.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstanceForTag.java index 51ecd4ae4..422d2ecae 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstanceForTag.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstanceForTag.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.mq.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstanceHost.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstanceHost.java index 6a6473ee1..c0969c099 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstanceHost.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstanceHost.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.mq.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstanceName.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstanceName.java index 5373bf762..e5c558628 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstanceName.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstanceName.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.mq.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstancePort.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstancePort.java index b2aeb0fa6..75d7d5ca4 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstancePort.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/InstancePort.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.mq.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/MqPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/MqPropertiesSingleton.java index d111ac4b3..52fdaead5 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/MqPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/MqPropertiesSingleton.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.mq.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/QueueNameForTag.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/QueueNameForTag.java index c5f749421..b2c39091b 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/QueueNameForTag.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/internal/properties/QueueNameForTag.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.mq.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/package-info.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/package-info.java index da92690ff..a7aba53a3 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/package-info.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/package-info.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ /** * Message Queueing Manager diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/java/dev/galasa/artifact/manager/ivt/ArtifactManagerIVT.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/java/dev/galasa/artifact/manager/ivt/ArtifactManagerIVT.java index 545f07bec..a2878bd79 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/java/dev/galasa/artifact/manager/ivt/ArtifactManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager.ivt/src/main/java/dev/galasa/artifact/manager/ivt/ArtifactManagerIVT.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.artifact.manager.ivt; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManager.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManager.java index 70bea2b22..9a1f81261 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManager.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManager.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.artifact; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManagerField.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManagerField.java index b8d6ac678..a705994c4 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManagerField.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManagerField.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.artifact; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/BundleResources.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/BundleResources.java index 1cc81f98f..59a321960 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/BundleResources.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/BundleResources.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.artifact; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IArtifactManager.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IArtifactManager.java index 77bdcf553..a51e27d90 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IArtifactManager.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IArtifactManager.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.artifact; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IBundleResources.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IBundleResources.java index ae819515a..3f7ddc1c9 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IBundleResources.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IBundleResources.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.artifact; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ISkeletonProcessor.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ISkeletonProcessor.java index 9a28e8f05..f66891832 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ISkeletonProcessor.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ISkeletonProcessor.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.artifact; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/OutputRepositoryException.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/OutputRepositoryException.java index 98f4f54c7..599574bbd 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/OutputRepositoryException.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/OutputRepositoryException.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.artifact; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/SkeletonProcessorException.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/SkeletonProcessorException.java index 6dc1dc9ff..346af02b8 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/SkeletonProcessorException.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/SkeletonProcessorException.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.artifact; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/TestBundleResourceException.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/TestBundleResourceException.java index fbefa3fd3..fea92cfe9 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/TestBundleResourceException.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/TestBundleResourceException.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.artifact; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/ArtifactManagerImpl.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/ArtifactManagerImpl.java index ec8df8ce3..f17974afc 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/ArtifactManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/ArtifactManagerImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.artifact.internal; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/BundleResourcesImpl.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/BundleResourcesImpl.java index a4dad4554..3c71ff47e 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/BundleResourcesImpl.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/BundleResourcesImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.artifact.internal; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/PlusPlusSkeletonProcessor.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/PlusPlusSkeletonProcessor.java index a3da44a4b..21de0840d 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/PlusPlusSkeletonProcessor.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/PlusPlusSkeletonProcessor.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.artifact.internal; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/VelocitySkeletonProcessor.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/VelocitySkeletonProcessor.java index d00d1f797..8ad5e8e23 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/VelocitySkeletonProcessor.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/VelocitySkeletonProcessor.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.artifact.internal; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/package-info.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/package-info.java index 8971de8ce..99bd21c70 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/package-info.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/package-info.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ /** * Artifact Manager diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/test/java/dev/galasa/artifact/manager/DummyTest.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/test/java/dev/galasa/artifact/manager/DummyTest.java index efde7b4c4..d82b52d66 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/test/java/dev/galasa/artifact/manager/DummyTest.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/test/java/dev/galasa/artifact/manager/DummyTest.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.artifact.manager; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/src/main/java/dev/galasa/core/manager/ivt/CoreManagerIVT.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/src/main/java/dev/galasa/core/manager/ivt/CoreManagerIVT.java index c1f0c563b..8c3f3bf61 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/src/main/java/dev/galasa/core/manager/ivt/CoreManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/src/main/java/dev/galasa/core/manager/ivt/CoreManagerIVT.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.core.manager.ivt; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/src/main/java/dev/galasa/framework/ivt/BasicTest.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/src/main/java/dev/galasa/framework/ivt/BasicTest.java index 452747304..a04b5832c 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/src/main/java/dev/galasa/framework/ivt/BasicTest.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/src/main/java/dev/galasa/framework/ivt/BasicTest.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.framework.ivt; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/src/main/java/dev/galasa/framework/ivt/BasicTestExtended.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/src/main/java/dev/galasa/framework/ivt/BasicTestExtended.java index 35d9947aa..577d93813 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/src/main/java/dev/galasa/framework/ivt/BasicTestExtended.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/src/main/java/dev/galasa/framework/ivt/BasicTestExtended.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.framework.ivt; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/src/main/java/dev/galasa/framework/ivt/BasicTestExtendedAgain.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/src/main/java/dev/galasa/framework/ivt/BasicTestExtendedAgain.java index ed217178e..005fe1799 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/src/main/java/dev/galasa/framework/ivt/BasicTestExtendedAgain.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/src/main/java/dev/galasa/framework/ivt/BasicTestExtendedAgain.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.framework.ivt; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/src/main/java/dev/galasa/framework/ivt/BasicTestFail.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/src/main/java/dev/galasa/framework/ivt/BasicTestFail.java index 66bbe87cc..425f79df0 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/src/main/java/dev/galasa/framework/ivt/BasicTestFail.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager.ivt/src/main/java/dev/galasa/framework/ivt/BasicTestFail.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.framework.ivt; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/CoreManager.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/CoreManager.java index 9e13fd181..f9f138b35 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/CoreManager.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/CoreManager.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.core.manager; import static java.lang.annotation.ElementType.FIELD; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/CoreManagerException.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/CoreManagerException.java index edb8d8b8b..2e7d2618a 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/CoreManagerException.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/CoreManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.core.manager; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/CoreManagerField.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/CoreManagerField.java index f469f5420..86f5f88ea 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/CoreManagerField.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/CoreManagerField.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.core.manager; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ICoreManager.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ICoreManager.java index 36b57b8f1..73e008420 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ICoreManager.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ICoreManager.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.core.manager; import javax.validation.constraints.NotNull; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/IResourceString.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/IResourceString.java index 181801887..492d7c7e7 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/IResourceString.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/IResourceString.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.core.manager; public interface IResourceString { diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/Logger.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/Logger.java index c360cb49e..3f990d571 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/Logger.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/Logger.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.core.manager; import static java.lang.annotation.ElementType.FIELD; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ResourceString.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ResourceString.java index d9576142e..dc98d9971 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ResourceString.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ResourceString.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.core.manager; import static java.lang.annotation.ElementType.FIELD; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/RunName.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/RunName.java index e3ca0f199..55c741317 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/RunName.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/RunName.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.core.manager; import static java.lang.annotation.ElementType.FIELD; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/StoredArtifactRoot.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/StoredArtifactRoot.java index 8b78af568..90d7294b3 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/StoredArtifactRoot.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/StoredArtifactRoot.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.core.manager; import static java.lang.annotation.ElementType.FIELD; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/TestProperty.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/TestProperty.java index 12b9d6202..468d8ee86 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/TestProperty.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/TestProperty.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.core.manager; import static java.lang.annotation.ElementType.FIELD; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java index 2ac826e22..a5e4e5a2e 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CoreManagerImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.core.manager.internal; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CorePropertiesSingleton.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CorePropertiesSingleton.java index 02f77e466..af2d570ba 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CorePropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/CorePropertiesSingleton.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.core.manager.internal; import org.osgi.service.component.annotations.Activate; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/ResourceStringGenerator.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/ResourceStringGenerator.java index 6d163e169..796de6181 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/ResourceStringGenerator.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/ResourceStringGenerator.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.core.manager.internal; import java.lang.reflect.Field; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/ResourceStringImpl.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/ResourceStringImpl.java index 3e46bca79..cd29a446e 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/ResourceStringImpl.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/ResourceStringImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.core.manager.internal; import dev.galasa.core.manager.IResourceString; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/gherkin/CoreStatementOwner.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/gherkin/CoreStatementOwner.java index c401efac8..afd698ede 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/gherkin/CoreStatementOwner.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/gherkin/CoreStatementOwner.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.core.manager.internal.gherkin; import java.util.Map; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/package-info.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/package-info.java index 735995e3c..acf044e0c 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/package-info.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/package-info.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * Galasa Core Manager - Internal Implementation */ diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/properties/ResourceStringPattern.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/properties/ResourceStringPattern.java index 028c379d9..6a15c4c87 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/properties/ResourceStringPattern.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/properties/ResourceStringPattern.java @@ -1,5 +1,7 @@ /* - * Copyright contributors to the Galasa project + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.core.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/resourcemanagement/CoreResourceManagement.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/resourcemanagement/CoreResourceManagement.java index a89f37671..bdaa48eca 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/resourcemanagement/CoreResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/resourcemanagement/CoreResourceManagement.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.core.manager.internal.resourcemanagement; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/resourcemanagement/ResourceStringResourceManagement.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/resourcemanagement/ResourceStringResourceManagement.java index fa1263ec5..621a0934b 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/resourcemanagement/ResourceStringResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/resourcemanagement/ResourceStringResourceManagement.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.core.manager.internal.resourcemanagement; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/testcatalog/CoreTestCatalogBuilder.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/testcatalog/CoreTestCatalogBuilder.java index ecb017d0f..bfe35fa3b 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/testcatalog/CoreTestCatalogBuilder.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/testcatalog/CoreTestCatalogBuilder.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.core.manager.internal.testcatalog; import com.google.gson.JsonArray; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/package-info.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/package-info.java index e0bc029d3..68256d835 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/package-info.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/package-info.java @@ -1,7 +1,7 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ /** * Galasa Core Manager diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/test/java/dev/galasa/core/manager/internal/CoreManagerTest.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/test/java/dev/galasa/core/manager/internal/CoreManagerTest.java index 08441c8a3..761a0cc15 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/test/java/dev/galasa/core/manager/internal/CoreManagerTest.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/test/java/dev/galasa/core/manager/internal/CoreManagerTest.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.core.manager.internal; import static org.mockito.Mockito.when; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/CheckpointException.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/CheckpointException.java index 3d2cb9c89..19e30e0cb 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/CheckpointException.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/CheckpointException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/FailTextFoundException.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/FailTextFoundException.java index 4a0af8455..051153bb5 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/FailTextFoundException.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/FailTextFoundException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ILogScanner.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ILogScanner.java index 67cc44793..981632a97 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ILogScanner.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ILogScanner.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.textscan; import java.util.regex.Pattern; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ITextScannable.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ITextScannable.java index 001041c88..a205fabd0 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ITextScannable.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ITextScannable.java @@ -1,7 +1,7 @@ /* - * Licensed Materials Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ITextScanner.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ITextScanner.java index daca811ee..652275c8a 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ITextScanner.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ITextScanner.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.textscan; import java.io.InputStream; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/IncorrectOccurrencesException.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/IncorrectOccurrencesException.java index 9e2418b10..6aea7aee8 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/IncorrectOccurrencesException.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/IncorrectOccurrencesException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/LogScanner.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/LogScanner.java index 4426ee048..5cd153380 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/LogScanner.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/LogScanner.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/MissingTextException.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/MissingTextException.java index 65acb653b..236c24ecb 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/MissingTextException.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/MissingTextException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanException.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanException.java index aebe1bdac..4386d6702 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanException.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanManagerException.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanManagerException.java index 5eadb4cbc..6b474e178 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanManagerException.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanManagerField.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanManagerField.java index 5f8a0b2b7..6add8e685 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanManagerField.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanManagerField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanner.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanner.java index 193a508b3..871438a82 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanner.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanner.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/AbstractTextScannable.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/AbstractTextScannable.java index 121759b3b..74568873e 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/AbstractTextScannable.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/AbstractTextScannable.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.textscan.internal; import java.io.InputStream; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/LogScannerImpl.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/LogScannerImpl.java index 05f44fcc0..6af1dfdc6 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/LogScannerImpl.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/LogScannerImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan.internal; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/TextScanManagerImpl.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/TextScanManagerImpl.java index c14beb7d0..a952e88fe 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/TextScanManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/TextScanManagerImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.textscan.internal; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/TextScannerImpl.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/TextScannerImpl.java index 14592d074..e49c31070 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/TextScannerImpl.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/TextScannerImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.textscan.internal; import java.io.BufferedReader; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/package-info.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/package-info.java index 576d6470b..9bc0bbeb1 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/package-info.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/package-info.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * Galasa Text Scan Manager internal */ diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/package-info.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/package-info.java index eb977a81b..0d58e27c0 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/package-info.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/package-info.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * Galasa Text Scan Manager */ diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/spi/ITextScannerManagerSpi.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/spi/ITextScannerManagerSpi.java index f55028b4b..bdeabe3fc 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/spi/ITextScannerManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/spi/ITextScannerManagerSpi.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.textscan.spi; import dev.galasa.textscan.ILogScanner; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/spi/package-info.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/spi/package-info.java index 153091eea..c972a2cad 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/spi/package-info.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/spi/package-info.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * Galasa Text Scan Manager SPI */ diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/TestExceptions.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/TestExceptions.java index b80e81ade..c8fb1be06 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/TestExceptions.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/TestExceptions.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.textscan; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/DummyInputStream.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/DummyInputStream.java index 8d6d0f104..34d41e5ef 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/DummyInputStream.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/DummyInputStream.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.textscan.internal; import java.io.IOException; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/DummyScannableEmpty.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/DummyScannableEmpty.java index 52b183270..c159cf3c4 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/DummyScannableEmpty.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/DummyScannableEmpty.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan.internal; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/DummyScannableInputStream.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/DummyScannableInputStream.java index 0645dc375..c20d9731e 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/DummyScannableInputStream.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/DummyScannableInputStream.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan.internal; import java.io.ByteArrayInputStream; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/DummyScannableString.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/DummyScannableString.java index 0d88265a8..00add7ab6 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/DummyScannableString.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/DummyScannableString.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan.internal; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestAbstractTextScannable.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestAbstractTextScannable.java index 2a9604f03..48af1ddbd 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestAbstractTextScannable.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestAbstractTextScannable.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.textscan.internal; import static org.junit.Assert.assertEquals; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestLogScannerImpl.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestLogScannerImpl.java index 75214f808..dba62dd3a 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestLogScannerImpl.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestLogScannerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.textscan.internal; import static org.junit.Assert.assertEquals; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScanManagerImpl.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScanManagerImpl.java index 187f372bf..555617c00 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScanManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScanManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.textscan.internal; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplInputStreamLargeFile.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplInputStreamLargeFile.java index 36027e154..e38f068db 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplInputStreamLargeFile.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplInputStreamLargeFile.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan.internal; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplInputStreamScan.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplInputStreamScan.java index 52ef7b6d4..8f99e8ca4 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplInputStreamScan.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplInputStreamScan.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan.internal; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplInputStreamScanForMatch.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplInputStreamScanForMatch.java index 28bd4d026..6f6ce6a19 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplInputStreamScanForMatch.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplInputStreamScanForMatch.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan.internal; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplMultilineInterleavedScan.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplMultilineInterleavedScan.java index 57283a7e0..13b66c334 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplMultilineInterleavedScan.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplMultilineInterleavedScan.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan.internal; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplScannableScan.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplScannableScan.java index 205e409d3..d6a477c37 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplScannableScan.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplScannableScan.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan.internal; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplScannableScanForMatch.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplScannableScanForMatch.java index c99c480e6..71c58cacb 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplScannableScanForMatch.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplScannableScanForMatch.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan.internal; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplStringScan.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplStringScan.java index a62728d09..843559970 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplStringScan.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplStringScan.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan.internal; diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplStringScanForMach.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplStringScanForMach.java index 8b63f641e..ef87ae16d 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplStringScanForMach.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/test/java/dev/galasa/textscan/internal/TestTextScannerImplStringScanForMach.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.textscan.internal; diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/src/main/java/dev/galasa/db2/manager/ivt/Db2ManagerIVT.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/src/main/java/dev/galasa/db2/manager/ivt/Db2ManagerIVT.java index 9fd7a60c1..d2d304958 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/src/main/java/dev/galasa/db2/manager/ivt/Db2ManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/src/main/java/dev/galasa/db2/manager/ivt/Db2ManagerIVT.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.db2.manager.ivt; diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/Db2Instance.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/Db2Instance.java index e444c6268..15a467e0d 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/Db2Instance.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/Db2Instance.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.db2; diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/Db2ManagerException.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/Db2ManagerException.java index 82a30bf13..38bd5bb5b 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/Db2ManagerException.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/Db2ManagerException.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.db2; diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/Db2ManagerField.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/Db2ManagerField.java index eeae48aee..f81c4f14b 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/Db2ManagerField.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/Db2ManagerField.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.db2; diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/Db2Schema.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/Db2Schema.java index 4508887d3..635715a8a 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/Db2Schema.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/Db2Schema.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.db2; diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IDb2Instance.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IDb2Instance.java index c1103af87..5c2f7a7b6 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IDb2Instance.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IDb2Instance.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.db2; diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IDb2Schema.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IDb2Schema.java index df190bba0..fa68fde93 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IDb2Schema.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IDb2Schema.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.db2; diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IResultMap.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IResultMap.java index 82dbe6418..2a3d09b9d 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IResultMap.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IResultMap.java @@ -1,6 +1,8 @@ /* * Copyright contributors to the Galasa project - */ + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.db2; import java.math.BigDecimal; diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2InstanceImpl.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2InstanceImpl.java index 9ae739c0e..ff419efa7 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2InstanceImpl.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2InstanceImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.db2.internal; diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2ManagerImpl.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2ManagerImpl.java index 017dbf9e4..43f0c384d 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2ManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2ManagerImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.db2.internal; diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2SchemaImpl.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2SchemaImpl.java index 323b9c116..7814e320d 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2SchemaImpl.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2SchemaImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.db2.internal; diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/ResultMap.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/ResultMap.java index 752c4b611..de379d47c 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/ResultMap.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/ResultMap.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.db2.internal; diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/properties/Db2Credentials.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/properties/Db2Credentials.java index fe59495b8..3627ca2ed 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/properties/Db2Credentials.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/properties/Db2Credentials.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.db2.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/properties/Db2DSEInstanceName.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/properties/Db2DSEInstanceName.java index da5a4acbe..62b1a340c 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/properties/Db2DSEInstanceName.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/properties/Db2DSEInstanceName.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.db2.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/properties/Db2DSESchemaName.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/properties/Db2DSESchemaName.java index 8a6b2c4ee..3ceff9244 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/properties/Db2DSESchemaName.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/properties/Db2DSESchemaName.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.db2.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/properties/Db2InstanceUrl.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/properties/Db2InstanceUrl.java index 7c09c7f64..4fb342763 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/properties/Db2InstanceUrl.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/properties/Db2InstanceUrl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.db2.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/properties/Db2PropertiesSingleton.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/properties/Db2PropertiesSingleton.java index 1c9d3096b..df3440133 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/properties/Db2PropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/properties/Db2PropertiesSingleton.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.db2.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/spi/IDb2ManagerSpi.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/spi/IDb2ManagerSpi.java index d3d563ba7..7f28e5112 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/spi/IDb2ManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/spi/IDb2ManagerSpi.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.db2.spi; diff --git a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/EclipseManagerField.java b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/EclipseManagerField.java index 94da9bf61..882ec9168 100644 --- a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/EclipseManagerField.java +++ b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/EclipseManagerField.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.eclipseruntime; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/EclipseType.java b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/EclipseType.java index b7756e014..dc7a5047c 100644 --- a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/EclipseType.java +++ b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/EclipseType.java @@ -1,7 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ - + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.eclipseruntime; public enum EclipseType { diff --git a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/EclipseVersion.java b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/EclipseVersion.java index f195f4aae..581f8f3bc 100644 --- a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/EclipseVersion.java +++ b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/EclipseVersion.java @@ -1,7 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ - + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.eclipseruntime; public enum EclipseVersion { diff --git a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/IEclipseInstall.java b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/IEclipseInstall.java index ebbeabec4..70d2f41cd 100644 --- a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/IEclipseInstall.java +++ b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/IEclipseInstall.java @@ -1,7 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ - + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.eclipseruntime; import dev.galasa.java.IJavaInstallation; diff --git a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/EclipseInstallUbuntu.java b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/EclipseInstallUbuntu.java index dd617f54d..7e6495133 100644 --- a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/EclipseInstallUbuntu.java +++ b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/EclipseInstallUbuntu.java @@ -1,7 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ - + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.eclipseruntime.ubuntu; import java.lang.annotation.Retention; diff --git a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/EclipseUbuntuManagerField.java b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/EclipseUbuntuManagerField.java index 30a8eaf00..39ecfc8c6 100644 --- a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/EclipseUbuntuManagerField.java +++ b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/EclipseUbuntuManagerField.java @@ -1,7 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ - + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.eclipseruntime.ubuntu; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/IEclipseInstallUbuntu.java b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/IEclipseInstallUbuntu.java index 45225f41f..e82c2169a 100644 --- a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/IEclipseInstallUbuntu.java +++ b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/IEclipseInstallUbuntu.java @@ -1,7 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ - + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.eclipseruntime.ubuntu; import dev.galasa.eclipseruntime.IEclipseInstall; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/CSDInput.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/CSDInput.java index a5ae67eef..1086e16d6 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/CSDInput.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/CSDInput.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/CSDInputs.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/CSDInputs.java index f3bc3e0e8..d4fcff80c 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/CSDInputs.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/CSDInputs.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/DoNotBuild.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/DoNotBuild.java index aadc61f5a..e2d8a3f50 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/DoNotBuild.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/DoNotBuild.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/DoNotStartCICS.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/DoNotStartCICS.java index d9714fae2..83934ec20 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/DoNotStartCICS.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/DoNotStartCICS.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/SemManagerException.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/SemManagerException.java index fee9c0ce0..202f8ea66 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/SemManagerException.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/SemManagerException.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem; import dev.galasa.cicsts.CicstsManagerException; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/SemManagerField.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/SemManagerField.java index f2443effa..a6a47a791 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/SemManagerField.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/SemManagerField.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/SemTopology.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/SemTopology.java index 1f6b7eee0..80f3ae5f9 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/SemTopology.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/SemTopology.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/Sit.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/Sit.java index c1126dd48..d6565d217 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/Sit.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/Sit.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/Sits.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/Sits.java index 3ce63e7df..5be42ec39 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/Sits.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/Sits.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/CsdInputGenerator.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/CsdInputGenerator.java index 702900cd1..99f3aa25e 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/CsdInputGenerator.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/CsdInputGenerator.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem.internal; import java.io.BufferedReader; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemCicsImpl.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemCicsImpl.java index 375d45c7b..8261cd0ee 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemCicsImpl.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemCicsImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem.internal; import java.time.Instant; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemManagerImpl.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemManagerImpl.java index d27a29b7b..820d4709d 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemManagerImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem.internal; import java.io.ByteArrayInputStream; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemPoolApplids.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemPoolApplids.java index e0bcab928..4c745866f 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemPoolApplids.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemPoolApplids.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem.internal; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemPoolPorts.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemPoolPorts.java index 76b4fceae..930a8b60e 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemPoolPorts.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemPoolPorts.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem.internal; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemPoolResolver.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemPoolResolver.java index 09b274235..2deadb7b9 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemPoolResolver.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemPoolResolver.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem.internal; import com.ibm.hursley.cicsts.test.sem.interfaces.complex.IPool; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemZosHandler.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemZosHandler.java index 86dd377cb..f0b10b0f6 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemZosHandler.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemZosHandler.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem.internal; import java.io.BufferedReader; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SitGenerator.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SitGenerator.java index 446700628..0c87bd067 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SitGenerator.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SitGenerator.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem.internal; import java.util.HashMap; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/BaseModel.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/BaseModel.java index 2a6509a40..c57805819 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/BaseModel.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/BaseModel.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem.internal.properties; import dev.galasa.framework.spi.cps.CpsProperties; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/CicsBuild.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/CicsBuild.java index 35273f995..6ace76e27 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/CicsBuild.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/CicsBuild.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem.internal.properties; import dev.galasa.framework.spi.ConfigurationPropertyStoreException; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/ExternalVersion.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/ExternalVersion.java index 7b253aad1..7eeb102d5 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/ExternalVersion.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/ExternalVersion.java @@ -1,5 +1,7 @@ /* - * Copyright contributors to the Galasa project + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.sem.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/InteralVersion.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/InteralVersion.java index 659437392..7b07aa100 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/InteralVersion.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/InteralVersion.java @@ -1,5 +1,7 @@ /* - * Copyright contributors to the Galasa project + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.sem.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/ModelApplids.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/ModelApplids.java index 382f55123..c034ff684 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/ModelApplids.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/ModelApplids.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem.internal.properties; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/ModelPorts.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/ModelPorts.java index 1b95e8885..17e671529 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/ModelPorts.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/ModelPorts.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem.internal.properties; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/ModelUrl.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/ModelUrl.java index 85e4f3497..4127133a4 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/ModelUrl.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/ModelUrl.java @@ -1,5 +1,7 @@ /* - * Copyright contributors to the Galasa project + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.sem.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/SemPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/SemPropertiesSingleton.java index dc5fd64e1..8587a9f29 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/SemPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/properties/SemPropertiesSingleton.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem.internal.properties; import org.osgi.service.component.annotations.Activate; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/resourcemanagement/ApplidResourceMonitor.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/resourcemanagement/ApplidResourceMonitor.java index 2c587ba9e..574aa2ee6 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/resourcemanagement/ApplidResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/resourcemanagement/ApplidResourceMonitor.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem.internal.resourcemanagement; import java.util.Map; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/resourcemanagement/PortResourceMonitor.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/resourcemanagement/PortResourceMonitor.java index d4112d42a..940090bfb 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/resourcemanagement/PortResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/resourcemanagement/PortResourceMonitor.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem.internal.resourcemanagement; import java.util.Map; diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/resourcemanagement/SemResourceManagement.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/resourcemanagement/SemResourceManagement.java index 0b5dc5020..b91696799 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/resourcemanagement/SemResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/resourcemanagement/SemResourceManagement.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.sem.internal.resourcemanagement; import java.util.concurrent.TimeUnit; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/IJavaInstallation.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/IJavaInstallation.java index cc5b7702d..8797295de 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/IJavaInstallation.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/IJavaInstallation.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/JavaManagerException.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/JavaManagerException.java index 3ccd3c9f8..69e73e855 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/JavaManagerException.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/JavaManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/JavaManagerField.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/JavaManagerField.java index e89107ac3..ea5113925 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/JavaManagerField.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/JavaManagerField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/JavaType.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/JavaType.java index e28c4cf6c..a38543b1b 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/JavaType.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/JavaType.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/JavaVersion.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/JavaVersion.java index 852966683..6e08c757d 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/JavaVersion.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/JavaVersion.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/JavaManagerImpl.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/JavaManagerImpl.java index 5510d9ae0..1e6a89343 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/JavaManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/JavaManagerImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.internal; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/CodeCoverageSaveCredentials.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/CodeCoverageSaveCredentials.java index 2b8942dea..ec1cb06c3 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/CodeCoverageSaveCredentials.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/CodeCoverageSaveCredentials.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/CodeCoverageSaveLocation.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/CodeCoverageSaveLocation.java index 229610c2a..3eaac00b4 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/CodeCoverageSaveLocation.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/CodeCoverageSaveLocation.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/DefaultVersion.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/DefaultVersion.java index 30c04ee30..c206ce609 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/DefaultVersion.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/DefaultVersion.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/DownloadLocation.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/DownloadLocation.java index 5e042140f..75a7c1c59 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/DownloadLocation.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/DownloadLocation.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/JacocoAgentLocation.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/JacocoAgentLocation.java index ccc179b32..9d3b304b0 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/JacocoAgentLocation.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/JacocoAgentLocation.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/JavaPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/JavaPropertiesSingleton.java index ab369d89f..5f633ec44 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/JavaPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/JavaPropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/UseCodeCoverage.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/UseCodeCoverage.java index 767273cbf..a34a1ab63 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/UseCodeCoverage.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/internal/properties/UseCodeCoverage.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/spi/IJavaManagerSpi.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/spi/IJavaManagerSpi.java index f8f814e35..19352f970 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/spi/IJavaManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/spi/IJavaManagerSpi.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.spi; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/spi/JavaInstallationImpl.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/spi/JavaInstallationImpl.java index bc35061d8..5184ddae8 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/spi/JavaInstallationImpl.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/spi/JavaInstallationImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.spi; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/IJavaUbuntuInstallation.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/IJavaUbuntuInstallation.java index dd4042408..3ff2c32fd 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/IJavaUbuntuInstallation.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/IJavaUbuntuInstallation.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.ubuntu; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/JavaUbuntuInstallation.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/JavaUbuntuInstallation.java index b729bc5de..ed11fe5a1 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/JavaUbuntuInstallation.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/JavaUbuntuInstallation.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.ubuntu; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/JavaUbuntuManagerException.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/JavaUbuntuManagerException.java index 0bedcd56e..21ae11c66 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/JavaUbuntuManagerException.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/JavaUbuntuManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.ubuntu; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/JavaUbuntuManagerField.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/JavaUbuntuManagerField.java index b006d71c3..923643413 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/JavaUbuntuManagerField.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/JavaUbuntuManagerField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.ubuntu; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/internal/JavaUbuntuManagerImpl.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/internal/JavaUbuntuManagerImpl.java index 946853567..7476f2cf2 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/internal/JavaUbuntuManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/internal/JavaUbuntuManagerImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.ubuntu.internal; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/spi/IJavaUbuntuManagerSpi.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/spi/IJavaUbuntuManagerSpi.java index ec26bb9c3..a0bdbbd7e 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/spi/IJavaUbuntuManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/spi/IJavaUbuntuManagerSpi.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.ubuntu.spi; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/spi/JavaUbuntuInstallationImpl.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/spi/JavaUbuntuInstallationImpl.java index 31bd32e07..d0abc8630 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/spi/JavaUbuntuInstallationImpl.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/spi/JavaUbuntuInstallationImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.ubuntu.spi; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/IJavaWindowsInstallation.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/IJavaWindowsInstallation.java index ef2a9ba8a..c69b01ce6 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/IJavaWindowsInstallation.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/IJavaWindowsInstallation.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.windows; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/JavaWindowsInstallation.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/JavaWindowsInstallation.java index 20bf558be..1af751f5f 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/JavaWindowsInstallation.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/JavaWindowsInstallation.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.windows; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/JavaWindowsManagerException.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/JavaWindowsManagerException.java index 29a49d846..b54c673cc 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/JavaWindowsManagerException.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/JavaWindowsManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.windows; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/JavaWindowsManagerField.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/JavaWindowsManagerField.java index a6a75145e..e7872c46d 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/JavaWindowsManagerField.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/JavaWindowsManagerField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.windows; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/internal/JavaWindowsManagerImpl.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/internal/JavaWindowsManagerImpl.java index 3484c768d..29a7ec80d 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/internal/JavaWindowsManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/internal/JavaWindowsManagerImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.windows.internal; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/spi/IJavaWindowsManagerSpi.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/spi/IJavaWindowsManagerSpi.java index 465a3a185..8efd37261 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/spi/IJavaWindowsManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/spi/IJavaWindowsManagerSpi.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.windows.spi; diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/spi/JavaWindowsInstallationImpl.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/spi/JavaWindowsInstallationImpl.java index e30b98819..6f64d3f94 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/spi/JavaWindowsInstallationImpl.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/spi/JavaWindowsInstallationImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.java.windows.spi; diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/src/main/java/dev/galasa/elasticlog/manager/ivt/ElasticLogManagerIVT.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/src/main/java/dev/galasa/elasticlog/manager/ivt/ElasticLogManagerIVT.java index 3d43a98e1..d7e788e47 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/src/main/java/dev/galasa/elasticlog/manager/ivt/ElasticLogManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager.ivt/src/main/java/dev/galasa/elasticlog/manager/ivt/ElasticLogManagerIVT.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.elasticlog.manager.ivt; diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/ElasticLogManagerException.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/ElasticLogManagerException.java index 3083930ef..18f794326 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/ElasticLogManagerException.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/ElasticLogManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.elasticlog.internal; diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/ElasticLogManagerImpl.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/ElasticLogManagerImpl.java index b2457f858..cfdf0943e 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/ElasticLogManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/ElasticLogManagerImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.elasticlog.internal; diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/package-info.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/package-info.java index b8f98b480..d8ebd653f 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/package-info.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/package-info.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * ElasticLog Manager * diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/properties/ElasticLogCredentials.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/properties/ElasticLogCredentials.java index 4d3bec19b..64f4fcd77 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/properties/ElasticLogCredentials.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/properties/ElasticLogCredentials.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.elasticlog.internal.properties; import dev.galasa.elasticlog.internal.ElasticLogManagerException; diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/properties/ElasticLogEndpoint.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/properties/ElasticLogEndpoint.java index 526602abb..1ac9affc5 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/properties/ElasticLogEndpoint.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/properties/ElasticLogEndpoint.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.elasticlog.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/properties/ElasticLogIndex.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/properties/ElasticLogIndex.java index 16a4d6e4a..dec4ba53d 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/properties/ElasticLogIndex.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/properties/ElasticLogIndex.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.elasticlog.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/properties/ElasticLogLocalRun.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/properties/ElasticLogLocalRun.java index 91b19871c..718191d9f 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/properties/ElasticLogLocalRun.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/properties/ElasticLogLocalRun.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.elasticlog.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/properties/ElasticLogPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/properties/ElasticLogPropertiesSingleton.java index 19b8a4fa8..ddee2ec7c 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/properties/ElasticLogPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/properties/ElasticLogPropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.elasticlog.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/Phoenix2ManagerException.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/Phoenix2ManagerException.java index 6303c841a..04ea0afd7 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/Phoenix2ManagerException.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/Phoenix2ManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.phoenix2.internal; diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/Phoenix2ManagerImpl.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/Phoenix2ManagerImpl.java index 815b0ca97..8f7c0e305 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/Phoenix2ManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/Phoenix2ManagerImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.phoenix2.internal; diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2Credentials.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2Credentials.java index b43984262..2394ccf47 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2Credentials.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2Credentials.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.phoenix2.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2DefaultBuildLevel.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2DefaultBuildLevel.java index f6e6d4105..ab4f16582 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2DefaultBuildLevel.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2DefaultBuildLevel.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.phoenix2.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2DefaultCustomBuild.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2DefaultCustomBuild.java index 07ba3155f..49bd61447 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2DefaultCustomBuild.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2DefaultCustomBuild.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.phoenix2.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2DefaultProductRelease.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2DefaultProductRelease.java index f66c2beaf..2afe0a3e3 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2DefaultProductRelease.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2DefaultProductRelease.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.phoenix2.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2DefaultTestingEnvironment.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2DefaultTestingEnvironment.java index ce9533235..9bef412a4 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2DefaultTestingEnvironment.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2DefaultTestingEnvironment.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.phoenix2.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2Enabled.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2Enabled.java index 07e1fbe0b..45c2b2d91 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2Enabled.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2Enabled.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.phoenix2.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2Endpoint.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2Endpoint.java index 026940429..eed5c9395 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2Endpoint.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2Endpoint.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.phoenix2.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2LocalRun.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2LocalRun.java index 939f89a99..f0b5db01d 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2LocalRun.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2LocalRun.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.phoenix2.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2PropertiesSingleton.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2PropertiesSingleton.java index fca670396..86d736418 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2PropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/properties/Phoenix2PropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.phoenix2.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/src/main/java/dev/galasa/galasaecosystem/manager/ivt/EcosystemTest.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/src/main/java/dev/galasa/galasaecosystem/manager/ivt/EcosystemTest.java index ad472474f..827489fb7 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/src/main/java/dev/galasa/galasaecosystem/manager/ivt/EcosystemTest.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager.ivt/src/main/java/dev/galasa/galasaecosystem/manager/ivt/EcosystemTest.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem.manager.ivt; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/EcosystemEndpoint.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/EcosystemEndpoint.java index 1138669a6..540b4c7d4 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/EcosystemEndpoint.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/EcosystemEndpoint.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/GalasaEcosystemManagerException.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/GalasaEcosystemManagerException.java index 2565d71dd..6e4aeaf00 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/GalasaEcosystemManagerException.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/GalasaEcosystemManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/GalasaEcosystemManagerField.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/GalasaEcosystemManagerField.java index 078e610d2..281bc1d21 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/GalasaEcosystemManagerField.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/GalasaEcosystemManagerField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020,2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IGenericEcosystem.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IGenericEcosystem.java index dc5394c38..ebe673f08 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IGenericEcosystem.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IGenericEcosystem.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IKubernetesEcosystem.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IKubernetesEcosystem.java index ede8908cd..f094636d3 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IKubernetesEcosystem.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IKubernetesEcosystem.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020,2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/ILocalEcosystem.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/ILocalEcosystem.java index fcf6936d1..c079b6008 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/ILocalEcosystem.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/ILocalEcosystem.java @@ -1,5 +1,7 @@ /* - * Copyright contributors to the Galasa project + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IsolationInstallation.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IsolationInstallation.java index 8a6f17a8a..f81f0437c 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IsolationInstallation.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IsolationInstallation.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.galasaecosystem; public enum IsolationInstallation { diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/KubernetesEcosystem.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/KubernetesEcosystem.java index a65e81a5f..38b1c541b 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/KubernetesEcosystem.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/KubernetesEcosystem.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020,2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/LocalEcosystem.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/LocalEcosystem.java index 33c935d8f..d3abb2ed0 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/LocalEcosystem.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/LocalEcosystem.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/AbstractEcosystemImpl.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/AbstractEcosystemImpl.java index 016556909..74200b02f 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/AbstractEcosystemImpl.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/AbstractEcosystemImpl.java @@ -1,5 +1,7 @@ /* - * Copyright contributors to the Galasa project + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem.internal; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/GalasaEcosystemManagerImpl.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/GalasaEcosystemManagerImpl.java index 287e4906c..5235a1cb9 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/GalasaEcosystemManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/GalasaEcosystemManagerImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.galasaecosystem.internal; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/IInternalEcosystem.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/IInternalEcosystem.java index ced239b4c..af49db919 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/IInternalEcosystem.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/IInternalEcosystem.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.galasaecosystem.internal; import dev.galasa.galasaecosystem.GalasaEcosystemManagerException; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/KubernetesEcosystemImpl.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/KubernetesEcosystemImpl.java index 821a019a0..0534f689f 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/KubernetesEcosystemImpl.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/KubernetesEcosystemImpl.java @@ -1,5 +1,7 @@ /* - * Copyright contributors to the Galasa project + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem.internal; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalEcosystemImpl.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalEcosystemImpl.java index b82ca9e1c..c7dbc34ae 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalEcosystemImpl.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalEcosystemImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.galasaecosystem.internal; import java.io.IOException; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalLinuxEcosystemImpl.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalLinuxEcosystemImpl.java index 8591ae4af..aecdfb841 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalLinuxEcosystemImpl.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalLinuxEcosystemImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.galasaecosystem.internal; import java.io.IOException; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalRun.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalRun.java index b4be0031e..637c67b39 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalRun.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalRun.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem.internal; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalWindowsEcosystemImpl.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalWindowsEcosystemImpl.java index dfe342e35..6cba9be5f 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalWindowsEcosystemImpl.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalWindowsEcosystemImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.galasaecosystem.internal; import java.util.Properties; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/RunIdPrefixImpl.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/RunIdPrefixImpl.java index 2210c4663..41534f356 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/RunIdPrefixImpl.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/RunIdPrefixImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.galasaecosystem.internal; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/SimPlatformInstance.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/SimPlatformInstance.java index 5bf86f4e6..9661364e8 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/SimPlatformInstance.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/SimPlatformInstance.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.galasaecosystem.internal; import java.net.InetSocketAddress; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/CentralRepo.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/CentralRepo.java index 38799805a..5cc0546cb 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/CentralRepo.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/CentralRepo.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/DockerRegistry.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/DockerRegistry.java index 78d51c410..e3454f276 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/DockerRegistry.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/DockerRegistry.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/DockerVersion.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/DockerVersion.java index ab518283f..0cd2ed09f 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/DockerVersion.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/DockerVersion.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/GalasaBootVersion.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/GalasaBootVersion.java index 2b750184e..d6c8c0692 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/GalasaBootVersion.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/GalasaBootVersion.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/GalasaEcosystemPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/GalasaEcosystemPropertiesSingleton.java index 06b764070..344d84e91 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/GalasaEcosystemPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/GalasaEcosystemPropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/IsolatedFullZip.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/IsolatedFullZip.java index 7109b60f2..a5a144c11 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/IsolatedFullZip.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/IsolatedFullZip.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/IsolatedMvpZip.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/IsolatedMvpZip.java index f4f81da22..892f06c6f 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/IsolatedMvpZip.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/IsolatedMvpZip.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/KubernetesEcosystemTagSharedEnvironment.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/KubernetesEcosystemTagSharedEnvironment.java index 26bc98440..3497ab607 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/KubernetesEcosystemTagSharedEnvironment.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/KubernetesEcosystemTagSharedEnvironment.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/MavenUseDefaultLocalRepository.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/MavenUseDefaultLocalRepository.java index 30cf36826..9c1988970 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/MavenUseDefaultLocalRepository.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/MavenUseDefaultLocalRepository.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RunIdPrefix.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RunIdPrefix.java index a0dc09560..69b5be953 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RunIdPrefix.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RunIdPrefix.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.galasaecosystem.internal.properties; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RuntimeRepo.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RuntimeRepo.java index 37f8c292e..207eb2ddd 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RuntimeRepo.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RuntimeRepo.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RuntimeVersion.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RuntimeVersion.java index 6965297fb..c9d9d138a 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RuntimeVersion.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RuntimeVersion.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/SimBankTestsVersion.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/SimBankTestsVersion.java index c19740aa4..a79e435cd 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/SimBankTestsVersion.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/SimBankTestsVersion.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/SimplatformDockerVersion.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/SimplatformDockerVersion.java index 3bd8fd4c1..1ed16afe3 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/SimplatformDockerVersion.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/SimplatformDockerVersion.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/SimplatformRepo.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/SimplatformRepo.java index 62ae0413e..3eb4c121f 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/SimplatformRepo.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/SimplatformRepo.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/SimplatformVersion.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/SimplatformVersion.java index dfde30b63..556563e9c 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/SimplatformVersion.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/SimplatformVersion.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.galasaecosystem.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/GalasaEcosystemResourceManagement.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/GalasaEcosystemResourceManagement.java index ef2d205c1..59c92e892 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/GalasaEcosystemResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/GalasaEcosystemResourceManagement.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.galasaecosystem.internal.resourcemanagement; import java.util.concurrent.TimeUnit; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/RunIdPrefixMonitor.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/RunIdPrefixMonitor.java index 3a42a45c4..41dbb0814 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/RunIdPrefixMonitor.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/RunIdPrefixMonitor.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.galasaecosystem.internal.resourcemanagement; import java.util.HashSet; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/RunResourceMonitor.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/RunResourceMonitor.java index 6218dd75d..00e8e83cb 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/RunResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/RunResourceMonitor.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.galasaecosystem.internal.resourcemanagement; import java.util.HashSet; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/package-info.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/package-info.java index df7c12d47..fe8e2e551 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/package-info.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/package-info.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * Galasa Ecosystem Manager * diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/bootstrap-file.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/bootstrap-file.yaml index d416327e5..8c1eb5782 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/bootstrap-file.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/bootstrap-file.yaml @@ -1,4 +1,9 @@ +# # Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: v1 kind: ConfigMap metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config-grafana.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config-grafana.yaml index 52c81ec7d..92c440f9e 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config-grafana.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config-grafana.yaml @@ -1,4 +1,9 @@ +# # Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: v1 kind: ConfigMap metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config-prometheus.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config-prometheus.yaml index 4992cea04..1c0ff3733 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config-prometheus.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config-prometheus.yaml @@ -1,4 +1,9 @@ +# # Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: v1 kind: ConfigMap metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config.yaml index eff9dc1d7..bd134808b 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config.yaml @@ -1,7 +1,9 @@ +# # Copyright contributors to the Galasa project # -# The configuration properties for the Galasa Ecosystem +# SPDX-License-Identifier: EPL-2.0 # + apiVersion: v1 kind: ConfigMap metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose-simbank.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose-simbank.yaml index e35f90d85..807a3a402 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose-simbank.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose-simbank.yaml @@ -1,4 +1,9 @@ +# # Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: v1 kind: Service metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose-testing.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose-testing.yaml index 9334374ef..e10da0aaa 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose-testing.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose-testing.yaml @@ -1,4 +1,9 @@ +# # Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: v1 kind: Service metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose.yaml index b4e39424c..f7b4d6221 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/expose.yaml @@ -1,4 +1,9 @@ +# # Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: v1 kind: Service metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-api.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-api.yaml index 2d136e187..b74cec1ed 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-api.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-api.yaml @@ -1,4 +1,9 @@ +# # Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: v1 kind: PersistentVolumeClaim metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-grafana.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-grafana.yaml index e5dc944c1..cbe0f6fa0 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-grafana.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-grafana.yaml @@ -1,4 +1,9 @@ +# # Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: v1 kind: PersistentVolumeClaim metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-prometheus.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-prometheus.yaml index 7811a2e5b..b26452b46 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-prometheus.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/pvc-prometheus.yaml @@ -1,4 +1,9 @@ +# # Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: v1 kind: PersistentVolumeClaim metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-api.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-api.yaml index 8972e48e7..e92f9e30e 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-api.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-api.yaml @@ -1,6 +1,9 @@ # -# Copyright contributors to the Galasa project +# Copyright contributors to the Galasa project # +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-cps-etcd3.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-cps-etcd3.yaml index 124e291b5..2afdca843 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-cps-etcd3.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-cps-etcd3.yaml @@ -1,6 +1,9 @@ # -# Copyright contributors to the Galasa project +# Copyright contributors to the Galasa project # +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: apps/v1 kind: StatefulSet metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-engine-controller.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-engine-controller.yaml index d081a45e6..c4f84fb77 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-engine-controller.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-engine-controller.yaml @@ -1,6 +1,9 @@ # -# Copyright contributors to the Galasa project +# Copyright contributors to the Galasa project # +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-grafana.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-grafana.yaml index a7f34dda3..ccff26592 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-grafana.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-grafana.yaml @@ -1,6 +1,9 @@ # -# Copyright contributors to the Galasa project +# Copyright contributors to the Galasa project # +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-metrics.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-metrics.yaml index 2207ba194..64a4eb756 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-metrics.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-metrics.yaml @@ -1,6 +1,9 @@ # -# Copyright contributors to the Galasa project +# Copyright contributors to the Galasa project # +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-prometheus.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-prometheus.yaml index 76d3bab69..50f4532ee 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-prometheus.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-prometheus.yaml @@ -1,6 +1,9 @@ # -# Copyright contributors to the Galasa project +# Copyright contributors to the Galasa project # +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-ras-couchdb.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-ras-couchdb.yaml index f7c3e3af2..b28b0f042 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-ras-couchdb.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-ras-couchdb.yaml @@ -1,6 +1,9 @@ # -# Copyright contributors to the Galasa project +# Copyright contributors to the Galasa project # +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: apps/v1 kind: StatefulSet metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-resource-monitor.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-resource-monitor.yaml index f62f601de..95b5763aa 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-resource-monitor.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-resource-monitor.yaml @@ -1,4 +1,9 @@ -# Copyright contributors to the Galasa project +# +# Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-simbank.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-simbank.yaml index 2a95643e5..95e0944e5 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-simbank.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/server-simbank.yaml @@ -1,4 +1,9 @@ +# # Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/testcatalog-file.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/testcatalog-file.yaml index 35c8976de..f586a2a10 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/testcatalog-file.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/testcatalog-file.yaml @@ -1,4 +1,9 @@ +# # Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: v1 kind: ConfigMap metadata: diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/java/dev/galasa/jmeter/manager/ivt/JMeterManagerIVT.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/java/dev/galasa/jmeter/manager/ivt/JMeterManagerIVT.java index 4921eac27..f97bd4d71 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/java/dev/galasa/jmeter/manager/ivt/JMeterManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/java/dev/galasa/jmeter/manager/ivt/JMeterManagerIVT.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.jmeter.manager.ivt; import static org.assertj.core.api.Assertions.assertThat; @@ -16,13 +21,7 @@ import dev.galasa.jmeter.JMeterManagerException; import dev.galasa.jmeter.JMeterSession; -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ - - @Test +@Test public class JMeterManagerIVT { @Logger diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/IJMeterSession.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/IJMeterSession.java index 9ccac17d1..05e5985f0 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/IJMeterSession.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/IJMeterSession.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.jmeter; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/JMeterManagerException.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/JMeterManagerException.java index 03e492feb..3fa312703 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/JMeterManagerException.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/JMeterManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.jmeter; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/JMeterManagerField.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/JMeterManagerField.java index c0db29b28..271070093 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/JMeterManagerField.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/JMeterManagerField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.jmeter; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/JMeterSession.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/JMeterSession.java index eb0a3fae0..4afa57843 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/JMeterSession.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/JMeterSession.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.jmeter; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/internal/JMeterManagerImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/internal/JMeterManagerImpl.java index 8e6958f38..de4dc7e1e 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/internal/JMeterManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/internal/JMeterManagerImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.jmeter.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/internal/JMeterSessionImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/internal/JMeterSessionImpl.java index 9d99093a1..d874509d7 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/internal/JMeterSessionImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/internal/JMeterSessionImpl.java @@ -1,7 +1,8 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ - package dev.galasa.jmeter.internal; import java.io.ByteArrayInputStream; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/package-info.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/package-info.java index 8038bac1e..d51faa30c 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/package-info.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/package-info.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ /** * JMeter Manager diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/src/main/java/dev/galasa/selenium/manager/ivt/SeleniumManagerIVT.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/src/main/java/dev/galasa/selenium/manager/ivt/SeleniumManagerIVT.java index c2e3fd5d0..c30a2b28a 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/src/main/java/dev/galasa/selenium/manager/ivt/SeleniumManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager.ivt/src/main/java/dev/galasa/selenium/manager/ivt/SeleniumManagerIVT.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.manager.ivt; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/Browser.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/Browser.java index ef71110f9..3771a8507 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/Browser.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/Browser.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.selenium; import java.security.SecureRandom; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IChromeOptions.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IChromeOptions.java index 59de92a6b..f8d2f90f4 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IChromeOptions.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IChromeOptions.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.selenium; import java.io.File; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IEdgeOptions.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IEdgeOptions.java index c2309bb64..7582fc55c 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IEdgeOptions.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IEdgeOptions.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.selenium; import java.util.Map; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IFirefoxOptions.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IFirefoxOptions.java index 608307585..73c2c0ac7 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IFirefoxOptions.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IFirefoxOptions.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.selenium; import java.nio.file.Path; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IInternetExplorerOptions.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IInternetExplorerOptions.java index 6f7cd3dfd..c3a010969 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IInternetExplorerOptions.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IInternetExplorerOptions.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.selenium; import java.time.Duration; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IOperaOptions.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IOperaOptions.java index ab5637af8..042fa22e2 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IOperaOptions.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IOperaOptions.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/ISeleniumManager.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/ISeleniumManager.java index 4fbeb9189..f4d7a73bb 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/ISeleniumManager.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/ISeleniumManager.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.selenium; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IWebDriver.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IWebDriver.java index 4a0ee9365..15b620602 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IWebDriver.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IWebDriver.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.selenium; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IWebPage.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IWebPage.java index 1464b0860..b82c2f873 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IWebPage.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IWebPage.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.selenium; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/SeleniumManager.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/SeleniumManager.java index 09864bbbe..c717bcdd3 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/SeleniumManager.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/SeleniumManager.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.selenium; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/SeleniumManagerException.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/SeleniumManagerException.java index 10532198b..39e4604bc 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/SeleniumManagerException.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/SeleniumManagerException.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.selenium; import dev.galasa.ManagerException; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/SeleniumManagerField.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/SeleniumManagerField.java index 380531cad..1f0450b5e 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/SeleniumManagerField.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/SeleniumManagerField.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.selenium; import java.lang.annotation.Retention; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/WebDriver.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/WebDriver.java index 0c3f94c0a..633cd0d0c 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/WebDriver.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/WebDriver.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.selenium; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/ChromeOptionsImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/ChromeOptionsImpl.java index 8ef49fe4d..56ab981b6 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/ChromeOptionsImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/ChromeOptionsImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/DriverImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/DriverImpl.java index aa759a21d..28177ca20 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/DriverImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/DriverImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/EdgeOptionsImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/EdgeOptionsImpl.java index 3739a546b..c1760dae4 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/EdgeOptionsImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/EdgeOptionsImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/FirefoxOptionsImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/FirefoxOptionsImpl.java index 0ae3dc046..98620adf7 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/FirefoxOptionsImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/FirefoxOptionsImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/InternetExplorerOptionsImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/InternetExplorerOptionsImpl.java index 219f0034e..b9c52e960 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/InternetExplorerOptionsImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/InternetExplorerOptionsImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/LocalBrowser.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/LocalBrowser.java index 24e1fa3bc..e1b542784 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/LocalBrowser.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/LocalBrowser.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/LocalDriverImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/LocalDriverImpl.java index a1fd6cd4e..73cb6fa38 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/LocalDriverImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/LocalDriverImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/OperaOptionsImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/OperaOptionsImpl.java index fd695dfb8..028c851e4 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/OperaOptionsImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/OperaOptionsImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/RemoteDriverImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/RemoteDriverImpl.java index 7956fae9d..369001124 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/RemoteDriverImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/RemoteDriverImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumEnvironment.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumEnvironment.java index 20c928086..fe13031c5 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumEnvironment.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumEnvironment.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumGridSessionMonitor.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumGridSessionMonitor.java index 0513f3606..434edd105 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumGridSessionMonitor.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumGridSessionMonitor.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumManagerImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumManagerImpl.java index 95258c72c..5dda32ef4 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumManagerImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumResourceManagement.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumResourceManagement.java index 354db9645..38e06eeb0 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumResourceManagement.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumSlotResourceMonitor.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumSlotResourceMonitor.java index 508977935..0afdc4286 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumSlotResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumSlotResourceMonitor.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/WebPageImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/WebPageImpl.java index aef5772e4..c9d7f89b8 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/WebPageImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/WebPageImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumAvailableDrivers.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumAvailableDrivers.java index 25a8e5489..eaba28107 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumAvailableDrivers.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumAvailableDrivers.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumDefaultDriver.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumDefaultDriver.java index a8d3edc62..264cc7378 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumDefaultDriver.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumDefaultDriver.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumDockerNodeVersion.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumDockerNodeVersion.java index 2c6691ce6..391688e66 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumDockerNodeVersion.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumDockerNodeVersion.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumDriverMaxSlots.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumDriverMaxSlots.java index cd9103a23..38d1d150d 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumDriverMaxSlots.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumDriverMaxSlots.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumGeckoPreferences.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumGeckoPreferences.java index 0392cc5b5..4d7f78fc4 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumGeckoPreferences.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumGeckoPreferences.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumGeckoProfile.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumGeckoProfile.java index 496f7373c..084bbb93b 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumGeckoProfile.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumGeckoProfile.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumGridEndpoint.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumGridEndpoint.java index 268cd1c4e..a0c5e3ec9 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumGridEndpoint.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumGridEndpoint.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumKubernetesNamespace.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumKubernetesNamespace.java index 6c790cd4e..c5ecfb28c 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumKubernetesNamespace.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumKubernetesNamespace.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumKubernetesNodeSelector.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumKubernetesNodeSelector.java index c78cf2a66..0e803bda3 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumKubernetesNodeSelector.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumKubernetesNodeSelector.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumLocalDriverPath.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumLocalDriverPath.java index ccc34f04c..45fc8880a 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumLocalDriverPath.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumLocalDriverPath.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumPropertiesSingleton.java index 0643e3348..71887ff79 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumPropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumScreenshotFailure.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumScreenshotFailure.java index d89271664..9f718890c 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumScreenshotFailure.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumScreenshotFailure.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumWebDriverType.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumWebDriverType.java index 1a95c29a3..e04066f34 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumWebDriverType.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/properties/SeleniumWebDriverType.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/package-info.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/package-info.java index 97a6e3a0f..9170ca932 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/package-info.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/package-info.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * Selenium Manager * diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/spi/ISeleniumManagerSpi.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/spi/ISeleniumManagerSpi.java index 1f12675b7..6a64c7564 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/spi/ISeleniumManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/spi/ISeleniumManagerSpi.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.selenium.spi; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-deployment.yaml b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-deployment.yaml index 5e033ce47..e0851735f 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-deployment.yaml +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-deployment.yaml @@ -1,4 +1,9 @@ +# # Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-expose.yaml b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-expose.yaml index 08adc097f..8f535ac8d 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-expose.yaml +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-expose.yaml @@ -1,4 +1,9 @@ +# # Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: v1 kind: Service metadata: diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-pod.yaml b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-pod.yaml index 0d2bc6743..49f13a133 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-pod.yaml +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/resources/selenium-node-pod.yaml @@ -1,4 +1,9 @@ +# # Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: v1 kind: Pod metadata: diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager.ivt/src/main/java/dev/galasa/vtp/manager/ivt/VtpManagerIVT.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager.ivt/src/main/java/dev/galasa/vtp/manager/ivt/VtpManagerIVT.java index ef97e96d1..40c95e113 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager.ivt/src/main/java/dev/galasa/vtp/manager/ivt/VtpManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager.ivt/src/main/java/dev/galasa/vtp/manager/ivt/VtpManagerIVT.java @@ -1,7 +1,8 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ - package dev.galasa.vtp.manager.ivt; import org.apache.commons.logging.Log; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/internal/properties/DataSetHLQ.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/internal/properties/DataSetHLQ.java index e30412b5d..19cca7e9c 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/internal/properties/DataSetHLQ.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/internal/properties/DataSetHLQ.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.vtp.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/internal/properties/TransactionNamesForTag.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/internal/properties/TransactionNamesForTag.java index bdec7979f..e3d595fa0 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/internal/properties/TransactionNamesForTag.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/internal/properties/TransactionNamesForTag.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.vtp.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/internal/properties/VtpAPI.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/internal/properties/VtpAPI.java index a9ee38df8..84af5eeeb 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/internal/properties/VtpAPI.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/internal/properties/VtpAPI.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.vtp.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/internal/properties/VtpEnable.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/internal/properties/VtpEnable.java index 0ef87771f..351647cb7 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/internal/properties/VtpEnable.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/internal/properties/VtpEnable.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.vtp.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/internal/properties/VtpPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/internal/properties/VtpPropertiesSingleton.java index 37c9b4d98..cf01e05f4 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/internal/properties/VtpPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/internal/properties/VtpPropertiesSingleton.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.vtp.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/VtpManagerException.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/VtpManagerException.java index d8dc30e62..48f9f6bad 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/VtpManagerException.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/VtpManagerException.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.vtp.manager; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/RecordingData.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/RecordingData.java index 362f6f8e5..28b7e44d8 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/RecordingData.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/RecordingData.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.vtp.manager.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpApiRecorderImp.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpApiRecorderImp.java index d6e6bc97e..d4f85ba79 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpApiRecorderImp.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpApiRecorderImp.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.vtp.manager.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpManagerImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpManagerImpl.java index 656f4cad6..a54d55ac2 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpManagerImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.vtp.manager.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpRecorderImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpRecorderImpl.java index 892196c31..1183081d9 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpRecorderImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpRecorderImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.vtp.manager.internal; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpTxnRecorderImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpTxnRecorderImpl.java index f3fb088da..c55805ac6 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpTxnRecorderImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.vtp.manager/src/main/java/dev/galasa/vtp/manager/internal/VtpTxnRecorderImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.vtp.manager.internal; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/src/main/java/dev/galasa/linux/manager/ivt/LinuxManagerIVT.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/src/main/java/dev/galasa/linux/manager/ivt/LinuxManagerIVT.java index fdcca21f6..84a54b8c0 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/src/main/java/dev/galasa/linux/manager/ivt/LinuxManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager.ivt/src/main/java/dev/galasa/linux/manager/ivt/LinuxManagerIVT.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.manager.ivt; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/ILinuxImage.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/ILinuxImage.java index d7ae188fb..a77e55ad3 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/ILinuxImage.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/ILinuxImage.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/ILinuxManager.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/ILinuxManager.java index 5c2b3dade..c01df3544 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/ILinuxManager.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/ILinuxManager.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxImage.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxImage.java index 0ae0ac46f..5b1dab640 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxImage.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxImage.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxIpHost.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxIpHost.java index 002beff0d..e61d80a3a 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxIpHost.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxIpHost.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxManagerException.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxManagerException.java index 61fba04df..4949ea954 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxManagerException.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxManagerField.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxManagerField.java index bd77b84e7..fe0e6d181 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxManagerField.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxManagerField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/OperatingSystem.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/OperatingSystem.java index 00a4faad4..05f0da482 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/OperatingSystem.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/OperatingSystem.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/LinuxManagerImpl.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/LinuxManagerImpl.java index 72bee514a..7698b581b 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/LinuxManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/LinuxManagerImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.linux.internal; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/LinuxProperties.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/LinuxProperties.java index 942c26f3e..60576b8c6 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/LinuxProperties.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/LinuxProperties.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.internal; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/dse/LinuxDSEImage.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/dse/LinuxDSEImage.java index 1a24cf685..b7640aee0 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/dse/LinuxDSEImage.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/dse/LinuxDSEImage.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.internal.dse; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/dse/LinuxDSEIpHost.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/dse/LinuxDSEIpHost.java index 7172469cd..3c4aaf597 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/dse/LinuxDSEIpHost.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/dse/LinuxDSEIpHost.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.linux.internal.dse; import dev.galasa.ipnetwork.IIpPort; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/dse/LinuxDSEProvisioner.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/dse/LinuxDSEProvisioner.java index 24148f301..6f3feb2cf 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/dse/LinuxDSEProvisioner.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/dse/LinuxDSEProvisioner.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.linux.internal.dse; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxArchivesDirectory.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxArchivesDirectory.java index 5b9228987..e171586a1 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxArchivesDirectory.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxArchivesDirectory.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxCapabilities.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxCapabilities.java index a57d2dfc8..e1415dcc9 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxCapabilities.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxCapabilities.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxOperatingSystem.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxOperatingSystem.java index b53efc89b..41800bbfc 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxOperatingSystem.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxOperatingSystem.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxPropertiesSingleton.java index c1504ad4e..e2384db13 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxPropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/MaximumSlots.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/MaximumSlots.java index 16d19c2d9..33015c13c 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/MaximumSlots.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/MaximumSlots.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/RetainRunDirectory.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/RetainRunDirectory.java index b813f7741..257f7c231 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/RetainRunDirectory.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/RetainRunDirectory.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/SharedLinuxImages.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/SharedLinuxImages.java index a9e80b93d..fc090650e 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/SharedLinuxImages.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/SharedLinuxImages.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/SharedLinuxPriority.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/SharedLinuxPriority.java index 56ce7d7bc..c2e036573 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/SharedLinuxPriority.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/SharedLinuxPriority.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/UsernamePool.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/UsernamePool.java index b4956d052..2fd26e49b 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/UsernamePool.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/UsernamePool.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/package-info.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/package-info.java index 51b2536cc..f5ccc4b6f 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/package-info.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/package-info.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * Linux Manager - CPS Properties * diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/resourcemanagement/LinuxResourceManagement.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/resourcemanagement/LinuxResourceManagement.java index b56d72fb7..540821965 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/resourcemanagement/LinuxResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/resourcemanagement/LinuxResourceManagement.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.internal.resourcemanagement; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/resourcemanagement/SlotResourceManagement.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/resourcemanagement/SlotResourceManagement.java index 09945765a..77939ef70 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/resourcemanagement/SlotResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/resourcemanagement/SlotResourceManagement.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.internal.resourcemanagement; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/resourcemanagement/UsernameResourceManagement.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/resourcemanagement/UsernameResourceManagement.java index 2211e309b..66ab9fbc2 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/resourcemanagement/UsernameResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/resourcemanagement/UsernameResourceManagement.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.internal.resourcemanagement; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/shared/LinuxSharedImage.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/shared/LinuxSharedImage.java index f52a396b0..8c6400fc8 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/shared/LinuxSharedImage.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/shared/LinuxSharedImage.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.internal.shared; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/shared/LinuxSharedIpHost.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/shared/LinuxSharedIpHost.java index 63f0d973a..bf164560f 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/shared/LinuxSharedIpHost.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/shared/LinuxSharedIpHost.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.internal.shared; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/shared/LinuxSharedProvisioner.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/shared/LinuxSharedProvisioner.java index 4ed64e2e5..84e704df7 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/shared/LinuxSharedProvisioner.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/shared/LinuxSharedProvisioner.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.internal.shared; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/package-info.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/package-info.java index 752357b93..7d4137bfa 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/package-info.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/package-info.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ /** * Linux Manager diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/spi/ILinuxManagerSpi.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/spi/ILinuxManagerSpi.java index 63390d9fa..528c39f41 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/spi/ILinuxManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/spi/ILinuxManagerSpi.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.spi; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/spi/ILinuxProvisionedImage.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/spi/ILinuxProvisionedImage.java index 551083ceb..b35574083 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/spi/ILinuxProvisionedImage.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/spi/ILinuxProvisionedImage.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.spi; diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/spi/ILinuxProvisioner.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/spi/ILinuxProvisioner.java index a637bd360..dd60a7dc0 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/spi/ILinuxProvisioner.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/spi/ILinuxProvisioner.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.linux.spi; diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/IWindowsImage.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/IWindowsImage.java index 75d492d45..3a9f1eb72 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/IWindowsImage.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/IWindowsImage.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.windows; diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/IWindowsManager.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/IWindowsManager.java index 09b7b36f2..756e4787c 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/IWindowsManager.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/IWindowsManager.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.windows; diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsImage.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsImage.java index 5c7f5880b..f75148523 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsImage.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsImage.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.windows; diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsIpHost.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsIpHost.java index 4afe337a4..3be6d5178 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsIpHost.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsIpHost.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.windows; diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsManagerException.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsManagerException.java index 1af558c91..b08714ccc 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsManagerException.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.windows; diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsManagerField.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsManagerField.java index 1781018b9..61b84a4af 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsManagerField.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsManagerField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.windows; diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsDSEImage.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsDSEImage.java index fd6ecf746..44facbc6a 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsDSEImage.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsDSEImage.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.windows.internal; diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsDSEIpHost.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsDSEIpHost.java index 2836a1bb1..bd254cd0f 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsDSEIpHost.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsDSEIpHost.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.windows.internal; diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsDSEProvisioner.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsDSEProvisioner.java index 2c7a08b10..89d588a0d 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsDSEProvisioner.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsDSEProvisioner.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.windows.internal; diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsDefaultProvisioner.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsDefaultProvisioner.java index 8e0309a16..bdf77f2ab 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsDefaultProvisioner.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsDefaultProvisioner.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.windows.internal; diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsManagerImpl.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsManagerImpl.java index d1b698bfb..bdf4614ca 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsManagerImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.windows.internal; diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsProperties.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsProperties.java index 1effa4be7..681a802fa 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsProperties.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/WindowsProperties.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.windows.internal; diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/properties/RetainRunDirectory.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/properties/RetainRunDirectory.java index 1adb90985..f0d67af5a 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/properties/RetainRunDirectory.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/properties/RetainRunDirectory.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.windows.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/properties/WindowsPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/properties/WindowsPropertiesSingleton.java index 6508393e9..5abcb1c24 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/properties/WindowsPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/internal/properties/WindowsPropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.windows.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/spi/IWindowsManagerSpi.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/spi/IWindowsManagerSpi.java index 356cabef8..887f4d927 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/spi/IWindowsManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/spi/IWindowsManagerSpi.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.windows.spi; diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/spi/IWindowsProvisionedImage.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/spi/IWindowsProvisionedImage.java index 294ef5743..18a3670ce 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/spi/IWindowsProvisionedImage.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/spi/IWindowsProvisionedImage.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.windows.spi; diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/spi/IWindowsProvisioner.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/spi/IWindowsProvisioner.java index 08f19990d..245f6783b 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/spi/IWindowsProvisioner.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/spi/IWindowsProvisioner.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.windows.spi; diff --git a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/GitHubIssue.java b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/GitHubIssue.java index b3cb92813..9804f891d 100644 --- a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/GitHubIssue.java +++ b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/GitHubIssue.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.githubissue; diff --git a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/GitHubIssueManagerException.java b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/GitHubIssueManagerException.java index 4728df4ab..9c9d6ce47 100644 --- a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/GitHubIssueManagerException.java +++ b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/GitHubIssueManagerException.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.githubissue; diff --git a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/Issue.java b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/Issue.java index 5bdfd90ec..0c6139d18 100644 --- a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/Issue.java +++ b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/Issue.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.githubissue; diff --git a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/internal/GitHubIssueManagerImpl.java b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/internal/GitHubIssueManagerImpl.java index edc43786f..7b600b1b1 100644 --- a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/internal/GitHubIssueManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/internal/GitHubIssueManagerImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.githubissue.internal; diff --git a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/internal/properties/GitHubCredentials.java b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/internal/properties/GitHubCredentials.java index 22495ea8a..103769d46 100644 --- a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/internal/properties/GitHubCredentials.java +++ b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/internal/properties/GitHubCredentials.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.githubissue.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/internal/properties/GitHubIssueInstanceRepository.java b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/internal/properties/GitHubIssueInstanceRepository.java index 0fa1b0c0e..00e7c6d55 100644 --- a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/internal/properties/GitHubIssueInstanceRepository.java +++ b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/internal/properties/GitHubIssueInstanceRepository.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.githubissue.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/internal/properties/GitHubIssueInstanceUrl.java b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/internal/properties/GitHubIssueInstanceUrl.java index b283d69dc..74ded02ff 100644 --- a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/internal/properties/GitHubIssueInstanceUrl.java +++ b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/internal/properties/GitHubIssueInstanceUrl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.githubissue.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/internal/properties/GitHubIssuePropertiesSingleton.java b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/internal/properties/GitHubIssuePropertiesSingleton.java index 9b4efbc3f..721e8beed 100644 --- a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/internal/properties/GitHubIssuePropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/internal/properties/GitHubIssuePropertiesSingleton.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.githubissue.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerBatchIVT.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerBatchIVT.java index ff7be0ac0..2b6df603a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerBatchIVT.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerBatchIVT.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.manager.ivt; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileDatasetIVT.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileDatasetIVT.java index 0fbcf5f21..a753d1080 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileDatasetIVT.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileDatasetIVT.java @@ -1,7 +1,8 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ - package dev.galasa.zos.manager.ivt; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileIVT.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileIVT.java index 0627ae059..9e2aaaab7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileIVT.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileIVT.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.manager.ivt; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileVSAMIVT.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileVSAMIVT.java index 731b6df7e..1cae1033c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileVSAMIVT.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerFileVSAMIVT.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.manager.ivt; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerIVT.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerIVT.java index c4fde4543..d4f032699 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerIVT.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.manager.ivt; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerTSOCommandIVT.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerTSOCommandIVT.java index 41672ccab..948a03c05 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerTSOCommandIVT.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager.ivt/src/main/java/dev/galasa/zos/manager/ivt/ZosManagerTSOCommandIVT.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.manager.ivt; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosImage.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosImage.java index c2939bce9..91e1354dd 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosImage.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosImage.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos; import java.nio.charset.Charset; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosManager.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosManager.java index 263d2ddac..bbb50ca0f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosManager.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosManager.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosImage.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosImage.java index 2482abe45..2f735277b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosImage.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosImage.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosIpHost.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosIpHost.java index b526a028d..522fa6532 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosIpHost.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosIpHost.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosIpPort.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosIpPort.java index a89214636..16e3a5dbc 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosIpPort.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosIpPort.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosManagerException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosManagerException.java index e17f8f43b..c6c31055c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosManagerException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosManagerField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosManagerField.java index 3f4a4069e..38ecac65b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosManagerField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosManagerField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/SlotResourceMonitor.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/SlotResourceMonitor.java index 24681db6d..63860f358 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/SlotResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/SlotResourceMonitor.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosBaseImageImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosBaseImageImpl.java index c04b8d9f7..5356f03d7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosBaseImageImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosBaseImageImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal; import java.nio.charset.Charset; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosDseImageImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosDseImageImpl.java index c1f00420f..449810527 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosDseImageImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosDseImageImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosIpHostImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosIpHostImpl.java index 7503c772b..d78fe8638 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosIpHostImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosIpHostImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal; import dev.galasa.framework.spi.creds.CredentialsException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosIpPortImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosIpPortImpl.java index a86c0f394..df8f5596a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosIpPortImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosIpPortImpl.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal; import javax.validation.constraints.NotNull; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosManagerImpl.java index 033e33c85..d8970548d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosManagerImpl.java @@ -1,6 +1,8 @@ -/* -* Copyright contributors to the Galasa project -*/ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal; import java.io.IOException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosPoolPorts.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosPoolPorts.java index 3861f0a71..541616425 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosPoolPorts.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosPoolPorts.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosPortResourceMonitor.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosPortResourceMonitor.java index df44e7c8a..b3cdd2467 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosPortResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosPortResourceMonitor.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal; import java.util.Map; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosProvisionedImageImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosProvisionedImageImpl.java index 1087a226e..118668d3f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosProvisionedImageImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosProvisionedImageImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosResourceManagement.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosResourceManagement.java index 7b9afd3fe..13e97ba7e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/ZosResourceManagement.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal; import java.util.concurrent.TimeUnit; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/metrics/ZosMetrics.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/metrics/ZosMetrics.java index ef36e391d..9b8639c27 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/metrics/ZosMetrics.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/metrics/ZosMetrics.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.internal.metrics; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/BatchExtraBundle.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/BatchExtraBundle.java index 6c18120ed..dd5c87628 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/BatchExtraBundle.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/BatchExtraBundle.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ClusterIdForTag.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ClusterIdForTag.java index 18e37bf9a..2fa430509 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ClusterIdForTag.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ClusterIdForTag.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ClusterImages.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ClusterImages.java index de91b611b..93761ca9a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ClusterImages.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ClusterImages.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ConsoleExtraBundle.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ConsoleExtraBundle.java index a0b910f2c..5bb7721e9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ConsoleExtraBundle.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ConsoleExtraBundle.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/DseClusterIdForTag.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/DseClusterIdForTag.java index 818cccaad..422cca1a6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/DseClusterIdForTag.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/DseClusterIdForTag.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/DseImageIdForTag.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/DseImageIdForTag.java index 45b5fd66c..2122b6110 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/DseImageIdForTag.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/DseImageIdForTag.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/FileExtraBundle.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/FileExtraBundle.java index dcd8a2ef2..58fd74cf2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/FileExtraBundle.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/FileExtraBundle.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/HostId.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/HostId.java index 40b87020a..f3e9a1dfd 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/HostId.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/HostId.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ImageCodePage.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ImageCodePage.java index 492c89b46..79f65526d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ImageCodePage.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ImageCodePage.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ImageIdForTag.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ImageIdForTag.java index eb54e489c..338d4d1c2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ImageIdForTag.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ImageIdForTag.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ImageMaxSlots.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ImageMaxSlots.java index 7453392b5..ba81a5a4b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ImageMaxSlots.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ImageMaxSlots.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ImageSysname.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ImageSysname.java index d50a16b03..4396655dd 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ImageSysname.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ImageSysname.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import javax.validation.constraints.NotNull; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/JavaHome.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/JavaHome.java index cdddf8e54..e52881707 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/JavaHome.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/JavaHome.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import dev.galasa.framework.spi.ConfigurationPropertyStoreException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/LibertyInstallDir.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/LibertyInstallDir.java index 0fd5e2c8e..93921315c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/LibertyInstallDir.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/LibertyInstallDir.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import dev.galasa.framework.spi.ConfigurationPropertyStoreException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/PoolPorts.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/PoolPorts.java index a92380dbe..fd51bfc0f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/PoolPorts.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/PoolPorts.java @@ -1,6 +1,8 @@ /* -* Copyright contributors to the Galasa project -*/ + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/RunDatasetHLQ.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/RunDatasetHLQ.java index 7cc65ad43..f5c431815 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/RunDatasetHLQ.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/RunDatasetHLQ.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/RunUNIXPathPrefix.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/RunUNIXPathPrefix.java index 4fa0299b0..7788070b7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/RunUNIXPathPrefix.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/RunUNIXPathPrefix.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019-2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import javax.validation.constraints.NotNull; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/TSOCommandExtraBundle.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/TSOCommandExtraBundle.java index 3b836f218..b01f53bf9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/TSOCommandExtraBundle.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/TSOCommandExtraBundle.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/UNIXCommandExtraBundle.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/UNIXCommandExtraBundle.java index 7d73ecad3..98f11f6f8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/UNIXCommandExtraBundle.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/UNIXCommandExtraBundle.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ZosConnectInstallDir.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ZosConnectInstallDir.java index 483882722..1e02ff625 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ZosConnectInstallDir.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ZosConnectInstallDir.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import dev.galasa.framework.spi.ConfigurationPropertyStoreException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ZosPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ZosPropertiesSingleton.java index 6b0569702..1c0b6c8bf 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ZosPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/ZosPropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/package-info.java index 2c1d17084..a9655574a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/internal/properties/package-info.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * zOS Manager - CPS Properties * diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/package-info.java index 44d61e0dc..ad61bb8ee 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/package-info.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ /** * z/OS Manager diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/spi/IZosManagerSpi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/spi/IZosManagerSpi.java index dec1a370f..21247dc0d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/spi/IZosManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/spi/IZosManagerSpi.java @@ -1,6 +1,8 @@ -/* -* Copyright contributors to the Galasa project -*/ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.spi; import java.nio.file.Path; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/spi/ZosImageDependencyField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/spi/ZosImageDependencyField.java index 9ca1d48c1..5a5a3f296 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/spi/ZosImageDependencyField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/spi/ZosImageDependencyField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatch.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatch.java index 211918d36..ac4431b33 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatch.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatch.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosbatch; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJob.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJob.java index 27103154e..08c85efd7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJob.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJob.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch; /** diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJobOutput.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJobOutput.java index 7f97ff128..4eb8cc7f6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJobOutput.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJobOutput.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosbatch; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJobOutputSpoolFile.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJobOutputSpoolFile.java index 8dd6a56ec..334dbf9bf 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJobOutputSpoolFile.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJobOutputSpoolFile.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch; /** diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJobname.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJobname.java index 4afde152a..6a283e803 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJobname.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJobname.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosbatch; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatch.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatch.java index b8bcad3fd..016b3bf5b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatch.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatch.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosbatch; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchException.java index 29ee0329f..9113915ec 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosbatch; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchField.java index 338d3ae0c..e46ab6a48 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosbatch; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchJobcard.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchJobcard.java index 792f4e511..a8cbb61a3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchJobcard.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchJobcard.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosbatch; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchJobname.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchJobname.java index 5994ac665..dcd7f5a6b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchJobname.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchJobname.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosbatch; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchManagerException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchManagerException.java index 7ed5651d8..e908a3ed7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchManagerException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosbatch; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputImpl.java index 312990fe7..a15aa7b4f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.internal; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputSpoolFileImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputSpoolFileImpl.java index 15feb8a09..569c5ee8a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputSpoolFileImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputSpoolFileImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.internal; import dev.galasa.zosbatch.IZosBatchJob; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobnameImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobnameImpl.java index 3d4fbd133..a8fe0e2dc 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobnameImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobnameImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.internal; import javax.validation.constraints.NotNull; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/BatchRestrictToImage.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/BatchRestrictToImage.java index e7509ccd5..32552ae5a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/BatchRestrictToImage.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/BatchRestrictToImage.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosbatch.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/InputClass.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/InputClass.java index 969f7d56e..6f345805f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/InputClass.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/InputClass.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosbatch.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/JobWaitTimeout.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/JobWaitTimeout.java index 459af2327..d78ecd6f5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/JobWaitTimeout.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/JobWaitTimeout.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosbatch.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/JobnamePrefix.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/JobnamePrefix.java index be02a8fc0..38a89b99e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/JobnamePrefix.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/JobnamePrefix.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosbatch.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/MsgClass.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/MsgClass.java index f17bbcaab..890c740d3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/MsgClass.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/MsgClass.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosbatch.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/MsgLevel.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/MsgLevel.java index 868f870cf..a67665f30 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/MsgLevel.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/MsgLevel.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosbatch.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/TruncateJCLRecords.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/TruncateJCLRecords.java index b86523a1b..3c4b9178c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/TruncateJCLRecords.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/TruncateJCLRecords.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosbatch.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/UseSysaff.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/UseSysaff.java index c99fc6734..197838851 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/UseSysaff.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/UseSysaff.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosbatch.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/ZosBatchPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/ZosBatchPropertiesSingleton.java index e561df71d..aec4bf63c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/ZosBatchPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/ZosBatchPropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosbatch.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/package-info.java index 13fc5e99f..091d89750 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/properties/package-info.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * zOS Batch Manager - CPS Properties * diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/package-info.java index dd26b9f11..9452f3dc4 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/package-info.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ /** * z/OS Batch Manager Batch interface diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/spi/IZosBatchJobOutputSpi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/spi/IZosBatchJobOutputSpi.java index fe4563e39..9161e1117 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/spi/IZosBatchJobOutputSpi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/spi/IZosBatchJobOutputSpi.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.spi; import dev.galasa.zosbatch.IZosBatchJobOutput; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/spi/IZosBatchSpi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/spi/IZosBatchSpi.java index c526925ee..24fd9c932 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/spi/IZosBatchSpi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/spi/IZosBatchSpi.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosbatch.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/IZosConsole.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/IZosConsole.java index e7b7bbdd4..aef4cb81c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/IZosConsole.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/IZosConsole.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosconsole; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/IZosConsoleCommand.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/IZosConsoleCommand.java index 55e033283..f9b0d7110 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/IZosConsoleCommand.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/IZosConsoleCommand.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosconsole; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/ZosConsole.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/ZosConsole.java index acb8966f2..b101f2406 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/ZosConsole.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/ZosConsole.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosconsole; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/ZosConsoleException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/ZosConsoleException.java index 341caf1cd..6d8f26024 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/ZosConsoleException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/ZosConsoleException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosconsole; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/ZosConsoleField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/ZosConsoleField.java index 004b30acd..a1176ee14 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/ZosConsoleField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/ZosConsoleField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosconsole; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/ZosConsoleManagerException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/ZosConsoleManagerException.java index c3998535e..0db4911b7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/ZosConsoleManagerException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/ZosConsoleManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosconsole; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/internal/properties/ConsoleRestrictToImage.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/internal/properties/ConsoleRestrictToImage.java index 90b9a899d..856d77c7f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/internal/properties/ConsoleRestrictToImage.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/internal/properties/ConsoleRestrictToImage.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosconsole.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/internal/properties/ZosConsolePropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/internal/properties/ZosConsolePropertiesSingleton.java index 478af39af..64bcc35fb 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/internal/properties/ZosConsolePropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/internal/properties/ZosConsolePropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosconsole.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/package-info.java index abc63b216..a7b40987c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/package-info.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * z/OS Manager Console interface */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/spi/IZosConsoleSpi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/spi/IZosConsoleSpi.java index f4df7592c..4752f12ad 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/spi/IZosConsoleSpi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosconsole/spi/IZosConsoleSpi.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosconsole.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosDataset.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosDataset.java index 00145b7b3..dff4872cf 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosDataset.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosDataset.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile; import java.util.Collection; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosFileHandler.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosFileHandler.java index 7f092638b..0640a0582 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosFileHandler.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosFileHandler.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosfile; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosUNIXFile.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosUNIXFile.java index d35a4ea4d..4311590e9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosUNIXFile.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosUNIXFile.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile; import java.nio.file.attribute.PosixFilePermission; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosVSAMDataset.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosVSAMDataset.java index b5dcb52ba..327e2c056 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosVSAMDataset.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosVSAMDataset.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile; import javax.validation.constraints.NotNull; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosDatasetException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosDatasetException.java index 9fa1b1029..ec77d0de2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosDatasetException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosDatasetException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosfile; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosFileField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosFileField.java index a2cb9b697..3be5a0ede 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosFileField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosFileField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosfile; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosFileHandler.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosFileHandler.java index 726ab1911..7290681a7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosFileHandler.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosFileHandler.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosfile; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosFileManagerException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosFileManagerException.java index 5b1a6f315..14aa0c8d7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosFileManagerException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosFileManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosfile; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosUNIXFileException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosUNIXFileException.java index eca89e8aa..79fcd5423 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosUNIXFileException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosUNIXFileException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosfile; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosVSAMDatasetException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosVSAMDatasetException.java index 19276e22b..d4ac649d9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosVSAMDatasetException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/ZosVSAMDatasetException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosfile; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/internal/properties/DirectoryListMaxItems.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/internal/properties/DirectoryListMaxItems.java index 20c5d1c98..76f8f5f4f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/internal/properties/DirectoryListMaxItems.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/internal/properties/DirectoryListMaxItems.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosfile.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/internal/properties/FileRestrictToImage.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/internal/properties/FileRestrictToImage.java index 6efcbf34e..cb7e527eb 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/internal/properties/FileRestrictToImage.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/internal/properties/FileRestrictToImage.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosfile.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/internal/properties/UnixFilePermissions.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/internal/properties/UnixFilePermissions.java index fa0798dc7..8f3eb6080 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/internal/properties/UnixFilePermissions.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/internal/properties/UnixFilePermissions.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosfile.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/internal/properties/ZosFilePropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/internal/properties/ZosFilePropertiesSingleton.java index 3dae08166..d42474f8a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/internal/properties/ZosFilePropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/internal/properties/ZosFilePropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosfile.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/internal/properties/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/internal/properties/package-info.java index f48e574df..fe78b5937 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/internal/properties/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/internal/properties/package-info.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * zOS File zOSMF Manager - CPS Properties * diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/package-info.java index 58c2e18a9..4f1729fd3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/package-info.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * z/OS Manager File interface */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/spi/IZosFileSpi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/spi/IZosFileSpi.java index 391bfd8a0..58d67574b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/spi/IZosFileSpi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/spi/IZosFileSpi.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosfile.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/IZosTSOCommand.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/IZosTSOCommand.java index 1230b2575..9da99b588 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/IZosTSOCommand.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/IZosTSOCommand.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zostsocommand; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/ZosTSOCommand.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/ZosTSOCommand.java index 92b88516b..13cf5b36a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/ZosTSOCommand.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/ZosTSOCommand.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zostsocommand; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/ZosTSOCommandException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/ZosTSOCommandException.java index bf605a87e..34093e5a2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/ZosTSOCommandException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/ZosTSOCommandException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zostsocommand; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/ZosTSOCommandField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/ZosTSOCommandField.java index 209ad1eb3..e8b6408e7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/ZosTSOCommandField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/ZosTSOCommandField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zostsocommand; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/ZosTSOCommandManagerException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/ZosTSOCommandManagerException.java index 2744f52dc..f2be58c14 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/ZosTSOCommandManagerException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/ZosTSOCommandManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zostsocommand; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/package-info.java index f23fdc2ef..75f5823fc 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/package-info.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * z/OS Manager TSO interface */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/spi/IZosTSOCommandSpi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/spi/IZosTSOCommandSpi.java index c8eca6387..377d21234 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/spi/IZosTSOCommandSpi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zostsocommand/spi/IZosTSOCommandSpi.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zostsocommand.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/IZosUNIXCommand.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/IZosUNIXCommand.java index 5c0c6f7b0..512d77690 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/IZosUNIXCommand.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/IZosUNIXCommand.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosunixcommand; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommand.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommand.java index 3670b2b12..117f31a51 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommand.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommand.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosunixcommand; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommandAuthFailException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommandAuthFailException.java index 3c48ca11e..46e88863c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommandAuthFailException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommandAuthFailException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosunixcommand; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommandException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommandException.java index b43846ff7..da976efbc 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommandException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommandException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosunixcommand; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommandField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommandField.java index 9bebf7bed..632d961aa 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommandField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommandField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosunixcommand; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommandManagerException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommandManagerException.java index 73ade538f..b85b61e52 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommandManagerException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/ZosUNIXCommandManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosunixcommand; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/package-info.java index 0d2f4ea81..061bc84c4 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/package-info.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * z/OS Manager UNIX Command interface */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/spi/IZosUNIXCommandSpi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/spi/IZosUNIXCommandSpi.java index cbe24642c..a11cda5f2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/spi/IZosUNIXCommandSpi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosunixcommand/spi/IZosUNIXCommandSpi.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosunixcommand.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/TestZosManagerException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/TestZosManagerException.java index a949019a7..b04a648a2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/TestZosManagerException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/TestZosManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestSlotResourceMonitor.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestSlotResourceMonitor.java index 2738bf5e5..5a4d7b1a3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestSlotResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestSlotResourceMonitor.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal; import java.util.HashMap; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosBaseImageImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosBaseImageImpl.java index 36bf66f6e..e7b37a766 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosBaseImageImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosBaseImageImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosDseImageImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosDseImageImpl.java index 647b36ac8..47c4276b1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosDseImageImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosDseImageImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosIpHostImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosIpHostImpl.java index b5f0114cd..dc1f46505 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosIpHostImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosIpHostImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosManagerImpl.java index 5ac113507..522576f9e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal; import java.io.File; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosProvisionedImageImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosProvisionedImageImpl.java index 29848c99d..5f03bda77 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosProvisionedImageImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosProvisionedImageImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal; import org.apache.commons.logging.Log; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosResourceManagement.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosResourceManagement.java index 9c96cec00..f621782fb 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/TestZosResourceManagement.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal; import java.util.Random; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/metrics/TestZosMetrics.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/metrics/TestZosMetrics.java index 585e234f3..78432f879 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/metrics/TestZosMetrics.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/metrics/TestZosMetrics.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.metrics; import java.util.Random; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestBatchExtraBundle.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestBatchExtraBundle.java index fe931c35a..013d3e966 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestBatchExtraBundle.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestBatchExtraBundle.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestClusterIdForTag.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestClusterIdForTag.java index af20237c5..d0ae9b561 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestClusterIdForTag.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestClusterIdForTag.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestClusterImages.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestClusterImages.java index 3f4582122..d6909035a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestClusterImages.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestClusterImages.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import java.util.Arrays; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestConsoleExtraBundle.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestConsoleExtraBundle.java index 9f4f22f72..0e72cce2a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestConsoleExtraBundle.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestConsoleExtraBundle.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestDseClusterIdForTag.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestDseClusterIdForTag.java index bc2b1816f..6bb3357a1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestDseClusterIdForTag.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestDseClusterIdForTag.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestDseImageIdForTag.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestDseImageIdForTag.java index c4775e203..c25c4fd13 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestDseImageIdForTag.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestDseImageIdForTag.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestFileExtraBundle.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestFileExtraBundle.java index 27d6892ec..16de6f30b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestFileExtraBundle.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestFileExtraBundle.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestHostId.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestHostId.java index d1464cdd9..fed9388d9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestHostId.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestHostId.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestImageIdForTag.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestImageIdForTag.java index 5686ca95b..c69e6819c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestImageIdForTag.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestImageIdForTag.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestImageMaxSlots.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestImageMaxSlots.java index 74aab8c68..2a2931b86 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestImageMaxSlots.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestImageMaxSlots.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestImageSysname.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestImageSysname.java index 005afc11a..1c7390070 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestImageSysname.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestImageSysname.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestJavaHome.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestJavaHome.java index 7ebe7cadc..dec539307 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestJavaHome.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestJavaHome.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestLibertyInstallDir.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestLibertyInstallDir.java index 6f0aa56dc..6887c1dc8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestLibertyInstallDir.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestLibertyInstallDir.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestRunDatasetHLQ.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestRunDatasetHLQ.java index df0a670a2..525d72d4d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestRunDatasetHLQ.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestRunDatasetHLQ.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestRunUNIXPathPrefix.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestRunUNIXPathPrefix.java index fba1a48a7..6fef80640 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestRunUNIXPathPrefix.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestRunUNIXPathPrefix.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestTSOCommandExtraBundle.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestTSOCommandExtraBundle.java index bd9049cdc..3f1b415c9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestTSOCommandExtraBundle.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestTSOCommandExtraBundle.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestUNIXCommandExtraBundle.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestUNIXCommandExtraBundle.java index 58eec7439..05c1a58e4 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestUNIXCommandExtraBundle.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestUNIXCommandExtraBundle.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestZosConnectInstallDir.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestZosConnectInstallDir.java index dfff27e15..bf7eef047 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestZosConnectInstallDir.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestZosConnectInstallDir.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestZosPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestZosPropertiesSingleton.java index 52e1a4cd0..76ff4d163 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestZosPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zos/internal/properties/TestZosPropertiesSingleton.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/TestZosBatchEnumsAndExceptions.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/TestZosBatchEnumsAndExceptions.java index e9c882950..f8c2b136e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/TestZosBatchEnumsAndExceptions.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/TestZosBatchEnumsAndExceptions.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosbatch; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/TestZosBatchJobcard.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/TestZosBatchJobcard.java index efa41bd70..5d935f654 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/TestZosBatchJobcard.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/TestZosBatchJobcard.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/TestZosBatchJobOutputImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/TestZosBatchJobOutputImpl.java index 1733d90b2..6fb020871 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/TestZosBatchJobOutputImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/TestZosBatchJobOutputImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.internal; import java.util.Iterator; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/TestZosBatchJobOutputSpoolFileImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/TestZosBatchJobOutputSpoolFileImpl.java index 66a62bff8..1aa7719bb 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/TestZosBatchJobOutputSpoolFileImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/TestZosBatchJobOutputSpoolFileImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.internal; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/TestZosBatchJobnameImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/TestZosBatchJobnameImpl.java index 3d76f4d7e..cf9bad5f8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/TestZosBatchJobnameImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/TestZosBatchJobnameImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.internal; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestBatchRestrictToImage.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestBatchRestrictToImage.java index d06735ee1..3939ce7f2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestBatchRestrictToImage.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestBatchRestrictToImage.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestInputClass.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestInputClass.java index 1219c2d55..6002082f1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestInputClass.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestInputClass.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestJobWaitTimeout.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestJobWaitTimeout.java index d1469e0d0..309cc354b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestJobWaitTimeout.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestJobWaitTimeout.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestJobnamePrefix.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestJobnamePrefix.java index cb7f86eab..0229d2380 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestJobnamePrefix.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestJobnamePrefix.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestMsgClass.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestMsgClass.java index 4b296412f..bfacb9a81 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestMsgClass.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestMsgClass.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestMsgLevel.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestMsgLevel.java index b1cca9014..0d8104f21 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestMsgLevel.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestMsgLevel.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestTruncateJCLRecords.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestTruncateJCLRecords.java index 2e3ab49d2..3dabffda4 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestTruncateJCLRecords.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestTruncateJCLRecords.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestUseSysaff.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestUseSysaff.java index c84a5a9f0..55ee960fd 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestUseSysaff.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestUseSysaff.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestZosBatchZosmfPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestZosBatchZosmfPropertiesSingleton.java index f98208a7e..8120f4375 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestZosBatchZosmfPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/properties/TestZosBatchZosmfPropertiesSingleton.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosconsole/TestZosConsoleExceptions.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosconsole/TestZosConsoleExceptions.java index c3f2a6abe..ec5d11bd0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosconsole/TestZosConsoleExceptions.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosconsole/TestZosConsoleExceptions.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosconsole; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosconsole/internal/properties/TestRestrictToImage.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosconsole/internal/properties/TestRestrictToImage.java index a250338e6..5b635b735 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosconsole/internal/properties/TestRestrictToImage.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosconsole/internal/properties/TestRestrictToImage.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosconsole.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosconsole/internal/properties/TestZosConsoleZosmfPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosconsole/internal/properties/TestZosConsoleZosmfPropertiesSingleton.java index 8cc6e8090..a18cd7878 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosconsole/internal/properties/TestZosConsoleZosmfPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosconsole/internal/properties/TestZosConsoleZosmfPropertiesSingleton.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosconsole.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosfile/TestZosFileEnumsAndExceptions.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosfile/TestZosFileEnumsAndExceptions.java index 676f47c7c..afb9ad72e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosfile/TestZosFileEnumsAndExceptions.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosfile/TestZosFileEnumsAndExceptions.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosfile; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosfile/internal/properties/TestDirectoryListMaxItems.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosfile/internal/properties/TestDirectoryListMaxItems.java index 37a60c59e..fee65ebfc 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosfile/internal/properties/TestDirectoryListMaxItems.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosfile/internal/properties/TestDirectoryListMaxItems.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosfile/internal/properties/TestFileRestrictToImage.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosfile/internal/properties/TestFileRestrictToImage.java index 328898eaf..91740339a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosfile/internal/properties/TestFileRestrictToImage.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosfile/internal/properties/TestFileRestrictToImage.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosfile/internal/properties/TestUnixFilePermissions.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosfile/internal/properties/TestUnixFilePermissions.java index 9cf60da71..23f48d55a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosfile/internal/properties/TestUnixFilePermissions.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosfile/internal/properties/TestUnixFilePermissions.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosfile/internal/properties/TestZosFileZosmfPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosfile/internal/properties/TestZosFileZosmfPropertiesSingleton.java index 140148d97..ed1d79879 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosfile/internal/properties/TestZosFileZosmfPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosfile/internal/properties/TestZosFileZosmfPropertiesSingleton.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zostsocommand/TestZosTSOCommandExceptions.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zostsocommand/TestZosTSOCommandExceptions.java index 85e3634aa..6e10629f8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zostsocommand/TestZosTSOCommandExceptions.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zostsocommand/TestZosTSOCommandExceptions.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zostsocommand; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosunixcommand/TestZosUNIXCommandEnumsAndExceptions.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosunixcommand/TestZosUNIXCommandEnumsAndExceptions.java index 41ff01c60..bdd504b8e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosunixcommand/TestZosUNIXCommandEnumsAndExceptions.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosunixcommand/TestZosUNIXCommandEnumsAndExceptions.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosunixcommand; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/FieldContents.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/FieldContents.java index 861bd9296..f63b47cc5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/FieldContents.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/FieldContents.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.common.screens; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/Terminal.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/Terminal.java index 77029e893..febd9699d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/Terminal.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/Terminal.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.common.screens; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalField.java index c9aff5e8a..dd8d04245 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalField.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.common.screens; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalImage.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalImage.java index 4b1aae730..497324456 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalImage.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalImage.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.common.screens; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalSize.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalSize.java index 479b6012e..e3c637d27 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalSize.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalSize.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.common.screens; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageException.java index 47aaa2bb1..a82febc53 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageException.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.common.screens.images; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransform.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransform.java index 35d17a230..ddb584ac1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransform.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransform.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.common.screens.images; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/json/TerminalJsonTransform.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/json/TerminalJsonTransform.java index 662d869e0..a238c07c7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/json/TerminalJsonTransform.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/json/TerminalJsonTransform.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.common.screens.json; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageExceptionTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageExceptionTest.java index f5dd8441d..4a4dbbb72 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageExceptionTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageExceptionTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.common.screens.images; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java index 01dedabe5..7055e6822 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.common.screens.images; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/json/TerminalJsonTransformTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/json/TerminalJsonTransformTest.java index 260758dda..54c91b7af 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/json/TerminalJsonTransformTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/json/TerminalJsonTransformTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.common.screens.json; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/src/main/java/dev/galasa/zos3270/manager/ivt/Zos3270IVT.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/src/main/java/dev/galasa/zos3270/manager/ivt/Zos3270IVT.java index c68699f2e..8effa8077 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/src/main/java/dev/galasa/zos3270/manager/ivt/Zos3270IVT.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/src/main/java/dev/galasa/zos3270/manager/ivt/Zos3270IVT.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.manager.ivt; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/src/main/java/dev/galasa/zos3270/manager/ivt/Zos3270IVTSimframe.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/src/main/java/dev/galasa/zos3270/manager/ivt/Zos3270IVTSimframe.java index 9f38bbc13..c43e1b895 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/src/main/java/dev/galasa/zos3270/manager/ivt/Zos3270IVTSimframe.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager.ivt/src/main/java/dev/galasa/zos3270/manager/ivt/Zos3270IVTSimframe.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.manager.ivt; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/AttentionIdentification.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/AttentionIdentification.java index 7f599cb4a..729f03783 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/AttentionIdentification.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/AttentionIdentification.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/ErrorTextFoundException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/ErrorTextFoundException.java index d7fe207be..778328910 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/ErrorTextFoundException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/ErrorTextFoundException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/FieldNotFoundException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/FieldNotFoundException.java index 3122f9231..7d7c88899 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/FieldNotFoundException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/FieldNotFoundException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/IDatastreamListener.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/IDatastreamListener.java index 5958cd3c8..7a5e9f053 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/IDatastreamListener.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/IDatastreamListener.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos3270; public interface IDatastreamListener { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/IScreenUpdateListener.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/IScreenUpdateListener.java index 5a4fa1d48..3dd29ce4e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/IScreenUpdateListener.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/IScreenUpdateListener.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/ITerminal.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/ITerminal.java index 284eb2546..ae55aa292 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/ITerminal.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/ITerminal.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/IZos3270Manager.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/IZos3270Manager.java index 53ac76f12..b30820f45 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/IZos3270Manager.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/IZos3270Manager.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/KeyboardLockedException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/KeyboardLockedException.java index 94eb7ee1d..a2d517329 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/KeyboardLockedException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/KeyboardLockedException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/TerminalInterruptedException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/TerminalInterruptedException.java index 6961ea16a..f02538306 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/TerminalInterruptedException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/TerminalInterruptedException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/TextNotFoundException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/TextNotFoundException.java index 5ddec7c1f..566fe36e8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/TextNotFoundException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/TextNotFoundException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/TimeoutException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/TimeoutException.java index ce8efc9c5..92d36bce7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/TimeoutException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/TimeoutException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/Zos3270Exception.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/Zos3270Exception.java index 7a9b6038a..448f9a8ef 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/Zos3270Exception.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/Zos3270Exception.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/Zos3270ManagerException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/Zos3270ManagerException.java index 37635e0e0..b5615c1ce 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/Zos3270ManagerException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/Zos3270ManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/Zos3270Terminal.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/Zos3270Terminal.java index e5635cf0b..3712693e5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/Zos3270Terminal.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/Zos3270Terminal.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerField.java index ef8b60651..b9d61ec98 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java index c4970b50d..f9ea2372b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/Inbound3270Message.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/Inbound3270Message.java index 0d994adab..93750c855 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/Inbound3270Message.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/Inbound3270Message.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.comms; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/Network.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/Network.java index f6eb544bd..b49a98c7b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/Network.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/Network.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.comms; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/NetworkServer.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/NetworkServer.java index 6a12ccd88..91b0500fe 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/NetworkServer.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/NetworkServer.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.comms; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/NetworkThread.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/NetworkThread.java index 8ad3b7129..e3b0c965e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/NetworkThread.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/NetworkThread.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.comms; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/package-info.java index c77eb0a26..cf2d19196 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/comms/package-info.java @@ -1,7 +1,7 @@ /* - *Licensed Materials - Property of IBM + * Copyright contributors to the Galasa project * - *(c) Copyright IBM Corp. 2019. + * SPDX-License-Identifier: EPL-2.0 */ /** * zOS 3270 Terminal Manager - Internal Communications diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AbstractCommandCode.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AbstractCommandCode.java index 74b942003..cd6bbb0b7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AbstractCommandCode.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AbstractCommandCode.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AbstractOrder.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AbstractOrder.java index d6fcef38a..fda5da5e9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AbstractOrder.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AbstractOrder.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AbstractQueryReply.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AbstractQueryReply.java index 007964a4c..119f1ece5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AbstractQueryReply.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AbstractQueryReply.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeBackgroundColour.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeBackgroundColour.java index dc140536f..cb922e895 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeBackgroundColour.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeBackgroundColour.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeCharacterSet.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeCharacterSet.java index ce9520446..e7ad39dba 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeCharacterSet.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeCharacterSet.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeExtendedHighlighting.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeExtendedHighlighting.java index aa852f9e1..963ced688 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeExtendedHighlighting.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeExtendedHighlighting.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeFieldOutlining.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeFieldOutlining.java index 6ee9b32d7..bfaf56b90 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeFieldOutlining.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeFieldOutlining.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeFieldValidation.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeFieldValidation.java index 387b97388..dc0654af0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeFieldValidation.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeFieldValidation.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeForegroundColour.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeForegroundColour.java index 26ed6d954..e86bc754d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeForegroundColour.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeForegroundColour.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeResetAllAttributes.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeResetAllAttributes.java index eb4601470..c4e08ee70 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeResetAllAttributes.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeResetAllAttributes.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeTransparency.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeTransparency.java index 691b23287..6b8577035 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeTransparency.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/AttributeTransparency.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/BufferAddress.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/BufferAddress.java index 3accf2f50..2d5ac5e92 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/BufferAddress.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/BufferAddress.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandEraseWrite.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandEraseWrite.java index 0e38b32ed..4149a933a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandEraseWrite.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandEraseWrite.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandEraseWriteAlternate.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandEraseWriteAlternate.java index 297f4bbf8..19f0c1404 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandEraseWriteAlternate.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandEraseWriteAlternate.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandReadBuffer.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandReadBuffer.java index 1c50ce0ee..434decc13 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandReadBuffer.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandReadBuffer.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandReadModified.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandReadModified.java index 5b54e6658..2d83cbb72 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandReadModified.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandReadModified.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandReadModifiedAll.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandReadModifiedAll.java index 4b3910553..2ce22ae17 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandReadModifiedAll.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandReadModifiedAll.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandWrite.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandWrite.java index 3680151b6..b0e5777c2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandWrite.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandWrite.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandWriteStructured.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandWriteStructured.java index 11e4f53d9..b33dfa5f6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandWriteStructured.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/CommandWriteStructured.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/IAttribute.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/IAttribute.java index 5e3ad6d21..a7a28d391 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/IAttribute.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/IAttribute.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderCarrageReturn.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderCarrageReturn.java index 2991950a0..a1cad71be 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderCarrageReturn.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderCarrageReturn.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderEndOfMedium.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderEndOfMedium.java index 235cea6fa..879cd6d46 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderEndOfMedium.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderEndOfMedium.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderEraseUnprotectedToAddress.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderEraseUnprotectedToAddress.java index 75790db75..0c75812b0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderEraseUnprotectedToAddress.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderEraseUnprotectedToAddress.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderFormFeed.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderFormFeed.java index b9fcd87c0..a23b31d1a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderFormFeed.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderFormFeed.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderGraphicsEscape.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderGraphicsEscape.java index 36b9fd2be..6f21f601d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderGraphicsEscape.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderGraphicsEscape.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderInsertCursor.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderInsertCursor.java index 368ddb746..505d23ae8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderInsertCursor.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderInsertCursor.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderModifyField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderModifyField.java index 0c6913988..8a2f25b3f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderModifyField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderModifyField.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderNewLine.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderNewLine.java index 7def53434..1cbc4623f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderNewLine.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderNewLine.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderRepeatToAddress.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderRepeatToAddress.java index d4a416a4b..8adc614e8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderRepeatToAddress.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderRepeatToAddress.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderSetAttribute.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderSetAttribute.java index 208a0f6a0..ffd26586b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderSetAttribute.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderSetAttribute.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderSetBufferAddress.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderSetBufferAddress.java index 94637dd67..1d0635723 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderSetBufferAddress.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderSetBufferAddress.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderStartField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderStartField.java index f0fc9ae68..d6d5b71b3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderStartField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderStartField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderStartFieldExtended.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderStartFieldExtended.java index 505843599..03368318e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderStartFieldExtended.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderStartFieldExtended.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderText.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderText.java index 6a1fda07a..756a94025 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderText.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/OrderText.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyCharactersets.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyCharactersets.java index dad4b169a..5c191b075 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyCharactersets.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyCharactersets.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyColor.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyColor.java index d60662013..9c1b29992 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyColor.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyColor.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyHighlite.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyHighlite.java index fc6723b0d..8635467b5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyHighlite.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyHighlite.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyImplicitPartition.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyImplicitPartition.java index 63be3101b..58afd7de0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyImplicitPartition.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyImplicitPartition.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyNull.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyNull.java index d710c03d0..ca6307108 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyNull.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyNull.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM + * Copyright contributors to the Galasa project * - * (c) Copyright IBM Corp. 2020. + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplySummary.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplySummary.java index e671ef9ee..ba64606da 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplySummary.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplySummary.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyUsableArea.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyUsableArea.java index 125f1b9b2..4fb1f070f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyUsableArea.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/QueryReplyUsableArea.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/StructuredField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/StructuredField.java index 327e77158..78d4815f7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/StructuredField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/StructuredField.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/StructuredField3270DS.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/StructuredField3270DS.java index 6ab26773f..5c727aeba 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/StructuredField3270DS.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/StructuredField3270DS.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/StructuredFieldReadPartition.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/StructuredFieldReadPartition.java index bc261848c..497785d24 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/StructuredFieldReadPartition.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/StructuredFieldReadPartition.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/WriteControlCharacter.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/WriteControlCharacter.java index bbc10237d..2622031f7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/WriteControlCharacter.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/WriteControlCharacter.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/package-info.java index 086d17ec1..1c311cadf 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/datastream/package-info.java @@ -1,7 +1,7 @@ /* - *Licensed Materials - Property of IBM + * Copyright contributors to the Galasa project * - *(c) Copyright IBM Corp. 2019. + * SPDX-License-Identifier: EPL-2.0 */ /** * zOS 3270 Terminal Manager - Internal 3270 Datastream classes diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270CheckAppearsOnce.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270CheckAppearsOnce.java index f8ddfc49f..e2cbce8e3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270CheckAppearsOnce.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270CheckAppearsOnce.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos3270.internal.gherkin; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Credentials.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Credentials.java index 8588321ac..cbd33561f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Credentials.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Credentials.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos3270.internal.gherkin; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270GivenTerminal.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270GivenTerminal.java index 2b5cdc45d..9f9c8255b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270GivenTerminal.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270GivenTerminal.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.gherkin; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270MoveCursor.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270MoveCursor.java index 4304f41dc..ef912d55d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270MoveCursor.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270MoveCursor.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos3270.internal.gherkin; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270PressBasicKeys.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270PressBasicKeys.java index 60bf6f246..58f57905f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270PressBasicKeys.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270PressBasicKeys.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos3270.internal.gherkin; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270PressPfKeys.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270PressPfKeys.java index 60450f285..879b3226d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270PressPfKeys.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270PressPfKeys.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos3270.internal.gherkin; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Type.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Type.java index 9a261045c..645f0b3b7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Type.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Type.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos3270.internal.gherkin; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270TypeInField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270TypeInField.java index 13b0a316e..302bdfbfc 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270TypeInField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270TypeInField.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos3270.internal.gherkin; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270WaitKeyboard.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270WaitKeyboard.java index 55fc9600d..8b4f7e325 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270WaitKeyboard.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270WaitKeyboard.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos3270.internal.gherkin; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270WaitTextField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270WaitTextField.java index 19ee016e7..4b192acf3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270WaitTextField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270WaitTextField.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos3270.internal.gherkin; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/ApplyConfidentialTextFiltering.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/ApplyConfidentialTextFiltering.java index 70d0bf9ed..13a7083ec 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/ApplyConfidentialTextFiltering.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/ApplyConfidentialTextFiltering.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/ExtraBundles.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/ExtraBundles.java index 8d4a42160..a58858da2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/ExtraBundles.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/ExtraBundles.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos3270.internal.properties; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/LiveTerminalUrl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/LiveTerminalUrl.java index c69fa1312..18146119b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/LiveTerminalUrl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/LiveTerminalUrl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/LogConsoleTerminals.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/LogConsoleTerminals.java index 090744a54..69dd51062 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/LogConsoleTerminals.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/LogConsoleTerminals.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/TerminalDeviceTypes.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/TerminalDeviceTypes.java index be8588b34..c662e05fa 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/TerminalDeviceTypes.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/TerminalDeviceTypes.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/TerminalOutput.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/TerminalOutput.java index fae4ef9d6..b0ee264a4 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/TerminalOutput.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/TerminalOutput.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/Zos3270PropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/Zos3270PropertiesSingleton.java index 4fe32ba08..9d9555299 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/Zos3270PropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/Zos3270PropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/terminal/ScreenUpdateTextListener.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/terminal/ScreenUpdateTextListener.java index f946a4ef0..8ee740060 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/terminal/ScreenUpdateTextListener.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/terminal/ScreenUpdateTextListener.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.internal.terminal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/terminal/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/terminal/package-info.java index db125c0b6..3c9d3257c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/terminal/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/terminal/package-info.java @@ -1,7 +1,7 @@ /* - *Licensed Materials - Property of IBM + * Copyright contributors to the Galasa project * - *(c) Copyright IBM Corp. 2019. + * SPDX-License-Identifier: EPL-2.0 */ /** * zOS 3270 Terminal Manager - Internal 3270 Terminal classes diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/package-info.java index 6f91ccf64..63dd27df6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/package-info.java @@ -1,7 +1,7 @@ - /* - *Licensed Materials - Property of IBM +/* + * Copyright contributors to the Galasa project * - *(c) Copyright IBM Corp. 2020. + * SPDX-License-Identifier: EPL-2.0 */ /** * zOS 3270 Terminal Manager - TPI diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferCarrageReturn.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferCarrageReturn.java index d203357f5..3427e7d60 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferCarrageReturn.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferCarrageReturn.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferChar.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferChar.java index fd7b7f436..37fc7783b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferChar.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferChar.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferEndOfMedium.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferEndOfMedium.java index 8a54030ac..3a7400144 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferEndOfMedium.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferEndOfMedium.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferFormFeed.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferFormFeed.java index 4fc83f9b3..9109cad41 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferFormFeed.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferFormFeed.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferGraphicsEscape.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferGraphicsEscape.java index 912711d50..7d593f05b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferGraphicsEscape.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferGraphicsEscape.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferNewLine.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferNewLine.java index 87b046cf0..1a03ccf05 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferNewLine.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferNewLine.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferStartOfField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferStartOfField.java index a9f4535fd..15cc749c8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferStartOfField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferStartOfField.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Colour.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Colour.java index 72822485e..2b162bca5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Colour.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Colour.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/DatastreamException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/DatastreamException.java index 0d8f51aa4..abc88fed9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/DatastreamException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/DatastreamException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Field.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Field.java index 4a02249ba..83836a83d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Field.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Field.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Highlight.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Highlight.java index fd14a0062..c0b6f4df6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Highlight.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Highlight.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/IBufferHolder.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/IBufferHolder.java index ff42ac572..dc0879012 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/IBufferHolder.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/IBufferHolder.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/IZos3270ManagerSpi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/IZos3270ManagerSpi.java index 0aefe54ab..ce725469b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/IZos3270ManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/IZos3270ManagerSpi.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/NetworkException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/NetworkException.java index 971d35137..3f718592c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/NetworkException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/NetworkException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Screen.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Screen.java index b45b071f0..982fd8dd3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Screen.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Screen.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Terminal.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Terminal.java index f3771fa5d..d6c5ff121 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Terminal.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Terminal.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index ba1b61bd5..cb7143652 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/package-info.java index d4a8ba1d9..09d252fe1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/package-info.java @@ -1,7 +1,7 @@ /* - *Licensed Materials - Property of IBM + * Copyright contributors to the Galasa project * - *(c) Copyright IBM Corp. 2020. + * SPDX-License-Identifier: EPL-2.0 */ /** * Zos3270Terminal Manager diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/commandcodes/ReadModifiedTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/commandcodes/ReadModifiedTest.java index d52b6b68c..b3e6ba006 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/commandcodes/ReadModifiedTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/commandcodes/ReadModifiedTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.commandcodes; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackSpaceTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackSpaceTest.java index 67dc99afd..1c5517382 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackSpaceTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackSpaceTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.cursor; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackTabTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackTabTest.java index 2a2961e93..ae7cf61c5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackTabTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackTabTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.cursor; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/FieldOverflowTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/FieldOverflowTest.java index a84b79e62..3697b240a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/FieldOverflowTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/FieldOverflowTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.cursor; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/HomeTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/HomeTest.java index f74e30e5d..590911394 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/HomeTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/HomeTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.cursor; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/NewLineTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/NewLineTest.java index c485f1049..a7337e00d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/NewLineTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/NewLineTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.cursor; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/TabTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/TabTest.java index 18797fc83..edc2ef7c5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/TabTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/TabTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.cursor; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/ByteAddressTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/ByteAddressTest.java index d31006037..6d9518571 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/ByteAddressTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/ByteAddressTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/CommandCodeTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/CommandCodeTest.java index c4c160499..51a1f2c0f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/CommandCodeTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/CommandCodeTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/EraseUnprotectedToAddressTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/EraseUnprotectedToAddressTest.java index 4c3f1d197..ea39828f5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/EraseUnprotectedToAddressTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/EraseUnprotectedToAddressTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/GraphicsEscapeTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/GraphicsEscapeTest.java index 6572d880a..9356ed8aa 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/GraphicsEscapeTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/GraphicsEscapeTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/InboundTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/InboundTest.java index 49b80e8ec..3de565643 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/InboundTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/InboundTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderInsertCursorTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderInsertCursorTest.java index 91b951081..a94ccbe58 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderInsertCursorTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderInsertCursorTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderTextTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderTextTest.java index cdc2043e6..65da8a688 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderTextTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/OrderTextTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplySummaryTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplySummaryTest.java index 4beb07e7c..eaa341e06 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplySummaryTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplySummaryTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplyUsableAreaTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplyUsableAreaTest.java index cc0a78b39..fd34563c7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplyUsableAreaTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/QueryReplyUsableAreaTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/RepeatToAddressTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/RepeatToAddressTest.java index b8e120787..f1d2fd85f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/RepeatToAddressTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/RepeatToAddressTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/SetBufferAddressTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/SetBufferAddressTest.java index 69c355576..5b3310509 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/SetBufferAddressTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/SetBufferAddressTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/StartFieldTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/StartFieldTest.java index e85252ec5..8bc009b51 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/StartFieldTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/StartFieldTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/VampScreenTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/VampScreenTest.java index ed4f8c748..d695ad358 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/VampScreenTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/VampScreenTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/WriteControlCharacterTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/WriteControlCharacterTest.java index 4722434f7..665ff210e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/WriteControlCharacterTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/WriteControlCharacterTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.datastream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/extended/ExtendedDatastreamTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/extended/ExtendedDatastreamTest.java index 5551c99e4..a78e1f538 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/extended/ExtendedDatastreamTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/extended/ExtendedDatastreamTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.datastream.extended; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/structuredfields/ReadPartitionTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/structuredfields/ReadPartitionTest.java index 16c5a36fc..e3e393cce 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/structuredfields/ReadPartitionTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/datastream/structuredfields/ReadPartitionTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.datastream.structuredfields; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/ConnectTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/ConnectTest.java index 4c9597bca..f486248ef 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/ConnectTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/ConnectTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.network; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Message3270Test.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Message3270Test.java index 7ecbdc144..7eb3b92e6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Message3270Test.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Message3270Test.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.network; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/NegotiationTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/NegotiationTest.java index a18d5da03..66c06be5a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/NegotiationTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/NegotiationTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.network; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Network3270Test.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Network3270Test.java index e757149a3..07d7d52fd 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Network3270Test.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/network/Network3270Test.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.network; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/EraseAllUnprotectedTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/EraseAllUnprotectedTest.java index 742b76944..54d421962 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/EraseAllUnprotectedTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/EraseAllUnprotectedTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.orders; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java index 44f207a58..128d936b7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.orders; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/CursorTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/CursorTest.java index 85cc9ed04..9085044c3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/CursorTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/CursorTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.terminal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/EraseInputTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/EraseInputTest.java index da71e5fc0..4e2f8d166 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/EraseInputTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/EraseInputTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.terminal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/FindTextTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/FindTextTest.java index 567c052fa..2c2f74385 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/FindTextTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/FindTextTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.terminal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/RetrieveTextTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/RetrieveTextTest.java index d279bff24..61729f765 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/RetrieveTextTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/RetrieveTextTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.terminal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/ScreenTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/ScreenTest.java index 8374c4b70..c9332d600 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/ScreenTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/terminal/ScreenTest.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.terminal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocket.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocket.java index 47c5f078e..d37a7f2ee 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocket.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocket.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.util; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocketImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocketImpl.java index f5524f97a..fa59a888e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocketImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/DummySocketImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.util; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/IOExceptionInputStream.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/IOExceptionInputStream.java index abf1d0ff8..e27f7b643 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/IOExceptionInputStream.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/IOExceptionInputStream.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.util; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/Zos3270TestBase.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/Zos3270TestBase.java index 5b2f3c7db..768fa6e01 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/Zos3270TestBase.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/util/Zos3270TestBase.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zos3270.util; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestColour.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestColour.java index 1dc292d03..51f710671 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestColour.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestColour.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package t; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestInbound.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestInbound.java index a350a7720..c76c03dde 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestInbound.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestInbound.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package t; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiZosBatchImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiZosBatchImpl.java index 3bd28440a..f30f85c74 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiZosBatchImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiZosBatchImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.rseapi.manager.internal; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiZosBatchJobImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiZosBatchJobImpl.java index 3cb3ae4ae..87b802a0b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiZosBatchJobImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiZosBatchJobImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.rseapi.manager.internal; import java.nio.file.Path; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiZosBatchManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiZosBatchManagerImpl.java index 83153d628..a02064ebd 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiZosBatchManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiZosBatchManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.rseapi.manager.internal; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/package-info.java index 2921354fc..3b332189d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/package-info.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ /** * z/OS Batch Manager - RSE API Internal Implementation diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/test/java/dev/galasa/zosbatch/rseapi/manager/internal/TestRseapiZosBatchImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/test/java/dev/galasa/zosbatch/rseapi/manager/internal/TestRseapiZosBatchImpl.java index 552577cd9..c64283ba4 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/test/java/dev/galasa/zosbatch/rseapi/manager/internal/TestRseapiZosBatchImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/test/java/dev/galasa/zosbatch/rseapi/manager/internal/TestRseapiZosBatchImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.rseapi.manager.internal; import java.io.IOException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/test/java/dev/galasa/zosbatch/rseapi/manager/internal/TestRseapiZosBatchJobImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/test/java/dev/galasa/zosbatch/rseapi/manager/internal/TestRseapiZosBatchJobImpl.java index a9c857d1c..40183b140 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/test/java/dev/galasa/zosbatch/rseapi/manager/internal/TestRseapiZosBatchJobImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/test/java/dev/galasa/zosbatch/rseapi/manager/internal/TestRseapiZosBatchJobImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.rseapi.manager.internal; import java.io.IOException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/test/java/dev/galasa/zosbatch/rseapi/manager/internal/TestRseapiZosBatchManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/test/java/dev/galasa/zosbatch/rseapi/manager/internal/TestRseapiZosBatchManagerImpl.java index a6fa7c615..0fe8402a1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/test/java/dev/galasa/zosbatch/rseapi/manager/internal/TestRseapiZosBatchManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/test/java/dev/galasa/zosbatch/rseapi/manager/internal/TestRseapiZosBatchManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.rseapi.manager.internal; import java.io.File; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/main/java/dev/galasa/zosbatch/zosmf/manager/internal/ZosmfZosBatchImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/main/java/dev/galasa/zosbatch/zosmf/manager/internal/ZosmfZosBatchImpl.java index 620f9d375..73ff7c556 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/main/java/dev/galasa/zosbatch/zosmf/manager/internal/ZosmfZosBatchImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/main/java/dev/galasa/zosbatch/zosmf/manager/internal/ZosmfZosBatchImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.zosmf.manager.internal; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/main/java/dev/galasa/zosbatch/zosmf/manager/internal/ZosmfZosBatchJobImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/main/java/dev/galasa/zosbatch/zosmf/manager/internal/ZosmfZosBatchJobImpl.java index 4a5e5f41a..50cb50aee 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/main/java/dev/galasa/zosbatch/zosmf/manager/internal/ZosmfZosBatchJobImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/main/java/dev/galasa/zosbatch/zosmf/manager/internal/ZosmfZosBatchJobImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.zosmf.manager.internal; import java.nio.file.Path; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/main/java/dev/galasa/zosbatch/zosmf/manager/internal/ZosmfZosBatchManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/main/java/dev/galasa/zosbatch/zosmf/manager/internal/ZosmfZosBatchManagerImpl.java index df0058cef..9a61d02ed 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/main/java/dev/galasa/zosbatch/zosmf/manager/internal/ZosmfZosBatchManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/main/java/dev/galasa/zosbatch/zosmf/manager/internal/ZosmfZosBatchManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.zosmf.manager.internal; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/main/java/dev/galasa/zosbatch/zosmf/manager/internal/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/main/java/dev/galasa/zosbatch/zosmf/manager/internal/package-info.java index 902df6bf8..5197c301b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/main/java/dev/galasa/zosbatch/zosmf/manager/internal/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/main/java/dev/galasa/zosbatch/zosmf/manager/internal/package-info.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ /** * z/OS Batch Manager - z/OS MF Internal Implementation diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/test/java/dev/galasa/zosbatch/zosmf/manager/internal/TestZosmfZosBatchImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/test/java/dev/galasa/zosbatch/zosmf/manager/internal/TestZosmfZosBatchImpl.java index 5458bba85..1dfd52b22 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/test/java/dev/galasa/zosbatch/zosmf/manager/internal/TestZosmfZosBatchImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/test/java/dev/galasa/zosbatch/zosmf/manager/internal/TestZosmfZosBatchImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.zosmf.manager.internal; import java.io.IOException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/test/java/dev/galasa/zosbatch/zosmf/manager/internal/TestZosmfZosBatchJobImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/test/java/dev/galasa/zosbatch/zosmf/manager/internal/TestZosmfZosBatchJobImpl.java index f2184c1b9..3789b0be4 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/test/java/dev/galasa/zosbatch/zosmf/manager/internal/TestZosmfZosBatchJobImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/test/java/dev/galasa/zosbatch/zosmf/manager/internal/TestZosmfZosBatchJobImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.zosmf.manager.internal; import java.io.IOException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/test/java/dev/galasa/zosbatch/zosmf/manager/internal/TestZosmfZosBatchManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/test/java/dev/galasa/zosbatch/zosmf/manager/internal/TestZosmfZosBatchManagerImpl.java index 398a89ba0..81557addb 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/test/java/dev/galasa/zosbatch/zosmf/manager/internal/TestZosmfZosBatchManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/src/test/java/dev/galasa/zosbatch/zosmf/manager/internal/TestZosmfZosBatchManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.zosmf.manager.internal; import java.io.File; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/OeconsolZosConsoleCommandImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/OeconsolZosConsoleCommandImpl.java index 6e83bede0..ae33eef7c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/OeconsolZosConsoleCommandImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/OeconsolZosConsoleCommandImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosconsole.oeconsol.manager; import org.apache.commons.logging.Log; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/OeconsolZosConsoleImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/OeconsolZosConsoleImpl.java index 27b24e659..eea7c8828 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/OeconsolZosConsoleImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/OeconsolZosConsoleImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosconsole.oeconsol.manager; import dev.galasa.ICredentials; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/OeconsolZosConsoleManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/OeconsolZosConsoleManagerImpl.java index 49f89e2d9..30bef7780 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/OeconsolZosConsoleManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/OeconsolZosConsoleManagerImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosconsole.oeconsol.manager; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/internal/properties/OeconsolPath.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/internal/properties/OeconsolPath.java index 39c3f1364..88f2638c3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/internal/properties/OeconsolPath.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/internal/properties/OeconsolPath.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosconsole.oeconsol.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/internal/properties/OeconsolPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/internal/properties/OeconsolPropertiesSingleton.java index d5d3db9cb..134927b5f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/internal/properties/OeconsolPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/internal/properties/OeconsolPropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosconsole.oeconsol.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/internal/properties/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/internal/properties/package-info.java index 9ee3c1567..9995e028d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/internal/properties/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/internal/properties/package-info.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** *zOS Console Manager - oeconsol Internal Implementation - CPS Properties * diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/package-info.java index 26b667786..f8d317ec4 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/main/java/dev/galasa/zosconsole/oeconsol/manager/package-info.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * zOS Console Manager - oeconsol Internal Implementation * diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/test/java/dev/galasa/zosconsole/oeconsol/manager/TestOeconsolZosConsoleCommandImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/test/java/dev/galasa/zosconsole/oeconsol/manager/TestOeconsolZosConsoleCommandImpl.java index 52792d205..f1edc3031 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/test/java/dev/galasa/zosconsole/oeconsol/manager/TestOeconsolZosConsoleCommandImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/test/java/dev/galasa/zosconsole/oeconsol/manager/TestOeconsolZosConsoleCommandImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosconsole.oeconsol.manager; import org.apache.commons.logging.Log; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/test/java/dev/galasa/zosconsole/oeconsol/manager/TestOeconsolZosConsoleImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/test/java/dev/galasa/zosconsole/oeconsol/manager/TestOeconsolZosConsoleImpl.java index 0ca8376ec..e053f18a0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/test/java/dev/galasa/zosconsole/oeconsol/manager/TestOeconsolZosConsoleImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/test/java/dev/galasa/zosconsole/oeconsol/manager/TestOeconsolZosConsoleImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosconsole.oeconsol.manager; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/test/java/dev/galasa/zosconsole/oeconsol/manager/TestOeconsolZosConsoleManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/test/java/dev/galasa/zosconsole/oeconsol/manager/TestOeconsolZosConsoleManagerImpl.java index a80329d05..c670f24db 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/test/java/dev/galasa/zosconsole/oeconsol/manager/TestOeconsolZosConsoleManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/test/java/dev/galasa/zosconsole/oeconsol/manager/TestOeconsolZosConsoleManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosconsole.oeconsol.manager; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/test/java/dev/galasa/zosconsole/oeconsol/manager/internal/properties/TestOeconsolPath.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/test/java/dev/galasa/zosconsole/oeconsol/manager/internal/properties/TestOeconsolPath.java index 1d9b4ba75..0ccb2f812 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/test/java/dev/galasa/zosconsole/oeconsol/manager/internal/properties/TestOeconsolPath.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/test/java/dev/galasa/zosconsole/oeconsol/manager/internal/properties/TestOeconsolPath.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosconsole.oeconsol.manager.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/test/java/dev/galasa/zosconsole/oeconsol/manager/internal/properties/TestOeconsolPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/test/java/dev/galasa/zosconsole/oeconsol/manager/internal/properties/TestOeconsolPropertiesSingleton.java index df446dc0e..0ea58d732 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/test/java/dev/galasa/zosconsole/oeconsol/manager/internal/properties/TestOeconsolPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.oeconsol.manager/src/test/java/dev/galasa/zosconsole/oeconsol/manager/internal/properties/TestOeconsolPropertiesSingleton.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosconsole.oeconsol.manager.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/main/java/dev/galasa/zosconsole/zosmf/manager/internal/ZosmfZosConsoleCommandImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/main/java/dev/galasa/zosconsole/zosmf/manager/internal/ZosmfZosConsoleCommandImpl.java index 71abf35e6..718c3f7b8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/main/java/dev/galasa/zosconsole/zosmf/manager/internal/ZosmfZosConsoleCommandImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/main/java/dev/galasa/zosconsole/zosmf/manager/internal/ZosmfZosConsoleCommandImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosconsole.zosmf.manager.internal; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/main/java/dev/galasa/zosconsole/zosmf/manager/internal/ZosmfZosConsoleImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/main/java/dev/galasa/zosconsole/zosmf/manager/internal/ZosmfZosConsoleImpl.java index baf708333..cf31099d7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/main/java/dev/galasa/zosconsole/zosmf/manager/internal/ZosmfZosConsoleImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/main/java/dev/galasa/zosconsole/zosmf/manager/internal/ZosmfZosConsoleImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosconsole.zosmf.manager.internal; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/main/java/dev/galasa/zosconsole/zosmf/manager/internal/ZosmfZosConsoleManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/main/java/dev/galasa/zosconsole/zosmf/manager/internal/ZosmfZosConsoleManagerImpl.java index ce99a7854..26c2611c7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/main/java/dev/galasa/zosconsole/zosmf/manager/internal/ZosmfZosConsoleManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/main/java/dev/galasa/zosconsole/zosmf/manager/internal/ZosmfZosConsoleManagerImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019-2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosconsole.zosmf.manager.internal; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/main/java/dev/galasa/zosconsole/zosmf/manager/internal/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/main/java/dev/galasa/zosconsole/zosmf/manager/internal/package-info.java index 80b44bb6a..88ce8f47f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/main/java/dev/galasa/zosconsole/zosmf/manager/internal/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/main/java/dev/galasa/zosconsole/zosmf/manager/internal/package-info.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * zOS Console Manager - zOSMF Internal Implementation * diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/test/java/dev/galasa/zosconsole/zosmf/manager/internal/TestZosmfZosConsoleCommandImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/test/java/dev/galasa/zosconsole/zosmf/manager/internal/TestZosmfZosConsoleCommandImpl.java index 95e6502b4..118fe5e67 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/test/java/dev/galasa/zosconsole/zosmf/manager/internal/TestZosmfZosConsoleCommandImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/test/java/dev/galasa/zosconsole/zosmf/manager/internal/TestZosmfZosConsoleCommandImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosconsole.zosmf.manager.internal; import org.apache.http.HttpStatus; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/test/java/dev/galasa/zosconsole/zosmf/manager/internal/TestZosmfZosConsoleImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/test/java/dev/galasa/zosconsole/zosmf/manager/internal/TestZosmfZosConsoleImpl.java index bac62720c..fd71612a7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/test/java/dev/galasa/zosconsole/zosmf/manager/internal/TestZosmfZosConsoleImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/test/java/dev/galasa/zosconsole/zosmf/manager/internal/TestZosmfZosConsoleImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosconsole.zosmf.manager.internal; import org.apache.http.HttpStatus; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/test/java/dev/galasa/zosconsole/zosmf/manager/internal/TestZosmfZosConsoleManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/test/java/dev/galasa/zosconsole/zosmf/manager/internal/TestZosmfZosConsoleManagerImpl.java index 86e58fd68..058857eb4 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/test/java/dev/galasa/zosconsole/zosmf/manager/internal/TestZosmfZosConsoleManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/src/test/java/dev/galasa/zosconsole/zosmf/manager/internal/TestZosmfZosConsoleManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosconsole.zosmf.manager.internal; import java.io.File; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosDatasetAttributesListdsi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosDatasetAttributesListdsi.java index cdc5c5a7c..9c9a88a04 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosDatasetAttributesListdsi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosDatasetAttributesListdsi.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.rseapi.manager.internal; import java.io.BufferedReader; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosDatasetImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosDatasetImpl.java index d12089c2a..f6f58ba93 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosDatasetImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosDatasetImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.rseapi.manager.internal; import java.io.ByteArrayOutputStream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosFileHandlerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosFileHandlerImpl.java index ab6282ac4..549b50630 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosFileHandlerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosFileHandlerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.rseapi.manager.internal; import java.nio.file.Path; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosFileManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosFileManagerImpl.java index 343f9932e..cb5435357 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosFileManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosFileManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.rseapi.manager.internal; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosUNIXFileImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosUNIXFileImpl.java index 2e131431f..d9baa0f3d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosUNIXFileImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosUNIXFileImpl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosfile.rseapi.manager.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosUnixCommand.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosUnixCommand.java index 2cec838d0..34c0de5b5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosUnixCommand.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosUnixCommand.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.rseapi.manager.internal; import org.apache.commons.logging.Log; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosVSAMDatasetImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosVSAMDatasetImpl.java index ba1b1e113..916214f94 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosVSAMDatasetImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosVSAMDatasetImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.rseapi.manager.internal; import java.nio.file.Path; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/package-info.java index 496bb041d..1f54e47a4 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/package-info.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ /** * z/OS File Manager - RSE API Internal Implementation diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosDatasetAttributesListdsi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosDatasetAttributesListdsi.java index 01d135695..2023db070 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosDatasetAttributesListdsi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosDatasetAttributesListdsi.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.rseapi.manager.internal; import java.io.BufferedReader; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosDatasetImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosDatasetImpl.java index 69df839d1..c2559ed85 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosDatasetImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosDatasetImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.rseapi.manager.internal; import java.io.ByteArrayInputStream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosFileHandlerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosFileHandlerImpl.java index d60a0f721..04316551a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosFileHandlerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosFileHandlerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.rseapi.manager.internal; import java.nio.file.Path; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosFileManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosFileManagerImpl.java index e84afbd46..f88560233 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosFileManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosFileManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.rseapi.manager.internal; import java.io.File; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosUNIXFileImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosUNIXFileImpl.java index 8ba93fac5..935f36bc9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosUNIXFileImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosUNIXFileImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.rseapi.manager.internal; import java.io.IOException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosUnixCommand.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosUnixCommand.java index a06339620..7121be498 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosUnixCommand.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosUnixCommand.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.rseapi.manager.internal; import org.apache.http.HttpStatus; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosVSAMDatasetImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosVSAMDatasetImpl.java index 9b91b325f..9b7fd7c56 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosVSAMDatasetImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/test/java/dev/galasa/zosfile/rseapi/manager/internal/TestRseapiZosVSAMDatasetImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.rseapi.manager.internal; import java.io.IOException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosDatasetAttributesListdsi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosDatasetAttributesListdsi.java index 6d03e5184..bfd53084c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosDatasetAttributesListdsi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosDatasetAttributesListdsi.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.zosmf.manager.internal; import java.io.BufferedReader; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosDatasetImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosDatasetImpl.java index dc207d5c9..5fcfdf349 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosDatasetImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosDatasetImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.zosmf.manager.internal; import java.io.ByteArrayOutputStream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosFileHandlerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosFileHandlerImpl.java index f9de4b1a9..635069eef 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosFileHandlerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosFileHandlerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.zosmf.manager.internal; import java.nio.file.Path; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosFileManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosFileManagerImpl.java index 82f237099..f3e30f6bd 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosFileManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosFileManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.zosmf.manager.internal; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosUNIXFileImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosUNIXFileImpl.java index 509d5e74a..811b2eeab 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosUNIXFileImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosUNIXFileImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.zosmf.manager.internal; import java.io.IOException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosVSAMDatasetImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosVSAMDatasetImpl.java index 471c92e18..8bae6e2cd 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosVSAMDatasetImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosVSAMDatasetImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.zosmf.manager.internal; import java.nio.file.Path; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/package-info.java index 3b0a511e0..8cfa5e090 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/package-info.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ /** * z/OS File Manager - zOS/MF Internal Implementation diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosDatasetAttributesListdsi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosDatasetAttributesListdsi.java index 6bd79c34f..f64919f82 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosDatasetAttributesListdsi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosDatasetAttributesListdsi.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.zosmf.manager.internal; import java.io.BufferedReader; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosDatasetImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosDatasetImpl.java index 78387d95c..914e24af1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosDatasetImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosDatasetImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.zosmf.manager.internal; import java.io.ByteArrayInputStream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosFileHandlerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosFileHandlerImpl.java index c26ab0a43..d49105fca 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosFileHandlerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosFileHandlerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.zosmf.manager.internal; import java.nio.file.Path; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosFileManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosFileManagerImpl.java index 546495a84..bb3e749e9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosFileManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosFileManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.zosmf.manager.internal; import java.io.File; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosUNIXFileImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosUNIXFileImpl.java index ed6c0ce42..a0249a27c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosUNIXFileImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosUNIXFileImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.zosmf.manager.internal; import java.io.IOException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosVSAMDatasetImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosVSAMDatasetImpl.java index 2e326c4ec..1c41a1797 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosVSAMDatasetImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosfile/zosmf/manager/internal/TestZosmfZosVSAMDatasetImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.zosmf.manager.internal; import java.io.IOException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosunixcommand/ssh/manager/internal/ZosUNIXCommandManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosunixcommand/ssh/manager/internal/ZosUNIXCommandManagerImpl.java index dee8b928a..a445020c2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosunixcommand/ssh/manager/internal/ZosUNIXCommandManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/test/java/dev/galasa/zosunixcommand/ssh/manager/internal/ZosUNIXCommandManagerImpl.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosunixcommand.ssh.manager.internal; import javax.validation.constraints.NotNull; @@ -7,6 +12,7 @@ import dev.galasa.zosunixcommand.IZosUNIXCommand; import dev.galasa.zosunixcommand.spi.IZosUNIXCommandSpi; + /** * Dummy interface for test */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/IZosLibertyAngel.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/IZosLibertyAngel.java index 27e0c13ac..4545de03f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/IZosLibertyAngel.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/IZosLibertyAngel.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.angel; /** diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/ZosLibertyAngel.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/ZosLibertyAngel.java index 8fde668bb..7985d9a8e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/ZosLibertyAngel.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/ZosLibertyAngel.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.angel; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/ZosLibertyAngelException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/ZosLibertyAngelException.java index 6fdaa9399..9213c59b7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/ZosLibertyAngelException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/ZosLibertyAngelException.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosliberty.angel; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/ZosLibertyAngelManagerException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/ZosLibertyAngelManagerException.java index 30637421c..14ca2a51e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/ZosLibertyAngelManagerException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/ZosLibertyAngelManagerException.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosliberty.angel; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/ZosLibertyAngelField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/ZosLibertyAngelField.java index 69c54583e..0b001c09c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/ZosLibertyAngelField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/ZosLibertyAngelField.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosliberty.angel.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/ZosLibertyAngelImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/ZosLibertyAngelImpl.java index 6aeb57d0a..1293a05be 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/ZosLibertyAngelImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/ZosLibertyAngelImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.angel.internal; import java.time.LocalDateTime; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/ZosLibertyAngelManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/ZosLibertyAngelManagerImpl.java index de545c741..961fd529f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/ZosLibertyAngelManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/ZosLibertyAngelManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.angel.internal; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/package-info.java index 91f1af513..f0cdf5ba4 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/package-info.java @@ -1,4 +1,6 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.angel.internal; \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/properties/DefaultTimeout.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/properties/DefaultTimeout.java index 965915090..4e783302b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/properties/DefaultTimeout.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/properties/DefaultTimeout.java @@ -1,7 +1,8 @@ -/* - /* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.angel.internal.properties; import dev.galasa.framework.spi.cps.CpsProperties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/properties/Procname.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/properties/Procname.java index 797fb581c..2a31ea4f1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/properties/Procname.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/properties/Procname.java @@ -1,7 +1,8 @@ -/* - /* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.angel.internal.properties; import dev.galasa.framework.spi.cps.CpsProperties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/properties/ZosLibertyAngelPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/properties/ZosLibertyAngelPropertiesSingleton.java index 2d16cd351..b1fa10248 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/properties/ZosLibertyAngelPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/internal/properties/ZosLibertyAngelPropertiesSingleton.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosliberty.angel.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/package-info.java index d98c9d89f..3a69c1cec 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/package-info.java @@ -1,4 +1,6 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.angel; \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/spi/IZosLibertyAngelSpi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/spi/IZosLibertyAngelSpi.java index 8e1d20305..a59fe1fdf 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/spi/IZosLibertyAngelSpi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/spi/IZosLibertyAngelSpi.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.angel.spi; import javax.validation.constraints.NotNull; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/spi/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/spi/package-info.java index a27c6b5af..b0a396588 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/spi/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/src/main/java/dev/galasa/zosliberty/angel/spi/package-info.java @@ -1,4 +1,6 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.angel.spi; \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLiberty.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLiberty.java index aa181f4a0..a2f786c94 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLiberty.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLiberty.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty; import dev.galasa.zos.IZosImage; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServer.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServer.java index 293c53114..edf7cad86 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServer.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServer.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerLog.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerLog.java index 30484596d..052f4484a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerLog.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerLog.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty; import java.io.OutputStream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerLogs.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerLogs.java index e373ff198..254726781 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerLogs.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerLogs.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty; /** diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerXml.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerXml.java index 9487295f2..c58cab937 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerXml.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerXml.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerXmlElementList.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerXmlElementList.java index d8a3a5e53..36bbf9892 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerXmlElementList.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerXmlElementList.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty; import java.util.Collection; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/ZosLiberty.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/ZosLiberty.java index f415c540a..feeeeb0a0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/ZosLiberty.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/ZosLiberty.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/ZosLibertyManagerException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/ZosLibertyManagerException.java index fd912a8ef..3c307617b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/ZosLibertyManagerException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/ZosLibertyManagerException.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosliberty; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/ZosLibertyServerException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/ZosLibertyServerException.java index 9853bc15c..38facebf3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/ZosLibertyServerException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/ZosLibertyServerException.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosliberty; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyField.java index 34b6f23de..574ba350f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyField.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosliberty.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyImpl.java index 686b3d175..0a1312ebd 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.internal; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyManagerImpl.java index e07725b41..dd9b5f1f7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.internal; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyServerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyServerImpl.java index 478d074c6..4f718477f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyServerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyServerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.internal; import java.io.ByteArrayInputStream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyServerLogImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyServerLogImpl.java index 02b0d8a02..5a5ef7b3b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyServerLogImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyServerLogImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.internal; import java.io.ByteArrayInputStream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyServerLogsImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyServerLogsImpl.java index 985672328..2cc1b9bae 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyServerLogsImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyServerLogsImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.internal; import java.util.HashMap; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyServerXmlElementListImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyServerXmlElementListImpl.java index 5a6e8e62a..f80c7c66e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyServerXmlElementListImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyServerXmlElementListImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.internal; import java.util.Collection; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyServerXmlImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyServerXmlImpl.java index d64d7b56d..cb6ae748d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyServerXmlImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/ZosLibertyServerXmlImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.internal; import java.io.IOException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/package-info.java index 459ae805e..13e20b0c3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/package-info.java @@ -1,4 +1,6 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.internal; \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/properties/DefaultTimeout.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/properties/DefaultTimeout.java index fa9bfa3a4..d8d6d1680 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/properties/DefaultTimeout.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/properties/DefaultTimeout.java @@ -1,7 +1,8 @@ -/* - /* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.internal.properties; import dev.galasa.framework.spi.cps.CpsProperties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/properties/ZosLibertyPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/properties/ZosLibertyPropertiesSingleton.java index a6a6d4d61..b14cd8826 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/properties/ZosLibertyPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/internal/properties/ZosLibertyPropertiesSingleton.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosliberty.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/package-info.java index 86d87819c..865c0985b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/package-info.java @@ -1,4 +1,6 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty; \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/spi/IZosLibertySpi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/spi/IZosLibertySpi.java index cb1a57796..151c069bc 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/spi/IZosLibertySpi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/spi/IZosLibertySpi.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.spi; import javax.validation.constraints.NotNull; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/spi/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/spi/package-info.java index 49ee8cc48..f125e7f1e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/spi/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/spi/package-info.java @@ -1,4 +1,6 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty.spi; \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmf.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmf.java index f4597db56..ea7a7a734 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmf.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmf.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosmf; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmfManager.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmfManager.java index 50a586b14..1eb06c90c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmfManager.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmfManager.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosmf; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmfResponse.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmfResponse.java index 1b5174bd5..c68a41d2a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmfResponse.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmfResponse.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosmf; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmfRestApiProcessor.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmfRestApiProcessor.java index b329f64ce..524fb4bf1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmfRestApiProcessor.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmfRestApiProcessor.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosmf; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/Zosmf.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/Zosmf.java index 1c66bb856..59f1a8847 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/Zosmf.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/Zosmf.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosmf; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/ZosmfException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/ZosmfException.java index a5ec59ba6..d70943e32 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/ZosmfException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/ZosmfException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosmf; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/ZosmfManagerException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/ZosmfManagerException.java index b9ddc990f..7606f8ead 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/ZosmfManagerException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/ZosmfManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosmf; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/ZosmfImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/ZosmfImpl.java index 6ec125142..b31e45ed2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/ZosmfImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/ZosmfImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosmf.internal; import java.net.MalformedURLException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/ZosmfManagerField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/ZosmfManagerField.java index 33072ce4a..a3fa38113 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/ZosmfManagerField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/ZosmfManagerField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosmf.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/ZosmfManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/ZosmfManagerImpl.java index 6b780dcc2..b18322915 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/ZosmfManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/ZosmfManagerImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019-2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosmf.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/ZosmfResponseImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/ZosmfResponseImpl.java index e4baeabb8..7604911d2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/ZosmfResponseImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/ZosmfResponseImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosmf.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/ZosmfRestApiProcessor.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/ZosmfRestApiProcessor.java index e8cad743f..b8d007437 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/ZosmfRestApiProcessor.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/ZosmfRestApiProcessor.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosmf.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/package-info.java index 7d4ee8b24..d43a4c5f4 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/package-info.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * zOSMF Manager */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/Https.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/Https.java index 859e1cffc..6a8f2fc12 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/Https.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/Https.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosmf.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/ImageServers.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/ImageServers.java index 22adeadf3..85420d53f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/ImageServers.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/ImageServers.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosmf.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/RequestRetry.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/RequestRetry.java index 90c3e76cb..fa7ca0500 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/RequestRetry.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/RequestRetry.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosmf.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/ServerCreds.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/ServerCreds.java index a41f165b4..210ce5d66 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/ServerCreds.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/ServerCreds.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosmf.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/ServerImage.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/ServerImage.java index 6b2b60f77..09b1f032a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/ServerImage.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/ServerImage.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosmf.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/ServerPort.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/ServerPort.java index 89b2840a4..f33a9fbb1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/ServerPort.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/ServerPort.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosmf.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/SysplexServers.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/SysplexServers.java index eeb3d5a18..9679bffd0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/SysplexServers.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/SysplexServers.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosmf.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/ZosmfPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/ZosmfPropertiesSingleton.java index 3ceebcb6c..bc5502e26 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/ZosmfPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/ZosmfPropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosmf.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/package-info.java index a69cb774f..a1047d9b0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/internal/properties/package-info.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * zOSMF Manager - CPS Properties * diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/package-info.java index a0d35e94c..85a203163 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/package-info.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ /** * zOS/MF Manager diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/spi/IZosmfManagerSpi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/spi/IZosmfManagerSpi.java index f63cf3cf4..8afe948d2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/spi/IZosmfManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/spi/IZosmfManagerSpi.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosmf.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/spi/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/spi/package-info.java index 85deadd33..9efe32089 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/spi/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/spi/package-info.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * zOSMF Manager - Internal SPI */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/TestEnumsAndExeptions.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/TestEnumsAndExeptions.java index 5e8439a5a..6b15a4b23 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/TestEnumsAndExeptions.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/TestEnumsAndExeptions.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosmf; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/TestZosmfImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/TestZosmfImpl.java index dc26d1707..9803b6dab 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/TestZosmfImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/TestZosmfImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosmf.internal; import java.io.ByteArrayInputStream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/TestZosmfManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/TestZosmfManagerImpl.java index 6d03d23f9..fd3a24d0d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/TestZosmfManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/TestZosmfManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosmf.internal; import java.io.File; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/TestZosmfResponseImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/TestZosmfResponseImpl.java index 0cd728dca..6abc22f96 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/TestZosmfResponseImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/TestZosmfResponseImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosmf.internal; import java.io.ByteArrayInputStream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/TestZosmfRestApiProcessor.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/TestZosmfRestApiProcessor.java index 8e8794e4d..801395762 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/TestZosmfRestApiProcessor.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/TestZosmfRestApiProcessor.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosmf.internal; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestHttps.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestHttps.java index 8fe435e52..8a89042be 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestHttps.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestHttps.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosmf.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestImageServers.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestImageServers.java index 659b2e888..812b70bb6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestImageServers.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestImageServers.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosmf.internal.properties; import java.util.Arrays; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestRequestRetry.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestRequestRetry.java index b767b9678..2137c02a7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestRequestRetry.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestRequestRetry.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosmf.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestServerCreds.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestServerCreds.java index f3d23ac71..82fee88e1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestServerCreds.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestServerCreds.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosmf.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestServerImage.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestServerImage.java index 0d9af8efa..3792b3f18 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestServerImage.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestServerImage.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosmf.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestServerPort.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestServerPort.java index 238012423..4963cb52a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestServerPort.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestServerPort.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosmf.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestSysplexServers.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestSysplexServers.java index a4f5da29c..96d452b72 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestSysplexServers.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestSysplexServers.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosmf.internal.properties; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestZosmfPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestZosmfPropertiesSingleton.java index 3a9cbbb47..a2ee47ee8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestZosmfPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestZosmfPropertiesSingleton.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosmf.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/IZosProgram.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/IZosProgram.java index a5fcb7feb..3784acc48 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/IZosProgram.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/IZosProgram.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosprogram; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgram.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgram.java index 9f3ad6f85..fe2ccc210 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgram.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgram.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosprogram; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgramException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgramException.java index 78e633886..f512e8bab 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgramException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgramException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosprogram; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgramManagerException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgramManagerException.java index 455f4d20e..4fe0c66f7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgramManagerException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgramManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosprogram; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/AbstractZosProgramCompiler.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/AbstractZosProgramCompiler.java index b22e914e4..52bdfa5b9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/AbstractZosProgramCompiler.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/AbstractZosProgramCompiler.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosprogram.internal; import java.io.IOException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosAssemblerProgramCompiler.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosAssemblerProgramCompiler.java index 63c15f263..3cdbbbe33 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosAssemblerProgramCompiler.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosAssemblerProgramCompiler.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosprogram.internal; import java.util.Collections; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosCProgramCompiler.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosCProgramCompiler.java index 1f9589a83..c134cfe9d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosCProgramCompiler.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosCProgramCompiler.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosprogram.internal; import java.util.Collections; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosCobolProgramCompiler.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosCobolProgramCompiler.java index 54d78b49d..cddac6c59 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosCobolProgramCompiler.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosCobolProgramCompiler.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosprogram.internal; import java.util.Collections; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosPl1ProgramCompiler.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosPl1ProgramCompiler.java index 91fce0777..5f382a6eb 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosPl1ProgramCompiler.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosPl1ProgramCompiler.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosprogram.internal; import java.util.Collections; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosProgramImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosProgramImpl.java index 51b7cfea5..beacd199a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosProgramImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosProgramImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosprogram.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosProgramManagerField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosProgramManagerField.java index 36874e6b9..42ef65a31 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosProgramManagerField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosProgramManagerField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosprogram.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosProgramManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosProgramManagerImpl.java index cd8b5ee49..fe9ce4695 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosProgramManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/ZosProgramManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosprogram.internal; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/package-info.java index 28d238a47..f99d63d7e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/package-info.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * zOS Program Manager */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/CICSDatasetPrefix.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/CICSDatasetPrefix.java index fd15e613c..abf03402e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/CICSDatasetPrefix.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/CICSDatasetPrefix.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosprogram.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/LanguageEnvironmentDatasetPrefix.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/LanguageEnvironmentDatasetPrefix.java index 9f2a9ad91..0bacfe7ff 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/LanguageEnvironmentDatasetPrefix.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/LanguageEnvironmentDatasetPrefix.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosprogram.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/ProgramLanguageCompileSyslibs.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/ProgramLanguageCompileSyslibs.java index 7acdb3aad..33baef1e0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/ProgramLanguageCompileSyslibs.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/ProgramLanguageCompileSyslibs.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosprogram.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/ProgramLanguageDatasetPrefix.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/ProgramLanguageDatasetPrefix.java index e297558f1..2047338f8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/ProgramLanguageDatasetPrefix.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/ProgramLanguageDatasetPrefix.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosprogram.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/ProgramLanguageLinkSyslibs.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/ProgramLanguageLinkSyslibs.java index 5a63079d0..6fa4a41f2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/ProgramLanguageLinkSyslibs.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/ProgramLanguageLinkSyslibs.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosprogram.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/ZosProgramPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/ZosProgramPropertiesSingleton.java index befd7f509..90931950f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/ZosProgramPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/ZosProgramPropertiesSingleton.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosprogram.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/package-info.java index dd41e1125..565b79e17 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/internal/properties/package-info.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * zOS Program Manager - CPS Properties * diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/package-info.java index 2e2bc5624..249bdc587 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/package-info.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ /** * zOS Program Manager diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/spi/IZosProgramManagerSpi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/spi/IZosProgramManagerSpi.java index bf790aa10..27a699410 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/spi/IZosProgramManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/spi/IZosProgramManagerSpi.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosprogram.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/spi/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/spi/package-info.java index 1f74031e4..68d39de1e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/spi/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/spi/package-info.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * zOS Program Manager - Internal SPI */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/TestExeptionsAndEnums.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/TestExeptionsAndEnums.java index a2d6cfb80..f25ff29a1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/TestExeptionsAndEnums.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/TestExeptionsAndEnums.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosprogram; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestAbstractZosProgramCompiler.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestAbstractZosProgramCompiler.java index 1bd30a27b..c267ca6d1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestAbstractZosProgramCompiler.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestAbstractZosProgramCompiler.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosprogram.internal; import java.io.IOException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosAssemblerProgramCompiler.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosAssemblerProgramCompiler.java index ec8f3e21f..eb1200708 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosAssemblerProgramCompiler.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosAssemblerProgramCompiler.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosprogram.internal; import java.util.Arrays; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosCProgramCompiler.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosCProgramCompiler.java index 2353d5118..2d5748769 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosCProgramCompiler.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosCProgramCompiler.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosprogram.internal; import java.util.Arrays; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosCobolProgramCompiler.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosCobolProgramCompiler.java index 4578f0e0a..51f9f05cc 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosCobolProgramCompiler.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosCobolProgramCompiler.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosprogram.internal; import java.util.Arrays; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosPl1ProgramCompiler.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosPl1ProgramCompiler.java index b8f4a5737..e7cfded68 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosPl1ProgramCompiler.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosPl1ProgramCompiler.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosprogram.internal; import java.util.Arrays; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosProgramImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosProgramImpl.java index 2924ad08c..23b8077fa 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosProgramImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosProgramImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosprogram.internal; import java.io.IOException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosProgramManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosProgramManagerImpl.java index bf9585a12..7fd49e08e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosProgramManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/TestZosProgramManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosprogram.internal; import java.io.File; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestCICSDatasetPrefix.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestCICSDatasetPrefix.java index 34e9daf37..ff62cc027 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestCICSDatasetPrefix.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestCICSDatasetPrefix.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosprogram.internal.properties; import java.util.Arrays; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestLanguageEnvironmentDatasetPrefix.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestLanguageEnvironmentDatasetPrefix.java index 2d7405a68..7a4e32125 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestLanguageEnvironmentDatasetPrefix.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestLanguageEnvironmentDatasetPrefix.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosprogram.internal.properties; import java.util.Arrays; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestProgramLanguageCompileSyslibs.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestProgramLanguageCompileSyslibs.java index 39627b0e3..30162d09d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestProgramLanguageCompileSyslibs.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestProgramLanguageCompileSyslibs.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosprogram.internal.properties; import java.util.Arrays; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestProgramLanguageDatasetPrefix.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestProgramLanguageDatasetPrefix.java index 48b6e8f1c..9ff8c2958 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestProgramLanguageDatasetPrefix.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestProgramLanguageDatasetPrefix.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosprogram.internal.properties; import java.util.Arrays; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestProgramLanguageLinkSyslibs.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestProgramLanguageLinkSyslibs.java index 3dcca797b..1036c3394 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestProgramLanguageLinkSyslibs.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestProgramLanguageLinkSyslibs.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosprogram.internal.properties; import java.util.Arrays; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestProgramPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestProgramPropertiesSingleton.java index 9cf53628a..847535c2f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestProgramPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/test/java/dev/galasa/zosprogram/internal/properties/TestProgramPropertiesSingleton.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosprogram.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapi.java index ce7b47342..2bcb7d557 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapi.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosrseapi; import java.util.List; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapiManager.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapiManager.java index 17640ccb2..a57acf396 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapiManager.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapiManager.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosrseapi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapiResponse.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapiResponse.java index a557fb52a..fe72bd377 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapiResponse.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapiResponse.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosrseapi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapiRestApiProcessor.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapiRestApiProcessor.java index 265a48066..e030a7a86 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapiRestApiProcessor.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapiRestApiProcessor.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosrseapi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/Rseapi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/Rseapi.java index ad0b180aa..35357762c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/Rseapi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/Rseapi.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosrseapi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/RseapiException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/RseapiException.java index c00d72746..98f3c88ee 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/RseapiException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/RseapiException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosrseapi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/RseapiManagerException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/RseapiManagerException.java index fc74b34ab..7a9bad3e6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/RseapiManagerException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/RseapiManagerException.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosrseapi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiImpl.java index 159d0ce54..6f98a803d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosrseapi.internal; import java.net.MalformedURLException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiManagerField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiManagerField.java index 076af517e..30a098922 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiManagerField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiManagerField.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosrseapi.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiManagerImpl.java index 3b02851e8..df8afde98 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiManagerImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosrseapi.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiResponseImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiResponseImpl.java index 8f3e85c5d..b05355aad 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiResponseImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiResponseImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosrseapi.internal; import java.io.IOException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiRestApiProcessor.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiRestApiProcessor.java index 1fafb9aa7..e71a4c65b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiRestApiProcessor.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/RseapiRestApiProcessor.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosrseapi.internal; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/package-info.java index 497a6874e..ed7dace32 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/package-info.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * RSE API Manager */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/Https.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/Https.java index b8b5d3402..17897cb7c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/Https.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/Https.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosrseapi.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/ImageServers.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/ImageServers.java index 629eb66a9..1e7162395 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/ImageServers.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/ImageServers.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosrseapi.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/RequestRetry.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/RequestRetry.java index 8cb50080a..1227e8134 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/RequestRetry.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/RequestRetry.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosrseapi.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/RseapiPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/RseapiPropertiesSingleton.java index 88875fa67..99c2e403d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/RseapiPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/RseapiPropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosrseapi.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/ServerCreds.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/ServerCreds.java index 1390e6237..c37894f7d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/ServerCreds.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/ServerCreds.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosrseapi.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/ServerImage.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/ServerImage.java index 2ff8c7fa9..9a890584a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/ServerImage.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/ServerImage.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosrseapi.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/ServerPort.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/ServerPort.java index e7f016333..76bfda8aa 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/ServerPort.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/ServerPort.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosrseapi.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/SysplexServers.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/SysplexServers.java index 5536e6ad3..08f1450fb 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/SysplexServers.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/SysplexServers.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019,2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosrseapi.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/package-info.java index 5858f0884..8dde016a7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/internal/properties/package-info.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * RSE API Manager - CPS Properties * diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/package-info.java index 8bf6db581..d6c29920a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/package-info.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ /** * RSE API Manager diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/spi/IRseapiManagerSpi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/spi/IRseapiManagerSpi.java index 78c2de6ab..876754d8a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/spi/IRseapiManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/spi/IRseapiManagerSpi.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosrseapi.spi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/spi/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/spi/package-info.java index 6131e9cf6..7d801054f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/spi/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/spi/package-info.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * RSE API Manager - Internal SPI */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/TestEnumsAndExeptions.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/TestEnumsAndExeptions.java index 1922e4a7f..81e2d9779 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/TestEnumsAndExeptions.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/TestEnumsAndExeptions.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosrseapi; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/TestRseapiImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/TestRseapiImpl.java index a4316f4bb..12bd90f02 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/TestRseapiImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/TestRseapiImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosrseapi.internal; import java.io.ByteArrayInputStream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/TestRseapiManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/TestRseapiManagerImpl.java index a209a5edf..5fddbf786 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/TestRseapiManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/TestRseapiManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosrseapi.internal; import java.io.File; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/TestRseapiResponseImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/TestRseapiResponseImpl.java index 0587bbc26..c34fef8c2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/TestRseapiResponseImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/TestRseapiResponseImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosrseapi.internal; import java.io.ByteArrayInputStream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/TestRseapiRestApiProcessor.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/TestRseapiRestApiProcessor.java index 2e816f936..e9d72c056 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/TestRseapiRestApiProcessor.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/TestRseapiRestApiProcessor.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosrseapi.internal; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestHttps.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestHttps.java index 41eb05ba4..37b807ccb 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestHttps.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestHttps.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosrseapi.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestImageServers.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestImageServers.java index bc121895d..a875fecd5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestImageServers.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestImageServers.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosrseapi.internal.properties; import java.util.Arrays; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestRequestRetry.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestRequestRetry.java index 6f540d66e..68fc265c9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestRequestRetry.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestRequestRetry.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosrseapi.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestRseapiPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestRseapiPropertiesSingleton.java index a458bb1b4..2e63f82d8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestRseapiPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestRseapiPropertiesSingleton.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosrseapi.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestServerCreds.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestServerCreds.java index fd813ff31..f8f46558c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestServerCreds.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestServerCreds.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosrseapi.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestServerImage.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestServerImage.java index 59d4d7c58..126b310b2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestServerImage.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestServerImage.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosrseapi.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestServerPort.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestServerPort.java index 5dfe0b31e..799b577b9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestServerPort.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestServerPort.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosrseapi.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestSysplexServers.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestSysplexServers.java index 195640aac..92082c865 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestSysplexServers.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestSysplexServers.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosrseapi.internal.properties; import java.util.Arrays; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosCertificate.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosCertificate.java index 62d79e738..8a5550a64 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosCertificate.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosCertificate.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import dev.galasa.zossecurity.datatypes.RACFCertificateType; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosCicsClassSet.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosCicsClassSet.java index 495959f14..6e706df3c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosCicsClassSet.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosCicsClassSet.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import java.util.HashMap; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosCicsProfile.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosCicsProfile.java index 0f0a3e6f8..95ba7b17a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosCicsProfile.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosCicsProfile.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import dev.galasa.zossecurity.datatypes.ZosCicsClassResource; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosGroup.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosGroup.java index e3746b4be..8cafd87f0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosGroup.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosGroup.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosIdMap.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosIdMap.java index 6e347025a..3a1a5c569 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosIdMap.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosIdMap.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; /** diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosKerberosPrincipal.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosKerberosPrincipal.java index a13b0fe8d..2cc6f3a2d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosKerberosPrincipal.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosKerberosPrincipal.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; /** diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosKeyring.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosKeyring.java index 70f2a67bf..37d78bb3a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosKeyring.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosKeyring.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import dev.galasa.zossecurity.datatypes.RACFCertificateType; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosPreDefinedProfile.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosPreDefinedProfile.java index cc33e6239..4e97e8786 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosPreDefinedProfile.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosPreDefinedProfile.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import dev.galasa.zossecurity.datatypes.RACFAccessType; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosProfile.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosProfile.java index a6f8fb357..1c7394e1c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosProfile.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosProfile.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import dev.galasa.zossecurity.datatypes.RACFAccessType; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosSecurity.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosSecurity.java index ceebf9d0f..8639c4d3e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosSecurity.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosSecurity.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import java.security.KeyStore; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosUserid.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosUserid.java index 922b66aea..92f7be470 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosUserid.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosUserid.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import dev.galasa.zos.IZosImage; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/KerberosInitiator.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/KerberosInitiator.java index f26461921..4425f00ee 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/KerberosInitiator.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/KerberosInitiator.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import jakarta.xml.bind.DatatypeConverter; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/KerberosToken.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/KerberosToken.java index 8a2b3c567..96bb69071 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/KerberosToken.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/KerberosToken.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import jakarta.xml.bind.DatatypeConverter; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/KeyringAlreadyExistsException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/KeyringAlreadyExistsException.java index 56fdafbe1..a09deacbe 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/KeyringAlreadyExistsException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/KeyringAlreadyExistsException.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; public class KeyringAlreadyExistsException extends ZosSecurityManagerException { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ProfileAlreadyExistsException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ProfileAlreadyExistsException.java index 3c202f6ef..ae538ac48 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ProfileAlreadyExistsException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ProfileAlreadyExistsException.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; public class ProfileAlreadyExistsException extends ZosSecurityManagerException { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ProfileConfigurationException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ProfileConfigurationException.java index d5fd4c159..d9d37ff7c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ProfileConfigurationException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ProfileConfigurationException.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; public class ProfileConfigurationException extends ZosSecurityManagerException { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ProfileNotFoundException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ProfileNotFoundException.java index 8f7789808..6f58d4370 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ProfileNotFoundException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ProfileNotFoundException.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; public class ProfileNotFoundException extends ZosSecurityManagerException { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/RacfSyntaxErrorException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/RacfSyntaxErrorException.java index d8b021cc6..cae801ccb 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/RacfSyntaxErrorException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/RacfSyntaxErrorException.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; public class RacfSyntaxErrorException extends ZosSecurityManagerException { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/RestrictedResourceException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/RestrictedResourceException.java index 1e4bd8625..d20a625ba 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/RestrictedResourceException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/RestrictedResourceException.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; public class RestrictedResourceException extends ZosSecurityManagerException { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/UseridNotFoundException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/UseridNotFoundException.java index c451ca3a5..a0ebf8942 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/UseridNotFoundException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/UseridNotFoundException.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; public class UseridNotFoundException extends ZosSecurityManagerException { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosCicsClassSet.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosCicsClassSet.java index e8f9e9213..f3afa0950 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosCicsClassSet.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosCicsClassSet.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosPreDefinedProfile.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosPreDefinedProfile.java index deddad8cc..76a2af54f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosPreDefinedProfile.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosPreDefinedProfile.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosSecurity.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosSecurity.java index 8e7beb6c9..b1be7f532 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosSecurity.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosSecurity.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosSecurityManagerException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosSecurityManagerException.java index 5ae8ccacb..862729d52 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosSecurityManagerException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosSecurityManagerException.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import dev.galasa.zos.ZosManagerException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosSecurityProvisionException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosSecurityProvisionException.java index 2cacf8a03..89f5d78b6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosSecurityProvisionException.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosSecurityProvisionException.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; public class ZosSecurityProvisionException extends Exception { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosUserid.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosUserid.java index 52a252d6e..daa0f02b8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosUserid.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosUserid.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import java.lang.annotation.ElementType; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/Action.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/Action.java index 7dd8931f7..1c8fc7fce 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/Action.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/Action.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.datatypes; public enum Action { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/RACFAccess.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/RACFAccess.java index 88693a3e2..9c419b310 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/RACFAccess.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/RACFAccess.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.datatypes; import jakarta.xml.bind.annotation.XmlElement; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/RACFAccessType.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/RACFAccessType.java index 7699e69a3..1237d3b3c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/RACFAccessType.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/RACFAccessType.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.datatypes; /** diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/RACFCertificateTrust.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/RACFCertificateTrust.java index b9f647fb3..1f8863f26 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/RACFCertificateTrust.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/RACFCertificateTrust.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.datatypes; public enum RACFCertificateTrust { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/RACFCertificateType.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/RACFCertificateType.java index 421f73f8f..605f66b34 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/RACFCertificateType.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/RACFCertificateType.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.datatypes; public enum RACFCertificateType { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/ZosCicsClassResource.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/ZosCicsClassResource.java index 5dd923f48..e9db2bbec 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/ZosCicsClassResource.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/ZosCicsClassResource.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.datatypes; /** diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/ZosCicsClassType.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/ZosCicsClassType.java index 4343fd897..db8db72e1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/ZosCicsClassType.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/ZosCicsClassType.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.datatypes; /** diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/RACFMessages.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/RACFMessages.java index 1471ea2b0..e13400c82 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/RACFMessages.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/RACFMessages.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal; import java.util.HashSet; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosCicsClassSetField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosCicsClassSetField.java index 4c656df6a..6ab0e2759 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosCicsClassSetField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosCicsClassSetField.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosPreDefinedProfileField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosPreDefinedProfileField.java index f2cbdde84..28f4a9e37 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosPreDefinedProfileField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosPreDefinedProfileField.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosSecurityField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosSecurityField.java index f761156c1..bdc6f07c3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosSecurityField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosSecurityField.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosSecurityImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosSecurityImpl.java index 63e938835..9532aeb01 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosSecurityImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosSecurityImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal; import java.io.ByteArrayInputStream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosSecurityManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosSecurityManagerImpl.java index e29e2ac54..3a849aa3e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosSecurityManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosSecurityManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosUseridField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosUseridField.java index d83373e2c..6db0bc9e4 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosUseridField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/ZosUseridField.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/CicsClassSetMinimumFree.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/CicsClassSetMinimumFree.java index b0976dfdd..2ff3f1121 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/CicsClassSetMinimumFree.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/CicsClassSetMinimumFree.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/CicsSharedClassets.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/CicsSharedClassets.java index aab3ba55a..0d388489e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/CicsSharedClassets.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/CicsSharedClassets.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/ClassAllowedPrefixes.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/ClassAllowedPrefixes.java index 6a952aac2..e8faf678a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/ClassAllowedPrefixes.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/ClassAllowedPrefixes.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/CommandRac.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/CommandRac.java index 7e648c528..966628c4e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/CommandRac.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/CommandRac.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/CreateUserid.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/CreateUserid.java index d6c34f854..95290e4ca 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/CreateUserid.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/CreateUserid.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/KerberosDomainController.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/KerberosDomainController.java index 8f233789a..20e47dbfe 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/KerberosDomainController.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/KerberosDomainController.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/KerberosRealm.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/KerberosRealm.java index 5ccfa5dc0..da92fa78a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/KerberosRealm.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/KerberosRealm.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/OutputReporting.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/OutputReporting.java index a102adf2a..2be9044ea 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/OutputReporting.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/OutputReporting.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/PredefinedProfiles.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/PredefinedProfiles.java index 77ef09bb2..0db2b4b88 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/PredefinedProfiles.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/PredefinedProfiles.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/ResourceReporting.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/ResourceReporting.java index 20de2f518..509160126 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/ResourceReporting.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/ResourceReporting.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/ServerApikey.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/ServerApikey.java index 29a59db8c..9d44d7a2b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/ServerApikey.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/ServerApikey.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/ServerUrl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/ServerUrl.java index bb8c6ad96..488276590 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/ServerUrl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/ServerUrl.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/SetroptsDelay.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/SetroptsDelay.java index 600f3e57d..b1dbaecf1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/SetroptsDelay.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/SetroptsDelay.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridBypassCleanup.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridBypassCleanup.java index 59540bcdb..543c9381c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridBypassCleanup.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridBypassCleanup.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridBypassPassword.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridBypassPassword.java index ada1264f1..99471a997 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridBypassPassword.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridBypassPassword.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridDefaultGroup.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridDefaultGroup.java index 6836d7758..0861b6a08 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridDefaultGroup.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridDefaultGroup.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridDefaultGroups.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridDefaultGroups.java index 9042cf620..788c335d5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridDefaultGroups.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridDefaultGroups.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridDefaultPassword.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridDefaultPassword.java index 24653b3cb..512209a85 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridDefaultPassword.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridDefaultPassword.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridMinimumFree.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridMinimumFree.java index f4c963921..424c742ed 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridMinimumFree.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridMinimumFree.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridPool.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridPool.java index 6f8d13103..b89f3ddb7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridPool.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridPool.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridSysplexGroups.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridSysplexGroups.java index 7cc14e0f2..34a50c540 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridSysplexGroups.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/UseridSysplexGroups.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/ZosSecurityPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/ZosSecurityPropertiesSingleton.java index b87afa3cd..367468989 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/ZosSecurityPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/properties/ZosSecurityPropertiesSingleton.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zossecurity.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosCertificateResourceManagement.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosCertificateResourceManagement.java index a488affa7..7535a7ea3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosCertificateResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosCertificateResourceManagement.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resourcemanagement; import static dev.galasa.zossecurity.internal.ZosSecurityImpl.ZOS_CERTIFICATE_PATTERN; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosCicsClassSetResourceManagement.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosCicsClassSetResourceManagement.java index 3c66e0f0a..3788254cc 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosCicsClassSetResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosCicsClassSetResourceManagement.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resourcemanagement; import static dev.galasa.zossecurity.internal.ZosSecurityImpl.ZOS_CICS_CLASS_SET_PATTERN; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosIdMapResourceManagement.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosIdMapResourceManagement.java index 1aa6426e1..c7586aa25 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosIdMapResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosIdMapResourceManagement.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resourcemanagement; import static dev.galasa.zossecurity.internal.ZosSecurityImpl.ZOS_ID_MAP_PATTERN; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosKerberosPrincipalResourceManagement.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosKerberosPrincipalResourceManagement.java index 396149991..e9034db94 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosKerberosPrincipalResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosKerberosPrincipalResourceManagement.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resourcemanagement; import static dev.galasa.zossecurity.internal.ZosSecurityImpl.ZOS_KERBEROS_PRINCIPAL_PATTERN; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosKeyringResourceManagement.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosKeyringResourceManagement.java index 6948fd4c5..28d294e91 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosKeyringResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosKeyringResourceManagement.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resourcemanagement; import static dev.galasa.zossecurity.internal.ZosSecurityImpl.ZOS_KEYRING_PATTERN; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosPredefinedProfilePermitResourceManagement.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosPredefinedProfilePermitResourceManagement.java index 8e9f17fcf..6a6b44888 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosPredefinedProfilePermitResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosPredefinedProfilePermitResourceManagement.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resourcemanagement; import static dev.galasa.zossecurity.internal.ZosSecurityImpl.ZOS_PRE_DEFINED_PROFILE_PERMIT_PATTERN; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosProfileResourceManagement.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosProfileResourceManagement.java index 5b1d987ae..f7ed4fdfe 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosProfileResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosProfileResourceManagement.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resourcemanagement; import static dev.galasa.zossecurity.internal.ZosSecurityImpl.ZOS_PROFILE_PATTERN; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosSecurityResourceManagement.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosSecurityResourceManagement.java index 5c1e0a3ab..3902604aa 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosSecurityResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosSecurityResourceManagement.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resourcemanagement; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosUseridResourceManagement.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosUseridResourceManagement.java index 5a66b2096..df27fada8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosUseridResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resourcemanagement/ZosUseridResourceManagement.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resourcemanagement; import static dev.galasa.zossecurity.internal.ZosSecurityImpl.ZOS_USERID_PATTERN; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/RacfOutputProcessing.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/RacfOutputProcessing.java index 25be0bd7b..638481b20 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/RacfOutputProcessing.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/RacfOutputProcessing.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resources; import java.util.Set; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosCertificateImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosCertificateImpl.java index 3a81ea553..fef4a1281 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosCertificateImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosCertificateImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resources; import java.io.ByteArrayOutputStream; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosCicsClassSetImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosCicsClassSetImpl.java index 7d55debe8..06e3a763f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosCicsClassSetImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosCicsClassSetImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resources; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosCicsProfileImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosCicsProfileImpl.java index daf9ac892..2b569ec99 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosCicsProfileImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosCicsProfileImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resources; import org.apache.commons.logging.Log; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosCicsSharedClassSetImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosCicsSharedClassSetImpl.java index 1dca4269f..d61fb9a50 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosCicsSharedClassSetImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosCicsSharedClassSetImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resources; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosGroupImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosGroupImpl.java index 60c0388c7..557ff5807 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosGroupImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosGroupImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resources; import dev.galasa.zossecurity.IZosGroup; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosIdMapImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosIdMapImpl.java index e3458cc0d..48bff0630 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosIdMapImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosIdMapImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resources; import java.util.HashMap; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosKerberosClientPrincipalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosKerberosClientPrincipalImpl.java index 5207887df..b223a1682 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosKerberosClientPrincipalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosKerberosClientPrincipalImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resources; import dev.galasa.zossecurity.IZosKerberosPrincipal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosKerberosPrincipalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosKerberosPrincipalImpl.java index d7e4225db..ba2164eb0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosKerberosPrincipalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosKerberosPrincipalImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resources; import org.apache.commons.logging.Log; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosKeyringImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosKeyringImpl.java index 12d02e7f0..54e1fcd60 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosKeyringImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosKeyringImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resources; import java.util.HashMap; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosPreDefinedProfileImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosPreDefinedProfileImpl.java index 33b7fa97f..a476495fc 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosPreDefinedProfileImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosPreDefinedProfileImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resources; import java.io.BufferedReader; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosPredefinedProfilePermitImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosPredefinedProfilePermitImpl.java index 4df2192c0..ef5b1547a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosPredefinedProfilePermitImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosPredefinedProfilePermitImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resources; import java.util.HashMap; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosProfileImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosProfileImpl.java index 3cc932f9c..5595baf8b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosProfileImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosProfileImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resources; import java.util.HashMap; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosUseridImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosUseridImpl.java index a2d074df6..b26347fe2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosUseridImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/internal/resources/ZosUseridImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.internal.resources; import java.util.ArrayList; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/package-info.java index 2b37a2c74..0ad81c99a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/package-info.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * Galasa zOS Security Manager */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/spi/IZosSecurityManagerSpi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/spi/IZosSecurityManagerSpi.java index c9af6cde8..21e683e08 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/spi/IZosSecurityManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/spi/IZosSecurityManagerSpi.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.spi; import javax.validation.constraints.NotNull; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/ZosTSOCommandImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/ZosTSOCommandImpl.java index 956e44e7f..4c1734eff 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/ZosTSOCommandImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/ZosTSOCommandImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zostsocommand.ssh.manager.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/ZosTSOCommandManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/ZosTSOCommandManagerImpl.java index 824854740..a7985605e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/ZosTSOCommandManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/ZosTSOCommandManagerImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zostsocommand.ssh.manager.internal; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/package-info.java index 965feb8e2..0fd00ec8c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/package-info.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * zOS TSO Command Manager - SSH Internal Implementation * diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/TsocmdPath.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/TsocmdPath.java index b7e9b4fb2..33cf536a6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/TsocmdPath.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/TsocmdPath.java @@ -1,5 +1,7 @@ /* * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zostsocommand.ssh.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/ZosTSOCommandSshPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/ZosTSOCommandSshPropertiesSingleton.java index 18b6715ef..0c97e7149 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/ZosTSOCommandSshPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/ZosTSOCommandSshPropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zostsocommand.ssh.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/package-info.java index f9c4a5d9d..a62209f3a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/main/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/package-info.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * zOS TSO Command Manager SSH implementation - CPS Properties * diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/test/java/dev/galasa/zostsocommand/ssh/manager/internal/TestZosTSOCommandImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/test/java/dev/galasa/zostsocommand/ssh/manager/internal/TestZosTSOCommandImpl.java index 111f7d5d8..06a116545 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/test/java/dev/galasa/zostsocommand/ssh/manager/internal/TestZosTSOCommandImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/test/java/dev/galasa/zostsocommand/ssh/manager/internal/TestZosTSOCommandImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zostsocommand.ssh.manager.internal; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/test/java/dev/galasa/zostsocommand/ssh/manager/internal/TestZosTSOCommandManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/test/java/dev/galasa/zostsocommand/ssh/manager/internal/TestZosTSOCommandManagerImpl.java index 115fcf3c4..dfa8a67c2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/test/java/dev/galasa/zostsocommand/ssh/manager/internal/TestZosTSOCommandManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/test/java/dev/galasa/zostsocommand/ssh/manager/internal/TestZosTSOCommandManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zostsocommand.ssh.manager.internal; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/test/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/TestTsocmdPath.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/test/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/TestTsocmdPath.java index 5acb64e1d..44948d6d8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/test/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/TestTsocmdPath.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/test/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/TestTsocmdPath.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zostsocommand.ssh.manager.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/test/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/TestZosTSOCommandSshPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/test/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/TestZosTSOCommandSshPropertiesSingleton.java index 0d12c762b..b1e86f470 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/test/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/TestZosTSOCommandSshPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zostsocommand.ssh.manager/src/test/java/dev/galasa/zostsocommand/ssh/manager/internal/properties/TestZosTSOCommandSshPropertiesSingleton.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zostsocommand.ssh.manager.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/ZosUNIXCommandImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/ZosUNIXCommandImpl.java index c7b6c8163..b5221ea76 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/ZosUNIXCommandImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/ZosUNIXCommandImpl.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosunixcommand.ssh.manager.internal; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/ZosUNIXCommandManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/ZosUNIXCommandManagerImpl.java index de2ac41bf..5b2007692 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/ZosUNIXCommandManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/ZosUNIXCommandManagerImpl.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020-2021. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosunixcommand.ssh.manager.internal; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/package-info.java index e1ca62fff..ca27a2718 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/package-info.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * zOS UNIX Manager - SSH Internal Implementation * diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/properties/ZosUNIXCommandSshPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/properties/ZosUNIXCommandSshPropertiesSingleton.java index fb8a102d3..f1c1b663b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/properties/ZosUNIXCommandSshPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/properties/ZosUNIXCommandSshPropertiesSingleton.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dev.galasa.zosunixcommand.ssh.manager.internal.properties; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/properties/package-info.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/properties/package-info.java index 88af09721..e709e7b83 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/properties/package-info.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/main/java/dev/galasa/zosunixcommand/ssh/manager/internal/properties/package-info.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ /** * zOS UNIX SSH Manager - CPS Properties * diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/test/java/dev/galasa/zosunixcommand/ssh/manager/internal/TestZosUNIXCommandImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/test/java/dev/galasa/zosunixcommand/ssh/manager/internal/TestZosUNIXCommandImpl.java index 86b7e761f..3b854daa9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/test/java/dev/galasa/zosunixcommand/ssh/manager/internal/TestZosUNIXCommandImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/test/java/dev/galasa/zosunixcommand/ssh/manager/internal/TestZosUNIXCommandImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosunixcommand.ssh.manager.internal; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/test/java/dev/galasa/zosunixcommand/ssh/manager/internal/TestZosUNIXCommandManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/test/java/dev/galasa/zosunixcommand/ssh/manager/internal/TestZosUNIXCommandManagerImpl.java index 325eac0a0..2264afc57 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/test/java/dev/galasa/zosunixcommand/ssh/manager/internal/TestZosUNIXCommandManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/test/java/dev/galasa/zosunixcommand/ssh/manager/internal/TestZosUNIXCommandManagerImpl.java @@ -1,6 +1,8 @@ -/* - * Copyright contributors to the Galasa project - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosunixcommand.ssh.manager.internal; import java.lang.annotation.Annotation; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/test/java/dev/galasa/zosunixcommand/ssh/manager/internal/properties/TestZosUNIXCommandSshPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/test/java/dev/galasa/zosunixcommand/ssh/manager/internal/properties/TestZosUNIXCommandSshPropertiesSingleton.java index 506d9b889..d90e1f95f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/test/java/dev/galasa/zosunixcommand/ssh/manager/internal/properties/TestZosUNIXCommandSshPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosunixcommand.ssh.manager/src/test/java/dev/galasa/zosunixcommand/ssh/manager/internal/properties/TestZosUNIXCommandSshPropertiesSingleton.java @@ -1,8 +1,8 @@ -/* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2020. - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosunixcommand.ssh.manager.internal.properties; import org.junit.Assert; diff --git a/galasa-managers-parent/galasa-uber-javadoc/src/main/java/dummy/X.java b/galasa-managers-parent/galasa-uber-javadoc/src/main/java/dummy/X.java index 36ba11573..fe36f78a7 100644 --- a/galasa-managers-parent/galasa-uber-javadoc/src/main/java/dummy/X.java +++ b/galasa-managers-parent/galasa-uber-javadoc/src/main/java/dummy/X.java @@ -1,7 +1,7 @@ /* - * Licensed Materials - Property of IBM - * - * (c) Copyright IBM Corp. 2019. + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 */ package dummy; diff --git a/release.yaml b/release.yaml index 75568805f..6d0ec3939 100644 --- a/release.yaml +++ b/release.yaml @@ -1,6 +1,9 @@ # -# Copyright contributors to the Galasa project +# Copyright contributors to the Galasa project # +# SPDX-License-Identifier: EPL-2.0 +# + apiVersion: galasa.dev/v1alpha kind: Release metadata: From e525547a2a9989b0b9e3edf4e0cd6d65d62def2c Mon Sep 17 00:00:00 2001 From: Fiona Ampofo <64271621+Akyiaa@users.noreply.github.com> Date: Fri, 21 Jul 2023 12:12:50 +0100 Subject: [PATCH 131/263] Update config.yaml manually updated file to include: # The configuration properties for the Galasa Ecosystem which was removed Signed-off-by: Fiona Ampofo <64271621+Akyiaa@users.noreply.github.com> --- .../src/main/resources/k8s/config.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config.yaml index bd134808b..086ce6922 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config.yaml @@ -4,6 +4,8 @@ # SPDX-License-Identifier: EPL-2.0 # +# The configuration properties for the Galasa Ecosystem + apiVersion: v1 kind: ConfigMap metadata: @@ -32,4 +34,4 @@ data: # engine_memory_request: "300" # engine_memory_limit: "300" # run_poll: "20" -# run_poll_recheck: "5" \ No newline at end of file +# run_poll_recheck: "5" From fb79aed02eab24261dcc5ff628fe5a70a0838309 Mon Sep 17 00:00:00 2001 From: Fiona Ampofo <64271621+Akyiaa@users.noreply.github.com> Date: Mon, 24 Jul 2023 11:05:59 +0100 Subject: [PATCH 132/263] added copyright changes for .sh files Signed-off-by: Fiona Ampofo <64271621+Akyiaa@users.noreply.github.com> --- build-locally.sh | 7 ++++++- .../dev.galasa.kubernetes.manager/examples/account.sh | 6 ++++++ .../src/main/resources/local/run.sh | 6 ++++++ .../src/main/resources/local/simplatform.sh | 6 ++++++ .../dev.galasa.jmeter.manager/resources/entrypoint.sh | 6 ++++++ githubdocs.sh | 6 ++++++ set-version.sh | 9 ++++++--- 7 files changed, 42 insertions(+), 4 deletions(-) diff --git a/build-locally.sh b/build-locally.sh index bf161a41e..c8484c08d 100755 --- a/build-locally.sh +++ b/build-locally.sh @@ -1,5 +1,10 @@ #! /usr/bin/env bash +# +# Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# #----------------------------------------------------------------------------------------- # # Objectives: Build this repository code locally. @@ -177,4 +182,4 @@ function build_code { } -build_code +build_code \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/examples/account.sh b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/examples/account.sh index f7f03a083..41ae931d0 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/examples/account.sh +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/examples/account.sh @@ -1,5 +1,11 @@ #!/bin/sh +# +# Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + kubectl -n galasa1 create serviceaccount galasa kubectl -n galasa1 get serviceaccounts galasa -o yaml diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/local/run.sh b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/local/run.sh index eb7c45640..d70a7b3ef 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/local/run.sh +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/local/run.sh @@ -1,5 +1,11 @@ #!/bin/bash +# +# Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + nohup ++JAVA_CMD++ -jar ++BOOT_JAR++ --bootstrap ++BOOTSTRAP++ --remotemaven ++MAVEN_REPO++ --localmaven ++MAVEN_LOCAL++ --obr mvn:dev.galasa/dev.galasa.uber.obr/++MAVEN_VERSION++/obr --trace $2 > $1 & diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/local/simplatform.sh b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/local/simplatform.sh index 8a0454d00..99d115523 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/local/simplatform.sh +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/local/simplatform.sh @@ -1,5 +1,11 @@ #!/bin/bash +# +# Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + nohup ++JAVA_CMD++ -jar ++SIMPLATFORM_JAR++ > ++SIMPLATFORM_CONSOLE++ & echo PROCESS=$! diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/resources/entrypoint.sh b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/resources/entrypoint.sh index 89c1c7bdb..f9f837d81 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/resources/entrypoint.sh +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/resources/entrypoint.sh @@ -1,4 +1,10 @@ #!/bin/ash + +# +# Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# mkdir /var/mail groupadd --non-unique --gid ${JMETER_GROUP_ID:-1000} jmeter useradd --non-unique --uid ${JMETER_USER_ID:-1000} --no-log-init --create-home --gid jmeter jmeter diff --git a/githubdocs.sh b/githubdocs.sh index a1561ff3d..04d4eca6c 100755 --- a/githubdocs.sh +++ b/githubdocs.sh @@ -1,5 +1,11 @@ #!/bin/sh +e +# +# Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# + echo "Checking for changes" CHANGED=$(git status -s .) echo $CHANGED diff --git a/set-version.sh b/set-version.sh index e2b9bcd3d..128b5c9d1 100755 --- a/set-version.sh +++ b/set-version.sh @@ -1,5 +1,10 @@ #! /usr/bin/env bash +# +# Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# #----------------------------------------------------------------------------------------- # # Objectives: Sets the version number of this component. @@ -142,6 +147,4 @@ function upgrade_build_gradle { } upgrade_build_gradle -upgrade_dependencies_on_framework - - +upgrade_dependencies_on_framework \ No newline at end of file From 5b395b576d4ed92c9f0f7078ef8109e7e1993751 Mon Sep 17 00:00:00 2001 From: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> Date: Sat, 10 Jun 2023 13:56:51 +0100 Subject: [PATCH 133/263] default login provider can use cesl Signed-off-by: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> --- .../dev.galasa.cicsts.manager/build.gradle | 2 +- .../java/dev/galasa/cicsts/CicsTerminal.java | 5 ++ .../java/dev/galasa/cicsts/ICicsTerminal.java | 2 + .../internal/CicstsDefaultLogonProvider.java | 53 +++++++++++++++++-- .../cicsts/internal/CicstsManagerImpl.java | 5 +- .../galasa/cicsts/spi/CicsTerminalImpl.java | 20 +++++-- release.yaml | 2 +- 7 files changed, 78 insertions(+), 11 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle index 2b9da7e5f..932d8eaaf 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa CICS/TS Manager' -version = '0.28.0' +version = '0.29.0' dependencies { api project (':galasa-managers-zos-parent:dev.galasa.zos.manager') diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsTerminal.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsTerminal.java index fdb55e94f..603138ac2 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsTerminal.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsTerminal.java @@ -38,4 +38,9 @@ */ boolean connectAtStartup() default true; + /** + * The CICS TS Manager will automatically log into the CICS TS region via CESL using the terminal with + * the specified secure credentials when it connects + */ + String loginCredentials() default ""; } diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsTerminal.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsTerminal.java index 82a729a53..a4730ca9e 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsTerminal.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsTerminal.java @@ -30,4 +30,6 @@ public interface ICicsTerminal extends ITerminal { */ public boolean isUppercaseTranslation() throws CicstsManagerException; + String getLoginCredentials(); + } \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java index 5d3cde25b..a89391197 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java @@ -8,21 +8,32 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import dev.galasa.ICredentialsUsernamePassword; import dev.galasa.cicsts.CicstsManagerException; import dev.galasa.cicsts.ICicsTerminal; import dev.galasa.cicsts.internal.properties.DefaultLogonGmText; import dev.galasa.cicsts.internal.properties.DefaultLogonInitialText; import dev.galasa.cicsts.spi.ICicsRegionLogonProvider; +import dev.galasa.framework.spi.IFramework; +import dev.galasa.framework.spi.creds.CredentialsException; +import dev.galasa.framework.spi.creds.ICredentialsService; import dev.galasa.zos3270.Zos3270Exception; public class CicstsDefaultLogonProvider implements ICicsRegionLogonProvider { private static final Log logger = LogFactory.getLog(CicstsDefaultLogonProvider.class); + private final ICredentialsService cs; private final String initialText; private final String gmText; - public CicstsDefaultLogonProvider() throws CicstsManagerException { + public CicstsDefaultLogonProvider(IFramework framework) throws CicstsManagerException { + + try { + this.cs = framework.getCredentialsService(); + } catch (CredentialsException e) { + throw new CicstsManagerException("Could not obtain the Credentials service.", e); + } try { initialText = DefaultLogonInitialText.get(); @@ -52,10 +63,30 @@ public boolean logonToCicsRegion(ICicsTerminal cicsTerminal) throws CicstsManage waitForGmText(cicsTerminal); - cicsTerminal.clear(); + cicsTerminal.clear().wfk(); logger.debug("Logged onto " + cicsTerminal.getCicsRegion()); - } catch (Zos3270Exception e) { + + if (!cicsTerminal.getLoginCredentials().isEmpty()) { + ICredentialsUsernamePassword creds = (ICredentialsUsernamePassword)this.cs.getCredentials(cicsTerminal.getLoginCredentials()); + + cicsTerminal.type("CESL"); + cicsTerminal.enter(); + cicsTerminal.waitForTextInField("Userid"); + cicsTerminal.waitForKeyboard(); + cicsTerminal.type(creds.getUsername()); + cicsTerminal.positionCursorToFieldContaining("Password"); + cicsTerminal.tab(); + cicsTerminal.type(creds.getPassword()); + cicsTerminal.enter(); + + waitForLoggedOnText(cicsTerminal); + + cicsTerminal.clear().wfk(); + + logger.debug("Logged into CICS TS as user: " + creds.getUsername()); + } + } catch (Zos3270Exception | CredentialsException e) { throw new CicstsManagerException("Problem logging onto the CICS region"); } @@ -80,4 +111,20 @@ private void waitForGmText(ICicsTerminal cicsTerminal) throws CicstsManagerExcep } } + private void waitForLoggedOnText(ICicsTerminal cicsTerminal) throws CicstsManagerException { + + String[] pass = { "Sign-on is complete" }; + String[] fail = { + "Your password has expired. Please type your new password.", + "Invalid credentials entered" + }; + + try { + cicsTerminal.waitForTextInField(pass, fail); + } catch (Exception e) { + throw new CicstsManagerException("Unable to wait for the initial CICS screen, looking for '" + String.join("', '", pass) + "'", + e); + } + } + } \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java index 52b3fa3d6..91666d7d1 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java @@ -208,6 +208,7 @@ public ICicsTerminal generateCicsTerminal(Field field, List annotati CicsTerminal annotation = field.getAnnotation(CicsTerminal.class); String tag = defaultString(annotation.cicsTag(), "PRIMARY").toUpperCase(); + String loginCredentials = defaultString(annotation.loginCredentials(), "").toUpperCase(); ICicsRegionProvisioned region = this.provisionedCicsRegions.get(tag); if (region == null) { @@ -216,7 +217,7 @@ public ICicsTerminal generateCicsTerminal(Field field, List annotati } try { - CicsTerminalImpl newTerminal = new CicsTerminalImpl(this, getFramework(), region, annotation.connectAtStartup(), this.textScanner); + CicsTerminalImpl newTerminal = new CicsTerminalImpl(this, getFramework(), region, annotation.connectAtStartup(), this.textScanner, loginCredentials); this.terminals.add(newTerminal); return newTerminal; } catch (TerminalInterruptedException e) { @@ -264,7 +265,7 @@ public void provisionBuild() throws ManagerException, ResourceUnavailableExcepti @Override public void provisionStart() throws ManagerException, ResourceUnavailableException { // Add the default Logon Provider incase one isn't supplied - this.logonProviders.add(new CicstsDefaultLogonProvider()); + this.logonProviders.add(new CicstsDefaultLogonProvider(getFramework())); // First, give the provisioners the opportunity to start CICS regions for (ICicsRegionProvisioner provisioner : provisioners) { diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java index 3fec117e3..bd0a793d2 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java @@ -33,26 +33,33 @@ public class CicsTerminalImpl extends Zos3270TerminalImpl implements ICicsTermin public final ICicstsManagerSpi cicstsManager; public final boolean connectAtStartup; + public final String loginCredentials; - public CicsTerminalImpl(ICicstsManagerSpi cicstsManager, IFramework framework, ICicsRegionProvisioned cicsRegion, String host, int port, boolean ssl, boolean connectAtStartup, ITextScannerManagerSpi textScanner) + public CicsTerminalImpl(ICicstsManagerSpi cicstsManager, IFramework framework, ICicsRegionProvisioned cicsRegion, String host, int port, boolean ssl, boolean connectAtStartup, ITextScannerManagerSpi textScanner, String loginCredentials) throws TerminalInterruptedException, Zos3270ManagerException, ZosManagerException { super(cicsRegion.getNextTerminalId(), host, port, ssl, framework, false, cicsRegion.getZosImage(), new TerminalSize(80, 24), new TerminalSize(0, 0), textScanner); this.cicsRegion = cicsRegion; this.cicstsManager = cicstsManager; this.connectAtStartup = connectAtStartup; + this.loginCredentials = loginCredentials; setAutoReconnect(connectAtStartup); } - public CicsTerminalImpl(ICicstsManagerSpi cicstsManager, IFramework framework, ICicsRegionProvisioned cicsRegion, IIpHost ipHost, boolean connectAtStartup, ITextScannerManagerSpi textScanner) + public CicsTerminalImpl(ICicstsManagerSpi cicstsManager, IFramework framework, ICicsRegionProvisioned cicsRegion, IIpHost ipHost, boolean connectAtStartup, ITextScannerManagerSpi textScanner, String loginCredentials) throws TerminalInterruptedException, IpNetworkManagerException, Zos3270ManagerException, ZosManagerException { - this(cicstsManager, framework, cicsRegion, ipHost.getHostname(), ipHost.getTelnetPort(), ipHost.isTelnetPortTls(), connectAtStartup, textScanner); + this(cicstsManager, framework, cicsRegion, ipHost.getHostname(), ipHost.getTelnetPort(), ipHost.isTelnetPortTls(), connectAtStartup, textScanner, loginCredentials); + } + + public CicsTerminalImpl(ICicstsManagerSpi cicstsManager, IFramework framework, ICicsRegionProvisioned cicsRegion, boolean connectAtStartup, ITextScannerManagerSpi textScanner, String loginCredentials) throws TerminalInterruptedException, IpNetworkManagerException, + Zos3270ManagerException, ZosManagerException { + this(cicstsManager, framework, cicsRegion, cicsRegion.getZosImage().getIpHost(), connectAtStartup, textScanner, loginCredentials); } public CicsTerminalImpl(ICicstsManagerSpi cicstsManager, IFramework framework, ICicsRegionProvisioned cicsRegion, boolean connectAtStartup, ITextScannerManagerSpi textScanner) throws TerminalInterruptedException, IpNetworkManagerException, Zos3270ManagerException, ZosManagerException { - this(cicstsManager, framework, cicsRegion, cicsRegion.getZosImage().getIpHost(), connectAtStartup, textScanner); + this(cicstsManager, framework, cicsRegion, cicsRegion.getZosImage().getIpHost(), connectAtStartup, textScanner, ""); } @Override @@ -150,4 +157,9 @@ public boolean isUppercaseTranslation() throws CicstsManagerException { } } + @Override + public String getLoginCredentials() { + return this.loginCredentials; + } + } \ No newline at end of file diff --git a/release.yaml b/release.yaml index 6d0ec3939..823683672 100644 --- a/release.yaml +++ b/release.yaml @@ -32,7 +32,7 @@ managers: isolated: true - artifact: dev.galasa.cicsts.manager - version: 0.28.0 + version: 0.29.0 obr: true mvp: true javadoc: true From ef3f939e093c567192577512272413b313b501ea Mon Sep 17 00:00:00 2001 From: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> Date: Mon, 12 Jun 2023 16:56:41 +0100 Subject: [PATCH 134/263] review fixes Signed-off-by: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> --- .../dev.galasa.cicsts.manager/build.gradle | 2 +- .../internal/CicstsDefaultLogonProvider.java | 21 ++++++++++++------- release.yaml | 2 +- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle index 932d8eaaf..2b9da7e5f 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa CICS/TS Manager' -version = '0.29.0' +version = '0.28.0' dependencies { api project (':galasa-managers-zos-parent:dev.galasa.zos.manager') diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java index a89391197..8fdbccc58 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java @@ -63,15 +63,22 @@ public boolean logonToCicsRegion(ICicsTerminal cicsTerminal) throws CicstsManage waitForGmText(cicsTerminal); - cicsTerminal.clear().wfk(); - logger.debug("Logged onto " + cicsTerminal.getCicsRegion()); + // If loginCredentials is provided, attempt to sign-in + // via CESL if (!cicsTerminal.getLoginCredentials().isEmpty()) { ICredentialsUsernamePassword creds = (ICredentialsUsernamePassword)this.cs.getCredentials(cicsTerminal.getLoginCredentials()); - cicsTerminal.type("CESL"); - cicsTerminal.enter(); + // Are we already on CESL/N? If not go to it + long timeout = 0; + if (!cicsTerminal.searchText("Signon to CICS", timeout)) { + cicsTerminal.clear().wfk(); + + cicsTerminal.type("CESL"); + cicsTerminal.enter(); + } + cicsTerminal.waitForTextInField("Userid"); cicsTerminal.waitForKeyboard(); cicsTerminal.type(creds.getUsername()); @@ -81,11 +88,11 @@ public boolean logonToCicsRegion(ICicsTerminal cicsTerminal) throws CicstsManage cicsTerminal.enter(); waitForLoggedOnText(cicsTerminal); - - cicsTerminal.clear().wfk(); - logger.debug("Logged into CICS TS as user: " + creds.getUsername()); } + + cicsTerminal.clear().wfk(); + } catch (Zos3270Exception | CredentialsException e) { throw new CicstsManagerException("Problem logging onto the CICS region"); } diff --git a/release.yaml b/release.yaml index 823683672..6d0ec3939 100644 --- a/release.yaml +++ b/release.yaml @@ -32,7 +32,7 @@ managers: isolated: true - artifact: dev.galasa.cicsts.manager - version: 0.29.0 + version: 0.28.0 obr: true mvp: true javadoc: true From 4ab57df9077bfb540e64fd0a36fdc4f023cb59c0 Mon Sep 17 00:00:00 2001 From: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> Date: Thu, 15 Jun 2023 15:05:51 +0100 Subject: [PATCH 135/263] set credential password as confidential text Signed-off-by: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> --- .../src/main/java/dev/galasa/cicsts/ICicsTerminal.java | 2 +- .../galasa/cicsts/internal/CicstsDefaultLogonProvider.java | 7 ++++++- .../main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsTerminal.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsTerminal.java index a4730ca9e..4ff85785f 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsTerminal.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsTerminal.java @@ -32,4 +32,4 @@ public interface ICicsTerminal extends ITerminal { String getLoginCredentials(); -} \ No newline at end of file +} diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java index 8fdbccc58..28fcfd8af 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java @@ -14,6 +14,7 @@ import dev.galasa.cicsts.internal.properties.DefaultLogonGmText; import dev.galasa.cicsts.internal.properties.DefaultLogonInitialText; import dev.galasa.cicsts.spi.ICicsRegionLogonProvider; +import dev.galasa.framework.spi.IConfidentialTextService; import dev.galasa.framework.spi.IFramework; import dev.galasa.framework.spi.creds.CredentialsException; import dev.galasa.framework.spi.creds.ICredentialsService; @@ -23,6 +24,7 @@ public class CicstsDefaultLogonProvider implements ICicsRegionLogonProvider { private static final Log logger = LogFactory.getLog(CicstsDefaultLogonProvider.class); private final ICredentialsService cs; + private final IConfidentialTextService cts; private final String initialText; private final String gmText; @@ -35,6 +37,8 @@ public CicstsDefaultLogonProvider(IFramework framework) throws CicstsManagerExce throw new CicstsManagerException("Could not obtain the Credentials service.", e); } + this.cts = framework.getConfidentialTextService(); + try { initialText = DefaultLogonInitialText.get(); gmText = DefaultLogonGmText.get(); @@ -69,6 +73,7 @@ public boolean logonToCicsRegion(ICicsTerminal cicsTerminal) throws CicstsManage // via CESL if (!cicsTerminal.getLoginCredentials().isEmpty()) { ICredentialsUsernamePassword creds = (ICredentialsUsernamePassword)this.cs.getCredentials(cicsTerminal.getLoginCredentials()); + cts.registerText(creds.getPassword(), "Password for credentials"); // Are we already on CESL/N? If not go to it long timeout = 0; @@ -134,4 +139,4 @@ private void waitForLoggedOnText(ICicsTerminal cicsTerminal) throws CicstsManage } } -} \ No newline at end of file +} diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java index bd0a793d2..902d8f233 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java @@ -162,4 +162,4 @@ public String getLoginCredentials() { return this.loginCredentials; } -} \ No newline at end of file +} From 7c72128516fc083cecd892a64e9ccf9fcce6a56e Mon Sep 17 00:00:00 2001 From: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> Date: Fri, 23 Jun 2023 10:21:47 +0100 Subject: [PATCH 136/263] review comments - part 1 Signed-off-by: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> --- .../dev.galasa.cicsts.manager/build.gradle | 2 +- .../java/dev/galasa/cicsts/CicsTerminal.java | 2 +- .../java/dev/galasa/cicsts/ICicsTerminal.java | 2 +- .../internal/CicstsDefaultLogonProvider.java | 8 ++++---- .../cicsts/internal/CicstsManagerImpl.java | 10 +++++----- .../galasa/cicsts/spi/CicsTerminalImpl.java | 18 +++++++++--------- release.yaml | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle index 2b9da7e5f..932d8eaaf 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa CICS/TS Manager' -version = '0.28.0' +version = '0.29.0' dependencies { api project (':galasa-managers-zos-parent:dev.galasa.zos.manager') diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsTerminal.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsTerminal.java index 603138ac2..ae1bd2b62 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsTerminal.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsTerminal.java @@ -42,5 +42,5 @@ * The CICS TS Manager will automatically log into the CICS TS region via CESL using the terminal with * the specified secure credentials when it connects */ - String loginCredentials() default ""; + String loginCredentialsTag() default ""; } diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsTerminal.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsTerminal.java index 4ff85785f..e48c63ba7 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsTerminal.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsTerminal.java @@ -30,6 +30,6 @@ public interface ICicsTerminal extends ITerminal { */ public boolean isUppercaseTranslation() throws CicstsManagerException; - String getLoginCredentials(); + String getLoginCredentialsTag(); } diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java index 28fcfd8af..6742b49fd 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java @@ -69,11 +69,11 @@ public boolean logonToCicsRegion(ICicsTerminal cicsTerminal) throws CicstsManage logger.debug("Logged onto " + cicsTerminal.getCicsRegion()); - // If loginCredentials is provided, attempt to sign-in + // If loginCredentialsTag is provided, attempt to sign-in // via CESL - if (!cicsTerminal.getLoginCredentials().isEmpty()) { - ICredentialsUsernamePassword creds = (ICredentialsUsernamePassword)this.cs.getCredentials(cicsTerminal.getLoginCredentials()); - cts.registerText(creds.getPassword(), "Password for credentials"); + if (!cicsTerminal.getLoginCredentialsTag().isEmpty()) { + ICredentialsUsernamePassword creds = (ICredentialsUsernamePassword)this.cs.getCredentials(cicsTerminal.getLoginCredentialsTag()); + cts.registerText(creds.getPassword(), "Password for credential tag: " + cicsTerminal.getLoginCredentialsTag()); // Are we already on CESL/N? If not go to it long timeout = 0; diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java index 91666d7d1..181b103ec 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java @@ -65,9 +65,9 @@ public class CicstsManagerImpl extends AbstractManager implements ICicstsManager private boolean required; private IZosManagerSpi zosManager; - private IZosBatchSpi zosBatchManager; - private IZosFileSpi zosFileManager; - private ITextScannerManagerSpi textScanner; + private IZosBatchSpi zosBatchManager; + private IZosFileSpi zosFileManager; + private ITextScannerManagerSpi textScanner; private final HashMap provisionedCicsRegions = new HashMap<>(); @@ -208,7 +208,7 @@ public ICicsTerminal generateCicsTerminal(Field field, List annotati CicsTerminal annotation = field.getAnnotation(CicsTerminal.class); String tag = defaultString(annotation.cicsTag(), "PRIMARY").toUpperCase(); - String loginCredentials = defaultString(annotation.loginCredentials(), "").toUpperCase(); + String loginCredentialsTag = defaultString(annotation.loginCredentialsTag(), "").toUpperCase(); ICicsRegionProvisioned region = this.provisionedCicsRegions.get(tag); if (region == null) { @@ -217,7 +217,7 @@ public ICicsTerminal generateCicsTerminal(Field field, List annotati } try { - CicsTerminalImpl newTerminal = new CicsTerminalImpl(this, getFramework(), region, annotation.connectAtStartup(), this.textScanner, loginCredentials); + CicsTerminalImpl newTerminal = new CicsTerminalImpl(this, getFramework(), region, annotation.connectAtStartup(), this.textScanner, loginCredentialsTag); this.terminals.add(newTerminal); return newTerminal; } catch (TerminalInterruptedException e) { diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java index 902d8f233..123018b39 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/spi/CicsTerminalImpl.java @@ -33,28 +33,28 @@ public class CicsTerminalImpl extends Zos3270TerminalImpl implements ICicsTermin public final ICicstsManagerSpi cicstsManager; public final boolean connectAtStartup; - public final String loginCredentials; + public final String loginCredentialsTag; - public CicsTerminalImpl(ICicstsManagerSpi cicstsManager, IFramework framework, ICicsRegionProvisioned cicsRegion, String host, int port, boolean ssl, boolean connectAtStartup, ITextScannerManagerSpi textScanner, String loginCredentials) + public CicsTerminalImpl(ICicstsManagerSpi cicstsManager, IFramework framework, ICicsRegionProvisioned cicsRegion, String host, int port, boolean ssl, boolean connectAtStartup, ITextScannerManagerSpi textScanner, String loginCredentialsTag) throws TerminalInterruptedException, Zos3270ManagerException, ZosManagerException { super(cicsRegion.getNextTerminalId(), host, port, ssl, framework, false, cicsRegion.getZosImage(), new TerminalSize(80, 24), new TerminalSize(0, 0), textScanner); this.cicsRegion = cicsRegion; this.cicstsManager = cicstsManager; this.connectAtStartup = connectAtStartup; - this.loginCredentials = loginCredentials; + this.loginCredentialsTag = loginCredentialsTag; setAutoReconnect(connectAtStartup); } - public CicsTerminalImpl(ICicstsManagerSpi cicstsManager, IFramework framework, ICicsRegionProvisioned cicsRegion, IIpHost ipHost, boolean connectAtStartup, ITextScannerManagerSpi textScanner, String loginCredentials) + public CicsTerminalImpl(ICicstsManagerSpi cicstsManager, IFramework framework, ICicsRegionProvisioned cicsRegion, IIpHost ipHost, boolean connectAtStartup, ITextScannerManagerSpi textScanner, String loginCredentialsTag) throws TerminalInterruptedException, IpNetworkManagerException, Zos3270ManagerException, ZosManagerException { - this(cicstsManager, framework, cicsRegion, ipHost.getHostname(), ipHost.getTelnetPort(), ipHost.isTelnetPortTls(), connectAtStartup, textScanner, loginCredentials); + this(cicstsManager, framework, cicsRegion, ipHost.getHostname(), ipHost.getTelnetPort(), ipHost.isTelnetPortTls(), connectAtStartup, textScanner, loginCredentialsTag); } - public CicsTerminalImpl(ICicstsManagerSpi cicstsManager, IFramework framework, ICicsRegionProvisioned cicsRegion, boolean connectAtStartup, ITextScannerManagerSpi textScanner, String loginCredentials) throws TerminalInterruptedException, IpNetworkManagerException, + public CicsTerminalImpl(ICicstsManagerSpi cicstsManager, IFramework framework, ICicsRegionProvisioned cicsRegion, boolean connectAtStartup, ITextScannerManagerSpi textScanner, String loginCredentialsTag) throws TerminalInterruptedException, IpNetworkManagerException, Zos3270ManagerException, ZosManagerException { - this(cicstsManager, framework, cicsRegion, cicsRegion.getZosImage().getIpHost(), connectAtStartup, textScanner, loginCredentials); + this(cicstsManager, framework, cicsRegion, cicsRegion.getZosImage().getIpHost(), connectAtStartup, textScanner, loginCredentialsTag); } public CicsTerminalImpl(ICicstsManagerSpi cicstsManager, IFramework framework, ICicsRegionProvisioned cicsRegion, boolean connectAtStartup, ITextScannerManagerSpi textScanner) throws TerminalInterruptedException, IpNetworkManagerException, @@ -158,8 +158,8 @@ public boolean isUppercaseTranslation() throws CicstsManagerException { } @Override - public String getLoginCredentials() { - return this.loginCredentials; + public String getLoginCredentialsTag() { + return this.loginCredentialsTag; } } diff --git a/release.yaml b/release.yaml index 6d0ec3939..823683672 100644 --- a/release.yaml +++ b/release.yaml @@ -32,7 +32,7 @@ managers: isolated: true - artifact: dev.galasa.cicsts.manager - version: 0.28.0 + version: 0.29.0 obr: true mvp: true javadoc: true From 051a37ca53758cad169b840dab4003e09a2c4e0d Mon Sep 17 00:00:00 2001 From: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> Date: Fri, 23 Jun 2023 19:37:49 +0100 Subject: [PATCH 137/263] fail early if security off Signed-off-by: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> --- .../dev.galasa.cicsts.manager/build.gradle | 2 +- .../cicsts/internal/CicstsDefaultLogonProvider.java | 10 ++++------ release.yaml | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle index 932d8eaaf..2a85c1122 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa CICS/TS Manager' -version = '0.29.0' +version = '0.30.0' dependencies { api project (':galasa-managers-zos-parent:dev.galasa.zos.manager') diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java index 6742b49fd..e0ba2c03b 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java @@ -63,7 +63,7 @@ public boolean logonToCicsRegion(ICicsTerminal cicsTerminal) throws CicstsManage checkForInitialText(cicsTerminal); } - cicsTerminal.type("LOGON APPLID(" + cicsTerminal.getCicsRegion().getApplid() + ")").enter(); + cicsTerminal.type("LOGON APPLID(" + cicsTerminal.getCicsRegion().getApplid() + ")").enter().wfk(); waitForGmText(cicsTerminal); @@ -80,17 +80,15 @@ public boolean logonToCicsRegion(ICicsTerminal cicsTerminal) throws CicstsManage if (!cicsTerminal.searchText("Signon to CICS", timeout)) { cicsTerminal.clear().wfk(); - cicsTerminal.type("CESL"); - cicsTerminal.enter(); + cicsTerminal.type("CESL").enter().wfk(); } - cicsTerminal.waitForTextInField("Userid"); - cicsTerminal.waitForKeyboard(); + cicsTerminal.waitForTextInField(new String[]{"Userid"}, new String[]{"Security is not active"}); cicsTerminal.type(creds.getUsername()); cicsTerminal.positionCursorToFieldContaining("Password"); cicsTerminal.tab(); cicsTerminal.type(creds.getPassword()); - cicsTerminal.enter(); + cicsTerminal.enter().wfk(); waitForLoggedOnText(cicsTerminal); logger.debug("Logged into CICS TS as user: " + creds.getUsername()); diff --git a/release.yaml b/release.yaml index 823683672..849cff59c 100644 --- a/release.yaml +++ b/release.yaml @@ -32,7 +32,7 @@ managers: isolated: true - artifact: dev.galasa.cicsts.manager - version: 0.29.0 + version: 0.30.0 obr: true mvp: true javadoc: true From 9cb6dac35cafa3fedd143608b7127f372c17af1e Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Fri, 18 Aug 2023 15:12:50 +0100 Subject: [PATCH 138/263] increasing timeout to allow some tests more time to download isolated zip Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../src/main/java/dev/galasa/ipnetwork/spi/SSHClient.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/SSHClient.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/SSHClient.java index c25c254b1..89f38c60b 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/SSHClient.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/SSHClient.java @@ -577,7 +577,10 @@ public Integer call() throws Exception { private class KeepAliveThread extends Thread { private final Session monitorSession; - private long idleTimeout = 60000; + + // Some commands we run download the isolated build zip which takes ages... + // Timeout increased from 60secs to 120secs to allow the download to complete. + private long idleTimeout = 120000; public KeepAliveThread(Session session) { this.monitorSession = session; From 8933b0c8427b2befa06c136269bd28fefd224768 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Fri, 18 Aug 2023 16:17:25 +0100 Subject: [PATCH 139/263] Pom.xml should declare pom.xml as the packaging type Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- galasa-managers-parent/build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index b7838c3c2..519c67141 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -187,7 +187,10 @@ publishing { artifact myReleaseYaml artifactId "dev.galasa.managers.manifest" groupId 'dev.galasa' - version version + + pom { + packaging = "pom" + } } } repositories { From 9768cce1350956681821cd56e0fa6385f455add6 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Wed, 18 Oct 2023 11:23:54 +0100 Subject: [PATCH 140/263] Add mandatory fields to generated manifest pom.xml Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- galasa-managers-parent/build.gradle | 40 +++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index 519c67141..56506a5c6 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -183,16 +183,46 @@ def myReleaseYaml = artifacts.add('release_metadata', file("$buildDir/release.ya // Note: The maven co-ordinates are versioned using the version for this bundle. publishing { publications { - maven(MavenPublication) { + + // Publish the component manifest/release.yaml + publishReleaseManifestYaml(MavenPublication) { artifact myReleaseYaml - artifactId "dev.galasa.managers.manifest" - groupId 'dev.galasa' - + pom { - packaging = "pom" + name = "Manifest for managers bundle versions" + artifactId = "dev.galasa.managers.manifest" + groupId = 'dev.galasa' + version = version + description = "Conveys bundle version information to OBR builds." + licenses { + license { + name = 'Eclipse Public License - v 2.0' + url = 'https://www.eclipse.org/legal/epl-2.0/t' + } + } + url = 'https://galasa.dev' + developers { + developer { + name = 'Galasa Developer' + email = 'galasadelivery@ibm.com' + organization = 'IBM' + organizationUrl = 'https://www.ibm.com' + } + } + scm { + connection = 'scm:git:git:://github.com/galasa-dev/managers' + developerConnection = 'scm:git:git:://github.com/galasa-dev/managers' + url = 'https://github.com/galasa-dev/managers' + } + issueManagement { + system = 'GitHub' + url = 'https://github.com/galasa-dev/projectmanagement/issues' + } } + } } + repositories { maven { url = "$targetMaven" From da8afcf875b07d4ad336e9ea5c6ee9c874ed3710 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 18 Oct 2023 16:46:22 +0100 Subject: [PATCH 141/263] Removing maven publish step Signed-off-by: Jade Carino --- galasa-managers-parent/build.gradle | 111 ++++++++++++++-------------- 1 file changed, 56 insertions(+), 55 deletions(-) diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index 56506a5c6..97970d99d 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -1,7 +1,7 @@ plugins { id 'biz.aQute.bnd.builder' version '5.3.0' apply false id 'jacoco' - id 'maven-publish' + // id 'maven-publish' } // Note: The following version number is updated using the set-version.sh tool. @@ -181,60 +181,61 @@ def myReleaseYaml = artifacts.add('release_metadata', file("$buildDir/release.ya // Publish the release.yaml as a maven artifact. // Note: The maven co-ordinates are versioned using the version for this bundle. -publishing { - publications { - - // Publish the component manifest/release.yaml - publishReleaseManifestYaml(MavenPublication) { - artifact myReleaseYaml - - pom { - name = "Manifest for managers bundle versions" - artifactId = "dev.galasa.managers.manifest" - groupId = 'dev.galasa' - version = version - description = "Conveys bundle version information to OBR builds." - licenses { - license { - name = 'Eclipse Public License - v 2.0' - url = 'https://www.eclipse.org/legal/epl-2.0/t' - } - } - url = 'https://galasa.dev' - developers { - developer { - name = 'Galasa Developer' - email = 'galasadelivery@ibm.com' - organization = 'IBM' - organizationUrl = 'https://www.ibm.com' - } - } - scm { - connection = 'scm:git:git:://github.com/galasa-dev/managers' - developerConnection = 'scm:git:git:://github.com/galasa-dev/managers' - url = 'https://github.com/galasa-dev/managers' - } - issueManagement { - system = 'GitHub' - url = 'https://github.com/galasa-dev/projectmanagement/issues' - } - } - - } - } - - repositories { - maven { - url = "$targetMaven" +// Commenting out for now. +// publishing { +// publications { + +// // Publish the component manifest/release.yaml +// publishReleaseManifestYaml(MavenPublication) { +// artifact myReleaseYaml + +// pom { +// name = "Manifest for managers bundle versions" +// artifactId = "dev.galasa.managers.manifest" +// groupId = 'dev.galasa' +// version = version +// description = "Conveys bundle version information to OBR builds." +// licenses { +// license { +// name = 'Eclipse Public License - v 2.0' +// url = 'https://www.eclipse.org/legal/epl-2.0/t' +// } +// } +// url = 'https://galasa.dev' +// developers { +// developer { +// name = 'Galasa Developer' +// email = 'galasadelivery@ibm.com' +// organization = 'IBM' +// organizationUrl = 'https://www.ibm.com' +// } +// } +// scm { +// connection = 'scm:git:git:://github.com/galasa-dev/managers' +// developerConnection = 'scm:git:git:://github.com/galasa-dev/managers' +// url = 'https://github.com/galasa-dev/managers' +// } +// issueManagement { +// system = 'GitHub' +// url = 'https://github.com/galasa-dev/projectmanagement/issues' +// } +// } + +// } +// } + +// repositories { +// maven { +// url = "$targetMaven" - if ("$targetMaven".startsWith('http')) { - credentials { - username System.getenv('MAVENUSERNAME') - password System.getenv('MAVENPASSWORD') - } - } - } - } -} +// if ("$targetMaven".startsWith('http')) { +// credentials { +// username System.getenv('MAVENUSERNAME') +// password System.getenv('MAVENPASSWORD') +// } +// } +// } +// } +// } From 76639e487916fd06a1d476a554373f3e9ef5555b Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 18 Oct 2023 17:16:52 +0100 Subject: [PATCH 142/263] Add Maven Publication and Signign back in Signed-off-by: Jade Carino --- galasa-managers-parent/build.gradle | 118 +++++++++++++++------------- 1 file changed, 62 insertions(+), 56 deletions(-) diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index 97970d99d..19693f051 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -1,7 +1,8 @@ plugins { id 'biz.aQute.bnd.builder' version '5.3.0' apply false id 'jacoco' - // id 'maven-publish' + id 'maven-publish' + id 'signing' } // Note: The following version number is updated using the set-version.sh tool. @@ -55,7 +56,13 @@ repositories { } } +signing { + sign publishing.publications +} +tasks.withType(Sign) { + onlyIf { isMainOrRelease.toBoolean() } +} if (jacocoEnabled.toBoolean()) { publishing { @@ -181,61 +188,60 @@ def myReleaseYaml = artifacts.add('release_metadata', file("$buildDir/release.ya // Publish the release.yaml as a maven artifact. // Note: The maven co-ordinates are versioned using the version for this bundle. -// Commenting out for now. -// publishing { -// publications { - -// // Publish the component manifest/release.yaml -// publishReleaseManifestYaml(MavenPublication) { -// artifact myReleaseYaml - -// pom { -// name = "Manifest for managers bundle versions" -// artifactId = "dev.galasa.managers.manifest" -// groupId = 'dev.galasa' -// version = version -// description = "Conveys bundle version information to OBR builds." -// licenses { -// license { -// name = 'Eclipse Public License - v 2.0' -// url = 'https://www.eclipse.org/legal/epl-2.0/t' -// } -// } -// url = 'https://galasa.dev' -// developers { -// developer { -// name = 'Galasa Developer' -// email = 'galasadelivery@ibm.com' -// organization = 'IBM' -// organizationUrl = 'https://www.ibm.com' -// } -// } -// scm { -// connection = 'scm:git:git:://github.com/galasa-dev/managers' -// developerConnection = 'scm:git:git:://github.com/galasa-dev/managers' -// url = 'https://github.com/galasa-dev/managers' -// } -// issueManagement { -// system = 'GitHub' -// url = 'https://github.com/galasa-dev/projectmanagement/issues' -// } -// } - -// } -// } - -// repositories { -// maven { -// url = "$targetMaven" +publishing { + publications { + + // Publish the component manifest/release.yaml + publishReleaseManifestYaml(MavenPublication) { + artifact myReleaseYaml + + pom { + name = "Manifest for managers bundle versions" + artifactId = "dev.galasa.managers.manifest" + groupId = 'dev.galasa' + version = version + description = "Conveys bundle version information to OBR builds." + licenses { + license { + name = 'Eclipse Public License - v 2.0' + url = 'https://www.eclipse.org/legal/epl-2.0/t' + } + } + url = 'https://galasa.dev' + developers { + developer { + name = 'Galasa Developer' + email = 'galasadelivery@ibm.com' + organization = 'IBM' + organizationUrl = 'https://www.ibm.com' + } + } + scm { + connection = 'scm:git:git:://github.com/galasa-dev/managers' + developerConnection = 'scm:git:git:://github.com/galasa-dev/managers' + url = 'https://github.com/galasa-dev/managers' + } + issueManagement { + system = 'GitHub' + url = 'https://github.com/galasa-dev/projectmanagement/issues' + } + } + + } + } + + repositories { + maven { + url = "$targetMaven" -// if ("$targetMaven".startsWith('http')) { -// credentials { -// username System.getenv('MAVENUSERNAME') -// password System.getenv('MAVENPASSWORD') -// } -// } -// } -// } -// } + if ("$targetMaven".startsWith('http')) { + credentials { + username System.getenv('MAVENUSERNAME') + password System.getenv('MAVENPASSWORD') + } + } + } + } +} From 018adcc47d22f2b96d17f7827a076e83da24d37a Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 18 Oct 2023 17:32:34 +0100 Subject: [PATCH 143/263] Remove clean task Signed-off-by: Jade Carino --- galasa-managers-parent/build.gradle | 7 ------- 1 file changed, 7 deletions(-) diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index 19693f051..e6acd2400 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -11,13 +11,6 @@ plugins { // can pick it up later. version = "0.30.0" -task clean { - // make sure the build directory is gone - doFirst { - delete "${buildDir}" - } -} - // A configuration to publish the merge exec into configurations { archives From 8c1a40249892c169e7d9c6256594ee15dd0add2e Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Thu, 19 Oct 2023 15:59:13 +0100 Subject: [PATCH 144/263] bump version to 0.31.0 Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- galasa-managers-parent/build.gradle | 4 ++-- .../buildSrc/src/main/groovy/galasa.manager.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index e6acd2400..ba4c470c0 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -9,7 +9,7 @@ plugins { // It is used as the version number of the managers bundle, which contains a yaml // file which is in a release.yaml, but published to maven, so that the OBR build // can pick it up later. -version = "0.30.0" +version = "0.31.0" // A configuration to publish the merge exec into configurations { @@ -192,7 +192,7 @@ publishing { name = "Manifest for managers bundle versions" artifactId = "dev.galasa.managers.manifest" groupId = 'dev.galasa' - version = version +version = "0.31.0" description = "Conveys bundle version information to OBR builds." licenses { license { diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle index ecf6b84bc..2d0b02526 100644 --- a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle +++ b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle @@ -6,7 +6,7 @@ plugins { dependencies { api 'dev.galasa:dev.galasa:0.21.0' - implementation 'dev.galasa:dev.galasa.framework:0.30.0' + implementation 'dev.galasa:dev.galasa.framework:0.31.0' implementation 'commons-logging:commons-logging:1.2' implementation 'org.osgi:org.osgi.core:6.0.0' implementation 'org.osgi:org.osgi.service.component.annotations:1.3.0' From 33324203adcab1650ef00e4e9b237524333cb40c Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Thu, 19 Oct 2023 22:30:15 +0100 Subject: [PATCH 145/263] set-version script should not mess up gradle file format Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- galasa-managers-parent/build.gradle | 4 ++-- set-version.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index ba4c470c0..b95edce16 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -9,7 +9,7 @@ plugins { // It is used as the version number of the managers bundle, which contains a yaml // file which is in a release.yaml, but published to maven, so that the OBR build // can pick it up later. -version = "0.31.0" + version = "0.31.0" // A configuration to publish the merge exec into configurations { @@ -192,7 +192,7 @@ publishing { name = "Manifest for managers bundle versions" artifactId = "dev.galasa.managers.manifest" groupId = 'dev.galasa' -version = "0.31.0" + version = "0.31.0" description = "Conveys bundle version information to OBR builds." licenses { license { diff --git a/set-version.sh b/set-version.sh index 128b5c9d1..677a8511d 100755 --- a/set-version.sh +++ b/set-version.sh @@ -137,7 +137,7 @@ function upgrade_build_gradle { # of the this component lives. # For example: version = "0.29.0" - cat $source_path | sed "s/^[ ]*version[ ]*=.*/version = \"$component_version\"/1" > $temp_dir/managers-build.gradle + cat $source_path | sed "s/^[ ]*version[ ]*=.*/\t\t\t\tversion = \"$component_version\"/1" > $temp_dir/managers-build.gradle rc=$? ; if [[ "${rc}" != "0" ]]; then error "Failed to replace master version in file $source_path" ; exit 1 ; fi cp $temp_dir/managers-build.gradle $source_path From f33033c29ca7a35a5d6715a6e1794fe1148f07e6 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Thu, 19 Oct 2023 22:37:31 +0100 Subject: [PATCH 146/263] better format preservation when setting version Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- galasa-managers-parent/build.gradle | 2 +- set-version.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index b95edce16..0d7364ee0 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -9,7 +9,7 @@ plugins { // It is used as the version number of the managers bundle, which contains a yaml // file which is in a release.yaml, but published to maven, so that the OBR build // can pick it up later. - version = "0.31.0" +version = "0.31.0" // A configuration to publish the merge exec into configurations { diff --git a/set-version.sh b/set-version.sh index 677a8511d..fa8da33ac 100755 --- a/set-version.sh +++ b/set-version.sh @@ -137,7 +137,7 @@ function upgrade_build_gradle { # of the this component lives. # For example: version = "0.29.0" - cat $source_path | sed "s/^[ ]*version[ ]*=.*/\t\t\t\tversion = \"$component_version\"/1" > $temp_dir/managers-build.gradle + cat $source_path | sed "s/version[ ]*=.*/version = \"$component_version\"/1" > $temp_dir/managers-build.gradle rc=$? ; if [[ "${rc}" != "0" ]]; then error "Failed to replace master version in file $source_path" ; exit 1 ; fi cp $temp_dir/managers-build.gradle $source_path From e6f3b435fa52bea4ea2a8cefed5e44d8df6d5c92 Mon Sep 17 00:00:00 2001 From: Holly Hunt Date: Fri, 20 Oct 2023 11:36:22 +0100 Subject: [PATCH 147/263] updated eclipse license in pom.template file Signed-off-by: Holly Hunt --- .../buildSrc/src/main/groovy/galasa.java.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.java.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.java.gradle index d1f0f7d5f..d82ed5b74 100644 --- a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.java.gradle +++ b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.java.gradle @@ -79,7 +79,7 @@ publishing { licenses { license { name = 'Eclipse Public License - v 2.0' - url = 'https://www.eclipse.org/legal/epl-2.0/t' + url = 'https://www.eclipse.org/legal/epl-2.0' } } developers { From dca09fddafb2d83b164ead08760b12526c6091c6 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Mon, 6 Nov 2023 17:36:18 +0000 Subject: [PATCH 148/263] Check stepname before updating existing spool files (#907) * Check stepname before updating spool files Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> * Remove debugging message Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> * Empty commit to kick off build Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --------- Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../dev.galasa.zos.manager/build.gradle | 4 +- .../internal/ZosBatchJobOutputImpl.java | 18 +-- .../internal/TestZosBatchJobOutputImpl.java | 152 ++++++++++++------ release.yaml | 2 +- 4 files changed, 117 insertions(+), 59 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle index 56c89fb13..855769912 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS Manager' -version = '0.28.0' +version = '0.31.0' dependencies { api project (':galasa-managers-comms-parent:dev.galasa.ipnetwork.manager') @@ -15,7 +15,7 @@ dependencies { // Note: These values are consumed by the parent build process // They indicate which packages of functionality this OSGi bundle should be delivered inside, // or referenced from. -// The settings here are gathered together by the build process to create a release.yaml file +// The settings here are gathered together by the build process to create a release.yaml file // which gathers-up all the packaging metadata about all the OSGi bundles in this component. ext.projectName=project.name ext.includeInOBR = true diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputImpl.java index a15aa7b4f..acb4b81f5 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputImpl.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.internal; import java.util.ArrayList; @@ -20,7 +20,7 @@ * Implementation of {@link IZosBatchJobOutput} * */ -public class ZosBatchJobOutputImpl implements IZosBatchJobOutputSpi, Iterable { +public class ZosBatchJobOutputImpl implements IZosBatchJobOutputSpi { private IZosBatchJob batchJob; private String jobname; @@ -42,8 +42,8 @@ public void addJcl(String jcl) { @Override public void addSpoolFile(String stepname, String procstep, String ddname, String id, String records) { //the outline of the spool may already exist. BUT the content might not - if it exists then update it - for(IZosBatchJobOutputSpoolFile spool : spoolFiles){ - if(ddname.equals(spool.getDdname())){ + for (IZosBatchJobOutputSpoolFile spool : spoolFiles) { + if (ddname.equals(spool.getDdname()) && (stepname != null && stepname.equals(spool.getStepname()))) { spool.setRecords(records); return; } @@ -98,7 +98,7 @@ public IZosBatchJobOutputSpoolFile next() { @Override public void remove() { - throw new UnsupportedOperationException("Object can not be updated"); + throw new UnsupportedOperationException("Object cannot be updated"); } }; } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/TestZosBatchJobOutputImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/TestZosBatchJobOutputImpl.java index 6fb020871..90f48f020 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/TestZosBatchJobOutputImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/test/java/dev/galasa/zosbatch/internal/TestZosBatchJobOutputImpl.java @@ -1,13 +1,16 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.internal; import java.util.Iterator; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -21,82 +24,137 @@ @RunWith(MockitoJUnitRunner.class) public class TestZosBatchJobOutputImpl { - + @Mock private IZosBatchJob zosBatchJobMock; - - private ZosBatchJobOutputImpl zosBatchJobOutput; + + private ZosBatchJobOutputImpl zosBatchJobOutput; private static final String JOBNAME = "jobname"; private static final String JOBID = "jobid"; - + private static final String STEPNAME = "stepname"; - + private static final String PROCSTEP = "procstep"; - + private static final String DDNAME = "ddname"; - + private static final String ID = "id"; private static final String RECORDS = "records"; - + @Before public void setup() throws ZosBatchManagerException { zosBatchJobOutput = new ZosBatchJobOutputImpl(zosBatchJobMock, JOBNAME, JOBID); } - + @Test - public void testAddJcl() throws ZosBatchException { + public void testAddJclCreatesSpoolFileWithGivenRecords() throws ZosBatchException { zosBatchJobOutput.addJcl(RECORDS); - Assert.assertEquals("getJobname() should return the supplied value", JOBNAME, zosBatchJobOutput.getJobname()); - Assert.assertEquals("getJobid() should return the supplied value", JOBID, zosBatchJobOutput.getJobid()); - Assert.assertEquals("toString() should return the supplied values of JOBNAME_JOBID", JOBNAME + "_" + JOBID, zosBatchJobOutput.toString()); + + List spoolFiles = zosBatchJobOutput.getSpoolFiles(); + assertThat(spoolFiles).hasSize(1); + + IZosBatchJobOutputSpoolFile expectedSpoolFile = new ZosBatchJobOutputSpoolFileImpl(zosBatchJobMock, JOBNAME, + JOBID, "", "", "JESJCLIN", "JCL", RECORDS); + assertThat(spoolFiles.get(0)).usingRecursiveComparison().isEqualTo(expectedSpoolFile); } @Test - public void testAdd() throws ZosBatchException { + public void testAddSingleSpoolFileAppendsNewSpoolFile() throws ZosBatchException { zosBatchJobOutput.addSpoolFile(STEPNAME, PROCSTEP, DDNAME, ID, RECORDS); - Assert.assertEquals("getJobname() should return the supplied value", JOBNAME, zosBatchJobOutput.getJobname()); - Assert.assertEquals("getJobid() should return the supplied value", JOBID, zosBatchJobOutput.getJobid()); - Assert.assertEquals("toString() should return the supplied values of JOBNAME_JOBID", JOBNAME + "_" + JOBID, zosBatchJobOutput.toString()); + + List spoolFiles = zosBatchJobOutput.getSpoolFiles(); + assertThat(spoolFiles).hasSize(1); + + IZosBatchJobOutputSpoolFile expectedSpoolFile = new ZosBatchJobOutputSpoolFileImpl(zosBatchJobMock, JOBNAME, + JOBID, STEPNAME, PROCSTEP, DDNAME, ID, RECORDS); + assertThat(spoolFiles.get(0)).usingRecursiveComparison().isEqualTo(expectedSpoolFile); } + @Test - public void testGetSpoolFiles() throws ZosBatchException { - zosBatchJobOutput.addJcl("JCL"); - Assert.assertNotNull("getSpoolFiles() should not return null", zosBatchJobOutput.getSpoolFiles()); + public void testAddDifferentSpoolFilesAppendsMultipleSpoolFiles() throws ZosBatchException { + zosBatchJobOutput.addSpoolFile("STEP1", "PROCSTEP1", "DD1", "ID1", RECORDS); + zosBatchJobOutput.addSpoolFile("STEP2", "PROCSTEP2", "DD2", "ID2", RECORDS); + + List spoolFiles = zosBatchJobOutput.getSpoolFiles(); + assertThat(spoolFiles).hasSize(2); + + IZosBatchJobOutputSpoolFile expectedFirstSpoolFile = new ZosBatchJobOutputSpoolFileImpl(zosBatchJobMock, + JOBNAME, JOBID, "STEP1", "PROCSTEP1", "DD1", "ID1", RECORDS); + assertThat(spoolFiles.get(0)).usingRecursiveComparison().isEqualTo(expectedFirstSpoolFile); + + IZosBatchJobOutputSpoolFile expectedSecondSpoolFile = new ZosBatchJobOutputSpoolFileImpl(zosBatchJobMock, + JOBNAME, JOBID, "STEP2", "PROCSTEP2", "DD2", "ID2", RECORDS); + assertThat(spoolFiles.get(1)).usingRecursiveComparison().isEqualTo(expectedSecondSpoolFile); } - + @Test - public void testToList() throws ZosBatchException { + public void testAddSpoolFilesWithSameDDNameAppendsSpoolFiles() throws ZosBatchException { + zosBatchJobOutput.addSpoolFile("STEP1", PROCSTEP, DDNAME, ID, RECORDS); + zosBatchJobOutput.addSpoolFile("STEP2", PROCSTEP, DDNAME, ID, RECORDS); + + List spoolFiles = zosBatchJobOutput.getSpoolFiles(); + assertThat(spoolFiles).hasSize(2); + + IZosBatchJobOutputSpoolFile expectedFirstSpoolFile = new ZosBatchJobOutputSpoolFileImpl(zosBatchJobMock, + JOBNAME, JOBID, "STEP1", PROCSTEP, DDNAME, ID, RECORDS); + assertThat(spoolFiles.get(0)).usingRecursiveComparison().isEqualTo(expectedFirstSpoolFile); + + IZosBatchJobOutputSpoolFile expectedSecondSpoolFile = new ZosBatchJobOutputSpoolFileImpl(zosBatchJobMock, + JOBNAME, JOBID, "STEP2", PROCSTEP, DDNAME, ID, RECORDS); + assertThat(spoolFiles.get(1)).usingRecursiveComparison().isEqualTo(expectedSecondSpoolFile); + } + + @Test + public void testAddSpoolFilesWithSameDDNameAndStepNameUpdatesExistingSpoolFile() throws ZosBatchException { + zosBatchJobOutput.addSpoolFile(STEPNAME, PROCSTEP, DDNAME, ID, ""); + zosBatchJobOutput.addSpoolFile(STEPNAME, PROCSTEP, DDNAME, ID, RECORDS); + + List spoolFiles = zosBatchJobOutput.getSpoolFiles(); + assertThat(spoolFiles).hasSize(1); + + IZosBatchJobOutputSpoolFile expectedSpoolFile = new ZosBatchJobOutputSpoolFileImpl(zosBatchJobMock, JOBNAME, + JOBID, STEPNAME, PROCSTEP, DDNAME, ID, RECORDS); + assertThat(spoolFiles.get(0)).usingRecursiveComparison().isEqualTo(expectedSpoolFile); + } + + @Test + public void testToListReturnsAListOfAllSpoolFileContents() throws ZosBatchException { zosBatchJobOutput.addJcl("JCL"); - Assert.assertNotNull("toList() should return a value", zosBatchJobOutput.toList()); + assertThat(zosBatchJobOutput.toList()).isNotNull(); } - + @Test - public void testIterator() throws ZosBatchException { + public void testIteratorCreatesAnIteratorOverExistingSpoolFiles() throws ZosBatchException { zosBatchJobOutput.addJcl("JCL"); Iterator iterator = zosBatchJobOutput.iterator(); - - Assert.assertTrue("hasNext() should return true", iterator.hasNext()); - - Assert.assertNotNull("next() should return a value", iterator.next()); - - String expectedMessage = "Object can not be updated"; - UnsupportedOperationException expectedException = Assert.assertThrows("expected exception should be thrown", UnsupportedOperationException.class, ()->{ - iterator.remove(); - }); - Assert.assertEquals("exception should contain expected message", expectedMessage, expectedException.getMessage()); + + assertThat(iterator.hasNext()).isTrue(); + + assertThat(iterator.next()).isNotNull(); + + String expectedMessage = "Object cannot be updated"; + assertThatThrownBy(() -> iterator.remove()) + .isInstanceOf(UnsupportedOperationException.class) + .hasMessageContaining(expectedMessage); } - + @Test - public void testSize() throws ZosBatchException { + public void testSizeReturnsTheNumberOfSpoolFilesThatExist() throws ZosBatchException { zosBatchJobOutput.addJcl("JCL"); - Assert.assertEquals("size() should return a 1", 1, zosBatchJobOutput.size()); + assertThat(zosBatchJobOutput.size()).isEqualTo(1); } - + @Test - public void testIsEmpty() throws ZosBatchException { - Assert.assertTrue("isEmpty() should return a true", zosBatchJobOutput.isEmpty()); + public void testIsEmptyShouldReturnTrueWhenNoSpoolFilesExist() throws ZosBatchException { + assertThat(zosBatchJobOutput.isEmpty()).isTrue(); + } + + @Test + public void testIsEmptyShouldReturnFalseWhenSpoolFilesExist() throws ZosBatchException { + zosBatchJobOutput.addJcl("JCL"); + assertThat(zosBatchJobOutput.isEmpty()).isFalse(); } } diff --git a/release.yaml b/release.yaml index 849cff59c..a75870843 100644 --- a/release.yaml +++ b/release.yaml @@ -422,7 +422,7 @@ managers: codecoverage: true - artifact: dev.galasa.zos.manager - version: 0.28.0 + version: 0.31.0 obr: true javadoc: true bom: true From 9c9bf6b7bcd0103704657b30a74525ad7dddd9ab Mon Sep 17 00:00:00 2001 From: Holly Hunt Date: Wed, 8 Nov 2023 14:53:20 +0000 Subject: [PATCH 149/263] removed galasa.dev nexus references in dev docs Signed-off-by: Holly Hunt --- .../galasa/galasaecosystem/internal/properties/RuntimeRepo.java | 2 +- .../galasaecosystem/internal/properties/SimplatformRepo.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RuntimeRepo.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RuntimeRepo.java index 207eb2ddd..a639e4642 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RuntimeRepo.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RuntimeRepo.java @@ -29,7 +29,7 @@ * @galasa.valid_values Value URL * * @galasa.examples - * galasaecosystem.runtime.repository=https://nexus.galasa.dev/repository/maven-development + * galasaecosystem.runtime.repository=http://development.galasa.dev/main/maven-repo/obr * */ public class RuntimeRepo extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/SimplatformRepo.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/SimplatformRepo.java index 3eb4c121f..71849ec67 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/SimplatformRepo.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/SimplatformRepo.java @@ -29,7 +29,7 @@ * @galasa.valid_values Value URL * * @galasa.examples - * galasaecosystem.simplatform.repository=https://nexus.galasa.dev/repository/maven-development + * galasaecosystem.simplatform.repository=http://development.galasa.dev/main/maven-repo/obr * */ public class SimplatformRepo extends CpsProperties { From eb1ef39cec7d7798594d5268b96cdf41d1f5e869 Mon Sep 17 00:00:00 2001 From: Holly Hunt Date: Tue, 14 Nov 2023 10:19:26 +0000 Subject: [PATCH 150/263] deleted jenkinsfile and unused references Signed-off-by: Holly Hunt --- Jenkinsfile.documentation | 90 ------------------- .../http/manager/ivt/HttpManagerIVT.java | 28 ------ githubdocs.sh | 42 --------- 3 files changed, 160 deletions(-) delete mode 100644 Jenkinsfile.documentation delete mode 100755 githubdocs.sh diff --git a/Jenkinsfile.documentation b/Jenkinsfile.documentation deleted file mode 100644 index f0d1f278e..000000000 --- a/Jenkinsfile.documentation +++ /dev/null @@ -1,90 +0,0 @@ -def mvnProfile = 'dev,managerdocs' - -pipeline { -// Initially run on any agent - agent { - label 'github' - } - options { timestamps () } - environment { -//Configure Maven from the maven tooling in Jenkins - def mvnHome = tool 'Default' - PATH = "${mvnHome}/bin:${env.PATH}" - -//Set some defaults - def workspace = pwd() - def mvnGoal = 'install' - } - stages { -// for debugging purposes - stage('report') { - steps { - echo "Branch/Tag : ${env.GIT_BRANCH}" - echo "Commit Hash : ${env.GIT_COMMIT}" - echo "Workspace directory: ${workspace}" - echo "Maven profile : ${mvnProfile}" - echo "Doc Branch : ${env.DOC_BRANCH}" - echo "Doc Reviewers : ${env.DOC_REVIEWERS}" - echo "Doc User : ${env.DOC_USER}" - echo "Doc Email : ${env.DOC_EMAIL}" - } - } - -// Set up the workspace, clear the git directories and setup the maven settings.xml files - stage('prep-workspace') { - steps { - configFileProvider([configFile(fileId: '86dde059-684b-4300-b595-64e83c2dd217', targetLocation: 'settings.xml')]) { - } - dir('repository/dev.galasa') { - deleteDir() - } - dir('repository/dev/galasa') { - deleteDir() - } - } - } - - stage('Clone Docs') { - steps { - dir('galasa.dev') { - deleteDir() - } - sh 'mkdir galasa.dev' - dir('galasa.dev') { - git(url: 'git@github.com:galasa-dev/galasa.dev.git', branch: "next") - - sh "git checkout -b ${env.DOC_BRANCH}" - } - } - } - stage('Extract Javadoc') { - steps { - dir('galasa-managers-parent') { - sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -P ${mvnProfile} -B -e -fae clean process-sources" - } - } - } - stage('Generate Markdown') { - steps { - dir('galasa-managers-parent') { - sh "mvn --settings ${workspace}/settings.xml -Dmaven.repo.local=${workspace}/repository -Dgalasa.manager.doc.directory=${workspace}/galasa.dev/src/markdown-pages/docs/managers -P ${mvnProfile} -B -e -fae dev.galasa:galasautils-maven-plugin:0.8.0:buildmanagerdoc" - } - } - } - stage('Create Pull Request') { - steps { - withCredentials([string(credentialsId: 'c4c96c90-6635-4813-ae7f-abfa889a96b6', variable: 'GITHUB_TOKEN')]) { - dir('galasa.dev') { - sh "${workspace}/githubdocs.sh" - } - } - } - } - } - post { - // triggered when red sign - failure { - slackSend (channel: '#project-galasa-devs', color: '#FF0000', message: "FAILED: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})") - } - } -} diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/src/main/java/dev/galasa/http/manager/ivt/HttpManagerIVT.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/src/main/java/dev/galasa/http/manager/ivt/HttpManagerIVT.java index ad8c389b4..59d79ed3b 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/src/main/java/dev/galasa/http/manager/ivt/HttpManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/src/main/java/dev/galasa/http/manager/ivt/HttpManagerIVT.java @@ -163,34 +163,6 @@ public void testBinary() throws HttpClientException { assertThat(response.getContent().length).isEqualTo(8); assertThat(response.getHeader("Content-Type")).isEqualTo("application/octet-stream"); } - - @Test - public void downloadFileTest() - throws Exception { - boolean fileExists = false; - File f = new File("/tmp/jenkins.hpi"); - - client.setURI(new URI("https://resources.galasa.dev")); - - InputStream in = client.getFile("/jenkins.hpi").getEntity().getContent(); - OutputStream out = new FileOutputStream(f); - - int count; - byte data[] = new byte[2048]; - while((count = in.read(data)) != -1) { - out.write(data, 0, count); - } - out.flush(); - out.close(); - - - if (f.exists() && !f.isDirectory() && f.getTotalSpace()>0) { - fileExists = true; - } - assertThat(fileExists).isTrue(); - - f.delete(); - } @Test public void buildURITest() { diff --git a/githubdocs.sh b/githubdocs.sh deleted file mode 100755 index 04d4eca6c..000000000 --- a/githubdocs.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh +e - -# -# Copyright contributors to the Galasa project -# -# SPDX-License-Identifier: EPL-2.0 -# - -echo "Checking for changes" -CHANGED=$(git status -s .) -echo $CHANGED - -if [ -z "$CHANGED" ]; then - echo "No changes detected" - exit 0 -fi - -echo "Configing user" -git config user.name '$DOC_USER' -git config user.email $DOC_EMAIL - -echo "Adding changes" -git add . - -echo "Committing changes" -git commit -m "Generated manager docs $BUILD_TAG" - -echo "Pushing branch" -git push -f origin $DOC_BRANCH - - -echo "Checking for Pull Request" -PR=$(hub pr list -h $DOC_BRANCH) -echo $PR -if [ ! -z "$PR" ]; then - echo 'Pull Request is open' - exit 0 -fi - -echo "No Pull Request exists, creating one" - -hub pull-request -b next -h $DOC_BRANCH -m "Autogenned Manager Documentation" -m "Jenkins run $BUILD_TAG" -r $DOC_REVIEWERS \ No newline at end of file From 7598b112f10d6758a3fae5675c8acf0b7670324b Mon Sep 17 00:00:00 2001 From: Holly Hunt Date: Tue, 14 Nov 2023 10:43:18 +0000 Subject: [PATCH 151/263] added downloadFileTest back in Signed-off-by: Holly Hunt --- .../http/manager/ivt/HttpManagerIVT.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/src/main/java/dev/galasa/http/manager/ivt/HttpManagerIVT.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/src/main/java/dev/galasa/http/manager/ivt/HttpManagerIVT.java index 59d79ed3b..d42842c8b 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/src/main/java/dev/galasa/http/manager/ivt/HttpManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/src/main/java/dev/galasa/http/manager/ivt/HttpManagerIVT.java @@ -164,6 +164,34 @@ public void testBinary() throws HttpClientException { assertThat(response.getHeader("Content-Type")).isEqualTo("application/octet-stream"); } + @Test + public void downloadFileTest() + throws Exception { + boolean fileExists = false; + File f = new File("/tmp/jenkins.hpi"); + + client.setURI(new URI("https://resources.galasa.dev")); + + InputStream in = client.getFile("/jenkins.hpi").getEntity().getContent(); + OutputStream out = new FileOutputStream(f); + + int count; + byte data[] = new byte[2048]; + while((count = in.read(data)) != -1) { + out.write(data, 0, count); + } + out.flush(); + out.close(); + + + if (f.exists() && !f.isDirectory() && f.getTotalSpace()>0) { + fileExists = true; + } + assertThat(fileExists).isTrue(); + + f.delete(); + } + @Test public void buildURITest() { HttpClientException expected = null; From 637fe87cff4420d048d70762b2b87006c1e28367 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Mon, 15 Jan 2024 10:06:15 +0000 Subject: [PATCH 152/263] Bump gson to 2.10.1 (#911) Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../dev.galasa.docker.manager/build.gradle | 4 +- .../dev.galasa.openstack.manager/build.gradle | 4 +- .../dev.galasa.http.manager.ivt/build.gradle | 4 +- .../dev.galasa.http.manager/build.gradle | 4 +- .../dev.galasa.core.manager/build.gradle | 4 +- .../build.gradle | 4 +- .../dev.galasa.phoenix2.manager/build.gradle | 4 +- .../build.gradle | 4 +- .../dev.galasa.selenium.manager/build.gradle | 4 +- .../build.gradle | 4 +- .../dev.galasa.zos3270.common/build.gradle | 4 +- .../dev.galasa.zos3270.manager/build.gradle | 4 +- .../build.gradle | 4 +- .../build.gradle | 4 +- .../build.gradle | 4 +- .../build.gradle | 4 +- .../build.gradle | 4 +- .../dev.galasa.zosmf.manager/build.gradle | 4 +- .../dev.galasa.zosrseapi.manager/build.gradle | 4 +- .../build.gradle | 4 +- release.yaml | 40 +++++++++---------- 21 files changed, 60 insertions(+), 60 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle index df8620a4f..8039fa35e 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle @@ -4,12 +4,12 @@ plugins { description = 'Galasa Docker Manager' -version = '0.25.0' +version = '0.31.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.10.1' implementation 'commons-io:commons-io:2.9.0' implementation 'org.apache.commons:commons-compress:1.21' } diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle index 70c9dd095..4bd34b5b3 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle @@ -4,14 +4,14 @@ plugins { description = 'Galasa Openstack Manager' -version = '0.26.0' +version = '0.31.0' dependencies { api project(':galasa-managers-comms-parent:dev.galasa.ipnetwork.manager') implementation project(':galasa-managers-unix-parent:dev.galasa.linux.manager') implementation project(':galasa-managers-windows-parent:dev.galasa.windows.manager') implementation 'org.apache.httpcomponents:httpclient-osgi:4.5.13' - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.10.1' implementation 'io.prometheus:simpleclient:0.6.0' } diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle index 958026e6f..767e98ac9 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager.ivt/build.gradle @@ -4,12 +4,12 @@ plugins { description = 'Galasa HTTP Manager IVTs' -version = '0.25.0' +version = '0.31.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') implementation project(':galasa-managers-core-parent:dev.galasa.core.manager') - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.10.1' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle index ae67ae48c..4019bfd2a 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle @@ -4,14 +4,14 @@ plugins { description = 'HTTP Manager' -version = '0.25.0' +version = '0.31.0' dependencies { api 'org.apache.httpcomponents:httpclient-osgi:4.5.13' implementation 'org.apache.httpcomponents:httpcore-osgi:4.4.14' implementation 'org.apache.httpcomponents:httpmime:4.5.8' implementation 'commons-io:commons-io:2.9.0' - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.10.1' implementation 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.0' implementation (group: 'commons-codec', name: 'commons-codec'){ version{ diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle index 783073f86..965ea1935 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/build.gradle @@ -3,10 +3,10 @@ plugins { } description = 'Galasa Core Manager' -version = '0.25.0' +version = '0.31.0' dependencies { - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.10.1' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle index c262743c9..aab1c6279 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle @@ -4,11 +4,11 @@ plugins { description = 'Galasa ElasticLog Manager' -version = '0.25.0' +version = '0.31.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.10.1' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle index d8caca6af..2f37b77fd 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/build.gradle @@ -4,11 +4,11 @@ plugins { description = 'Galasa Phoenix 2 PME Manager' -version = '0.25.0' +version = '0.31.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.10.1' } diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle index c9a73fbea..c289791a1 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Ecosystem Manager' -version = '0.27.0' +version = '0.31.0' dependencies { implementation 'commons-io:commons-io:2.9.0' @@ -18,7 +18,7 @@ dependencies { api project(':galasa-managers-windows-parent:dev.galasa.windows.manager') api project(':galasa-managers-zos-parent:dev.galasa.zos.manager') implementation 'org.yaml:snakeyaml:2.0' - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.10.1' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle index c2cf5afba..1a3600cc1 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Selenium Manager' -version = '0.25.0' +version = '0.31.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') @@ -28,7 +28,7 @@ dependencies { implementation 'net.bytebuddy:byte-buddy:1.8.15' implementation 'org.apache.commons:commons-exec:1.3' implementation 'commons-io:commons-io:2.6' - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.10.1' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/build.gradle b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/build.gradle index 5d2c0d7b7..ae7c642a7 100644 --- a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/build.gradle @@ -4,11 +4,11 @@ plugins { description = 'Galasa GitHub Issue Manager' -version = '0.25.0' +version = '0.31.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.10.1' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle index 10a7fd8eb..924fb2d86 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle @@ -4,10 +4,10 @@ plugins { description = 'Galasa zOS 3270 Terminal Manager - Common Packages' -version = '0.28.0' +version = '0.31.0' dependencies { - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.10.1' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle index 6fbe6cc81..198329b1a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle @@ -4,13 +4,13 @@ plugins { description = 'Galasa zOS 3270 Terminal Manager' -version = '0.28.0' +version = '0.31.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zos3270.common') api project(':galasa-managers-zos-parent:dev.galasa.zos.manager') api project(':galasa-managers-core-parent:dev.galasa.textscan.manager') - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.10.1' implementation 'commons-codec:commons-codec:1.15' implementation 'commons-io:commons-io:2.9.0' implementation project (':galasa-managers-common-parent:dev.galasa.common') diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle index b507f913c..1ecec7aa7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle @@ -4,12 +4,12 @@ plugins { description = 'Galasa zOS Batch Manager - RSE API Implementation' -version = '0.26.0' +version = '0.31.0' dependencies { implementation project(':galasa-managers-zos-parent:dev.galasa.zosrseapi.manager') implementation 'org.apache.commons:commons-lang3:3.8.1' - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.10.1' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle index b9a9e69d4..0fb0ffd15 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle @@ -4,11 +4,11 @@ plugins { description = 'Galasa zOS Batch Manager - zOS/MF Implementation' -version = '0.26.0' +version = '0.31.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zosmf.manager') - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.10.1' implementation 'org.apache.commons:commons-lang3:3.8.1' } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/build.gradle index 978c4ea68..36e5362f7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosconsole.zosmf.manager/build.gradle @@ -4,11 +4,11 @@ plugins { description = 'Galasa Console zOS/MF Manager' -version = '0.25.0' +version = '0.31.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zosmf.manager') - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.10.1' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle index 0b086d671..273e5c729 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle @@ -4,12 +4,12 @@ plugins { description = 'Galasa zOS File Manager - RSE API Implementation' -version = '0.25.0' +version = '0.31.0' dependencies { implementation project(':galasa-managers-zos-parent:dev.galasa.zosrseapi.manager') implementation 'org.apache.commons:commons-lang3:3.8.1' - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.10.1' implementation 'org.apache.commons:commons-collections4:4.4' implementation 'org.apache.commons:commons-lang3:3.8.1' implementation 'org.apache.commons:commons-collections4:4.4' diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/build.gradle index 3e85e087a..0dc3e8878 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/build.gradle @@ -4,11 +4,11 @@ plugins { description = 'Galasa zOS File Manager - zOS/MF Implementation' -version = '0.25.0' +version = '0.31.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zosmf.manager') - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.10.1' implementation 'org.apache.commons:commons-lang3:3.8.1' implementation 'commons-io:commons-io:2.9.0' } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle index 6c5013087..ab2eea2b1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle @@ -4,14 +4,14 @@ plugins { description = 'Galasa zOS/MF Manager' -version = '0.25.0' +version = '0.31.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zos.manager') api project(':galasa-managers-comms-parent:dev.galasa.http.manager') implementation 'commons-io:commons-io:2.8.0' implementation 'org.apache.commons:commons-lang3:3.8.1' - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.10.1' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle index 23046e212..6b0f08b45 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle @@ -4,13 +4,13 @@ plugins { description = 'Galasa RSE API Manager' -version = '0.25.0' +version = '0.31.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zos.manager') api project(':galasa-managers-comms-parent:dev.galasa.http.manager') implementation 'commons-io:commons-io:2.9.0' - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.10.1' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle index 7370b1dd3..18fd53524 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle @@ -4,12 +4,12 @@ plugins { description = 'Galasa zOS Security Manager' -version = '0.29.0' +version = '0.31.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') implementation project(':galasa-managers-zos-parent:dev.galasa.zos.manager') - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.10.1' implementation 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.0' implementation 'org.apache.commons:commons-lang3:3.8.1' diff --git a/release.yaml b/release.yaml index a75870843..98c671c9f 100644 --- a/release.yaml +++ b/release.yaml @@ -119,7 +119,7 @@ managers: isolated: true - artifact: dev.galasa.core.manager - version: 0.25.0 + version: 0.31.0 obr: true javadoc: true bom: true @@ -148,7 +148,7 @@ managers: isolated: true - artifact: dev.galasa.docker.manager - version: 0.25.0 + version: 0.31.0 obr: true javadoc: true bom: true @@ -163,7 +163,7 @@ managers: isolated: true - artifact: dev.galasa.elasticlog.manager - version: 0.25.0 + version: 0.31.0 obr: true bom: true isolated: true @@ -175,7 +175,7 @@ managers: isolated: true - artifact: dev.galasa.galasaecosystem.manager - version: 0.27.0 + version: 0.31.0 obr: true bom: true isolated: true @@ -187,14 +187,14 @@ managers: isolated: true - artifact: dev.galasa.githubissue.manager - version: 0.25.0 + version: 0.31.0 obr: true mvp: false bom: true isolated: false - artifact: dev.galasa.http.manager - version: 0.25.0 + version: 0.31.0 obr: true javadoc: true bom: true @@ -203,7 +203,7 @@ managers: codecoverage: true - artifact: dev.galasa.http.manager.ivt - version: 0.25.0 + version: 0.31.0 obr: true mvp: true isolated: true @@ -305,7 +305,7 @@ managers: isolated: true - artifact: dev.galasa.openstack.manager - version: 0.26.0 + version: 0.31.0 obr: true javadoc: true bom: true @@ -313,13 +313,13 @@ managers: codecoverage: true - artifact: dev.galasa.phoenix2.manager - version: 0.25.0 + version: 0.31.0 obr: true bom: true isolated: true - artifact: dev.galasa.selenium.manager - version: 0.25.0 + version: 0.31.0 obr: true javadoc: true bom: true @@ -357,7 +357,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosbatch.rseapi.manager - version: 0.26.0 + version: 0.31.0 obr: true bom: true mvp: true @@ -365,7 +365,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosbatch.zosmf.manager - version: 0.26.0 + version: 0.31.0 obr: true bom: true mvp: true @@ -381,7 +381,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosconsole.zosmf.manager - version: 0.25.0 + version: 0.31.0 obr: true bom: true mvp: true @@ -389,7 +389,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosfile.rseapi.manager - version: 0.25.0 + version: 0.31.0 obr: true bom: true mvp: true @@ -397,7 +397,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosfile.zosmf.manager - version: 0.25.0 + version: 0.31.0 obr: true bom: true mvp: true @@ -446,7 +446,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosmf.manager - version: 0.25.0 + version: 0.31.0 obr: true javadoc: true bom: true @@ -455,7 +455,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosrseapi.manager - version: 0.25.0 + version: 0.31.0 obr: true javadoc: true bom: true @@ -464,7 +464,7 @@ managers: codecoverage: true - artifact: dev.galasa.zossecurity.manager - version: 0.29.0 + version: 0.31.0 obr: true javadoc: true bom: true @@ -489,7 +489,7 @@ managers: codecoverage: true - artifact: dev.galasa.zos3270.common - version: 0.28.0 + version: 0.31.0 obr: true bom: true mvp: true @@ -497,7 +497,7 @@ managers: codecoverage: true - artifact: dev.galasa.zos3270.manager - version: 0.28.0 + version: 0.31.0 obr: true javadoc: true bom: true From 4a159e89282331ccd622497bf0abc929fdeac929 Mon Sep 17 00:00:00 2001 From: Will Yates Date: Tue, 16 Jan 2024 15:41:25 +0000 Subject: [PATCH 153/263] add backtab to gherkin support (#899) Signed-off-by: Will Yates --- .../zos3270/internal/gherkin/Gherkin3270PressBasicKeys.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270PressBasicKeys.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270PressBasicKeys.java index 58f57905f..55d719212 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270PressBasicKeys.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270PressBasicKeys.java @@ -27,7 +27,7 @@ public Gherkin3270PressBasicKeys(Gherkin3270Coordinator gerkinCoordinator, Zos32 this.gerkinCoordinator = gerkinCoordinator; } - @ExecutionMethod(keyword = GherkinKeyword.AND, regex = "press terminal( \\w+)? key (TAB|ENTER|CLEAR)") + @ExecutionMethod(keyword = GherkinKeyword.AND, regex = "press terminal( \\w+)? key (TAB|BACKTAB|ENTER|CLEAR)") public void pressBasicKey(IGherkinExecutable executable, Map testVariables) throws Zos3270ManagerException, Zos3270Exception, TextNotFoundException, TerminalInterruptedException { List groups = executable.getRegexGroups(); @@ -43,6 +43,9 @@ public void pressBasicKey(IGherkinExecutable executable, Map test case "TAB": terminal.tab(); break; + case "BACKTAB": + terminal.backTab(); + break; case "ENTER": terminal.enter(); break; From b7060de871a22420391ca77577836ba95efc13cc Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Fri, 26 Jan 2024 11:35:59 +0000 Subject: [PATCH 154/263] bumped version to 0.32.0 Signed-off-by: Savvas Kyriacou --- galasa-managers-parent/build.gradle | 4 ++-- .../buildSrc/src/main/groovy/galasa.manager.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index 0d7364ee0..95eb643d5 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -9,7 +9,7 @@ plugins { // It is used as the version number of the managers bundle, which contains a yaml // file which is in a release.yaml, but published to maven, so that the OBR build // can pick it up later. -version = "0.31.0" +version = "0.32.0" // A configuration to publish the merge exec into configurations { @@ -192,7 +192,7 @@ publishing { name = "Manifest for managers bundle versions" artifactId = "dev.galasa.managers.manifest" groupId = 'dev.galasa' - version = "0.31.0" + version = "0.32.0" description = "Conveys bundle version information to OBR builds." licenses { license { diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle index 2d0b02526..1b6352821 100644 --- a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle +++ b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle @@ -6,7 +6,7 @@ plugins { dependencies { api 'dev.galasa:dev.galasa:0.21.0' - implementation 'dev.galasa:dev.galasa.framework:0.31.0' + implementation 'dev.galasa:dev.galasa.framework:0.32.0' implementation 'commons-logging:commons-logging:1.2' implementation 'org.osgi:org.osgi.core:6.0.0' implementation 'org.osgi:org.osgi.service.component.annotations:1.3.0' From 455173a50812f4bb575a0c6c58c9c197caa750e5 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Fri, 26 Jan 2024 15:30:56 +0000 Subject: [PATCH 155/263] Upgrading httpd image version from 2.4.29 to 2.4.58 to remove Critical vulnerabilities Signed-off-by: Jade Carino --- .../galasa-uber-javadoc/src/main/resources/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-uber-javadoc/src/main/resources/Dockerfile b/galasa-managers-parent/galasa-uber-javadoc/src/main/resources/Dockerfile index dc2a053a8..fbedbd81e 100644 --- a/galasa-managers-parent/galasa-uber-javadoc/src/main/resources/Dockerfile +++ b/galasa-managers-parent/galasa-uber-javadoc/src/main/resources/Dockerfile @@ -1,4 +1,4 @@ -FROM httpd:2.4.29 +FROM httpd:2.4.58 RUN rm -v /usr/local/apache2/htdocs/* From e478310d06b83c5716e1cdbce304d5e01882b587 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Fri, 26 Jan 2024 17:40:41 +0000 Subject: [PATCH 156/263] Remove unused Dockerfile and associated script that contains an openjdk vulnerability Signed-off-by: Jade Carino --- .../resources/Dockerfile | 34 ------------------- .../resources/entrypoint.sh | 12 ------- 2 files changed, 46 deletions(-) delete mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/resources/Dockerfile delete mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/resources/entrypoint.sh diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/resources/Dockerfile b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/resources/Dockerfile deleted file mode 100644 index 4e0d3762c..000000000 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/resources/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -FROM openjdk:8-jdk-alpine3.9 -LABEL maintainer="lukas.marivoet@ibm.com" -ENV MIRROR https://downloads.apache.org/jmeter/binaries -ENV JMETER_VERSION 5.2.1 -ENV JMETER_HOME /opt/apache-jmeter-${JMETER_VERSION} -ENV JMETER_BIN ${JMETER_HOME}/bin -ENV ALPN_VERSION 8.1.13.v20181017 -ENV PATH ${JMETER_BIN}:$PATH -COPY entrypoint.sh /usr/local/bin/ -RUN chmod +x /usr/local/bin/entrypoint.sh \ - && apk add --no-cache \ - curl \ - fontconfig \ - net-tools \ - shadow \ - su-exec \ - tcpdump \ - ttf-dejavu \ - && cd /tmp/ \ - && curl --location --silent --show-error --output apache-jmeter-${JMETER_VERSION}.tgz ${MIRROR}/apache-jmeter-${JMETER_VERSION}.tgz \ - && curl --location --silent --show-error --output apache-jmeter-${JMETER_VERSION}.tgz.sha512 ${MIRROR}/apache-jmeter-${JMETER_VERSION}.tgz.sha512 \ - && sha512sum -c apache-jmeter-${JMETER_VERSION}.tgz.sha512 \ - && mkdir -p /opt/ \ - && tar x -z -f apache-jmeter-${JMETER_VERSION}.tgz -C /opt \ - && rm -R -f apache* \ - && sed -i '/RUN_IN_DOCKER/s/^# //g' ${JMETER_BIN}/jmeter \ - && sed -i '/PrintGCDetails/s/^# /: "${/g' ${JMETER_BIN}/jmeter && sed -i '/PrintGCDetails/s/$/}"/g' ${JMETER_BIN}/jmeter \ - && chmod +x ${JMETER_HOME}/bin/*.sh \ - && jmeter --version \ - && curl --location --silent --show-error --output /opt/alpn-boot-${ALPN_VERSION}.jar https://repo1.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/${ALPN_VERSION}/alpn-boot-${ALPN_VERSION}.jar \ - && rm -rf /tmp/* -ENV JVM_ARGS -Xbootclasspath/p:/opt/alpn-boot-${ALPN_VERSION}.jar -WORKDIR /jmeter -ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/resources/entrypoint.sh b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/resources/entrypoint.sh deleted file mode 100644 index f9f837d81..000000000 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/resources/entrypoint.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/ash - -# -# Copyright contributors to the Galasa project -# -# SPDX-License-Identifier: EPL-2.0 -# -mkdir /var/mail -groupadd --non-unique --gid ${JMETER_GROUP_ID:-1000} jmeter -useradd --non-unique --uid ${JMETER_USER_ID:-1000} --no-log-init --create-home --gid jmeter jmeter -chown jmeter:jmeter /jmeter -tail -f /dev/null From ec8269632c1df03e4bbfc3e3a39df53231342091 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Mon, 29 Jan 2024 10:08:58 +0000 Subject: [PATCH 157/263] Remove PNG image rendering from the 3270 manager Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../dev.galasa.zos3270.common/bnd.bnd | 1 - .../images/TerminalImageException.java | 30 - .../images/TerminalImageTransform.java | 157 ---- .../images/TerminalImageExceptionTest.java | 27 - .../images/TerminalImageTransformTest.java | 709 ------------------ .../src/test/resources/README.md | 14 - .../src/test/resources/linux/README.md | 7 - .../mac/testConfidentialTextIsRedacted.png | Bin 5905 -> 0 bytes ...erentColumnsAndRowsRendersInStatusArea.png | Bin 5206 -> 0 bytes .../mac/testEmptyTerminalImageRendersOk.png | Bin 4387 -> 0 bytes ...tInboundTrueRendersInboundInStatusArea.png | Bin 5340 -> 0 bytes .../testOutboundRendersAidInStatusArea.png | Bin 6158 -> 0 bytes .../mac/testTextAOnAllRowsRendersOk.png | Bin 8493 -> 0 bytes .../testTextAtBottomRightFieldRendersOk.png | Bin 5819 -> 0 bytes .../mac/testTextAtOriginFieldRendersOk.png | Bin 5776 -> 0 bytes .../resources/mac/testTextFieldRendersOk.png | Bin 4943 -> 0 bytes .../mac/testTextFullRowFieldRendersOk.png | Bin 7320 -> 0 bytes .../src/test/resources/windows/README.md | 7 - .../internal/properties/TerminalOutput.java | 32 - .../zos3270/spi/Zos3270TerminalImpl.java | 91 +-- 20 files changed, 12 insertions(+), 1063 deletions(-) delete mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageException.java delete mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransform.java delete mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageExceptionTest.java delete mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java delete mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/README.md delete mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/linux/README.md delete mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testConfidentialTextIsRedacted.png delete mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testDifferentColumnsAndRowsRendersInStatusArea.png delete mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testEmptyTerminalImageRendersOk.png delete mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testInboundTrueRendersInboundInStatusArea.png delete mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testOutboundRendersAidInStatusArea.png delete mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testTextAOnAllRowsRendersOk.png delete mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testTextAtBottomRightFieldRendersOk.png delete mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testTextAtOriginFieldRendersOk.png delete mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testTextFieldRendersOk.png delete mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testTextFullRowFieldRendersOk.png delete mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/windows/README.md delete mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/TerminalOutput.java diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/bnd.bnd b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/bnd.bnd index a2ec37f4f..7f272676c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/bnd.bnd @@ -1,7 +1,6 @@ -snapshot: ${tstamp} Bundle-Name: Galasa zOS 3270 Terminal Manager - Common Packages Export-Package: dev.galasa.zos3270.common.screens,\ - dev.galasa.zos3270.common.screens.images,\ dev.galasa.zos3270.common.screens.json Import-Package: javax.validation.constraints;resolution:=optional,\ javax.imageio,\ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageException.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageException.java deleted file mode 100644 index a82febc53..000000000 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageException.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.zos3270.common.screens.images; - -public class TerminalImageException extends Exception { - - private static final long serialVersionUID = 1L; - - public TerminalImageException() { - } - - public TerminalImageException(String message) { - super(message); - } - - public TerminalImageException(Throwable cause) { - super(cause); - } - - public TerminalImageException(String message, Throwable cause) { - super(message, cause); - } - - public TerminalImageException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { - super(message, cause, enableSuppression, writableStackTrace); - } -} \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransform.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransform.java deleted file mode 100644 index ddb584ac1..000000000 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransform.java +++ /dev/null @@ -1,157 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.zos3270.common.screens.images; - -import java.awt.Color; -import java.awt.Font; -import java.awt.FontMetrics; -import java.awt.Graphics2D; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.io.OutputStream; - -import javax.imageio.ImageIO; - -import dev.galasa.framework.spi.IConfidentialTextService; -import dev.galasa.zos3270.common.screens.FieldContents; -import dev.galasa.zos3270.common.screens.TerminalField; -import dev.galasa.zos3270.common.screens.TerminalImage; -import dev.galasa.zos3270.common.screens.TerminalSize; - -public class TerminalImageTransform { - - private TerminalSize terminalSize ; - private int targetRowCount ; - private int targetColumnCount; - - private int imageWidthPixels ; - private int imageHeightPixels ; - - private BufferedImage image ; - private Graphics2D graphics ; - - private int fontHeight ; - private int fontWidth ; - - IConfidentialTextService confidentialTextService ; - - public TerminalImageTransform(TerminalSize terminalSize , IConfidentialTextService confidentialTextService ) throws TerminalImageException { - - this.confidentialTextService = confidentialTextService; - - this.terminalSize = terminalSize; - this.targetRowCount = terminalSize.getRows() + 2; - this.targetColumnCount = terminalSize.getColumns(); - - // 7 and 13 represent the dimensions of the default monospaced font on MacOS - // Ideally, these values would be retrieved from the font metrics but that requires a - // Graphics object to be created, which in turn requires the image to be created - - // We plan to improve this in the future - this.imageWidthPixels = targetColumnCount * 7; - this.imageHeightPixels = targetRowCount * 13; - - this.image = new BufferedImage(imageWidthPixels, imageHeightPixels, BufferedImage.TYPE_INT_ARGB); - this.graphics = image.createGraphics(); - - // Ensures the font family is monospaced so that the images appear as expected - // If the font family is not monospaced, the font defaults to "Dialog", which skews images - Font font = new Font(Font.MONOSPACED, Font.PLAIN, 10); - if (!font.getFamily().equals(Font.MONOSPACED)) { - throw new TerminalImageException("Unable to set Monospaced font"); - } - graphics.setFont(font); - - // Collect the font dimensions - FontMetrics fontMetrics = graphics.getFontMetrics(); - this.fontHeight = fontMetrics.getHeight(); - this.fontWidth = fontMetrics.getMaxAdvance(); - - graphics.setPaint(Color.black); - graphics.fillRect(0, 0, imageWidthPixels, imageHeightPixels); - graphics.setPaint(Color.green); - } - - private void clearImage() { - graphics.clearRect(0, 0, imageWidthPixels, imageHeightPixels); - } - - public void writeImage( TerminalImage sourceTerminalImage , String outputFormat , OutputStream outStream) throws IOException { - clearImage(); - renderTerminalImage(sourceTerminalImage); - ImageIO.write(image, outputFormat, outStream); - outStream.flush(); - } - - private void renderTerminalImage(TerminalImage sourceTerminalImage) { - - for (TerminalField field : sourceTerminalImage.getFields()) { - StringBuilder sb = new StringBuilder(); - for (FieldContents contents : field.getContents()) { - // Origin of each character glyph is bottom right of the character. - int col = (field.getColumn() ); - // Add one to the rows, so that the row so that row 0 of the input - // displays at row1... - int row = (field.getRow() + 1); - - // Converting FieldContents to Strings - for (Character c : contents.getChars()) { - if (c == null) { - sb.append(" "); - } else { - sb.append(c); - } - } - - // Apply the filter to confidential text if it matches, and such filtering is enabled. - String fieldText = sb.toString(); - - if (confidentialTextService != null) { - fieldText = confidentialTextService.removeConfidentialText(fieldText); - } - - for (Character c : fieldText.toCharArray()) { - if (col > targetColumnCount) { - col = 1; - row++; - if (row > targetRowCount) { - row = 1; - } - } - graphics.drawString(Character.toString(c), col * fontWidth, row * fontHeight); - col++; - } - } - } - - String terminalStatusRow = writeTerminalStatusRow(sourceTerminalImage, terminalSize.getColumns(), terminalSize.getRows()); - graphics.drawString(terminalStatusRow, 0 * fontWidth, (terminalSize.getRows() + 1) * fontHeight); - - } - - private String writeTerminalStatusRow(TerminalImage terminalImage, int cols, int rows) { - - StringBuilder sb = new StringBuilder(); - - if (terminalImage.getId() != null) { - sb.append(terminalImage.getId()); - sb.append(" - "); - } - - sb.append(Integer.toString(cols)); - sb.append("x"); - sb.append(Integer.toString(rows)); - sb.append(" - "); - - if (terminalImage.isInbound()) { - sb.append("Inbound "); - } else { - sb.append("Outbound - "); - sb.append(terminalImage.getAid()); - } - - return sb.toString(); - } -} \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageExceptionTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageExceptionTest.java deleted file mode 100644 index 4a4dbbb72..000000000 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageExceptionTest.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.zos3270.common.screens.images; - - -import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; - - -public class TerminalImageExceptionTest { - - @Test - public void testCanCreateTerminalImageExceptionOk() throws Exception { - TerminalImageException ex = new TerminalImageException(); - assertThat(ex).isNotNull(); - } - - @Test - public void testCanCreateTerminalImageExceptionWithMessageOk() throws Exception { - TerminalImageException ex = new TerminalImageException("a message"); - assertThat(ex).isNotNull().hasMessageContaining("a message"); - } - -} diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java deleted file mode 100644 index 7055e6822..000000000 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/java/dev/galasa/zos3270/common/screens/images/TerminalImageTransformTest.java +++ /dev/null @@ -1,709 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.zos3270.common.screens.images; - - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.fail; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.file.Files; -import java.nio.file.StandardOpenOption; -import java.util.*; - -import org.junit.rules.TestName; -import org.junit.Rule; -import org.junit.Test; - -import dev.galasa.framework.spi.IConfidentialTextService; -import dev.galasa.zos3270.common.screens.FieldContents; -import dev.galasa.zos3270.common.screens.TerminalField; -import dev.galasa.zos3270.common.screens.TerminalImage; -import dev.galasa.zos3270.common.screens.TerminalSize; - -public class TerminalImageTransformTest { - - @Rule - public TestName testName = new TestName(); - - public static class MockConfidentialTextService implements IConfidentialTextService { - - private List substitutions = new ArrayList(); - - private class Substitution { - String confidentialString; - String comment ; - - Substitution(String confidentialString, String comment) { - this.confidentialString = confidentialString ; - this.comment = comment; - } - } - - @Override - public void registerText(String confidentialString, String comment) { - substitutions.add( new Substitution(confidentialString, comment)); - } - - @Override - public String removeConfidentialText(String text) { - String result = text ; - for( Substitution substitution : substitutions) { - result = result.replaceAll( substitution.confidentialString , substitution.comment); - } - return result; - } - - @Override - public void shutdown() { - throw new UnsupportedOperationException("Unimplemented method 'shutdown'"); - } - } - - // I'm guessing what the colors are, as we've not implemented colours yet. - Character GREEN = new Character('g'); - Character BLACK = new Character('k'); - Character WHITE = new Character('w'); - - - - //---------------------------------------------------- - // Utility functions - //---------------------------------------------------- - private void checkTerminalImageAgainstExpected(TerminalImageTransform transform, TerminalImage image) throws Exception { - - ByteArrayOutputStream buff = new ByteArrayOutputStream(); - transform.writeImage(image, "png", buff); - - byte[] contentsRendered = buff.toByteArray(); - - assertThat(contentsRendered).isNotEmpty(); - - String testFileToCompareAgainst = testName.getMethodName()+".png"; - - String imageFolderName = getImageFolderName(); - if ( imageFolderName == null ) { - System.out.println("The operating system you are running on doesn't have the same fonts installed"+ - " as when the test data images were recorded and checked for correctness."+ - " As a result, this test cannot check the expected vs actual images rendered." - ); - } else { - assertFileContentsSame( contentsRendered , testFileToCompareAgainst , imageFolderName ); - } - } - - private String getImageFolderName() { - String folderName = null; - - String osName = System.getProperty("os.name"); - - // We have mac images captured and stored waiting to be compared against. - if (osName == "Mac OS X") { - folderName = "mac"; - } - - // Other operating systems have different fonts, so the rendered images look different. - - return folderName ; - } - - private void assertFileContentsSame( - byte[] contentsRendered, - String testFileToCompareAgainst, - String imageFolderName - ) throws IOException { - - boolean isCheckedAgainstTestFile = false ; - try ( InputStream testImageToCompare = this.getClass().getClassLoader().getResourceAsStream(imageFolderName+"/"+testFileToCompareAgainst) - ) { - if (testImageToCompare == null) { - String tempFilePath = writeTempFile(testFileToCompareAgainst,contentsRendered); - System.out.println("Testcase logic info: Tried to open file "+testFileToCompareAgainst+ - " using this.getClass().getClassLoader().getResourceAsStream(...) but it was missing. "+ - "... was hoping to compare it to image\n"+tempFilePath); - } else { - System.out.println("Testcase logic info: Opened file "+testFileToCompareAgainst+ - " using this.getClass().getClassLoader().getResourceAsStream(...)"); - isCheckedAgainstTestFile = true ; - assertInputStreamContentsSame(testImageToCompare, contentsRendered, testFileToCompareAgainst); - } - } - - - if (!isCheckedAgainstTestFile) { - fail("Testcase logic failure. Could not open test data file "+testFileToCompareAgainst+" so we could use it to compare with what was generated"); - } - } - - private void assertInputStreamContentsSame( InputStream testImageToCompare , byte[] contentsRendered, String testFileToCompareAgainst) throws IOException { - - byte[] goodFileContents = testImageToCompare.readAllBytes(); - - System.out.println("rendered image is "+Integer.toString(contentsRendered.length)+" bytes long"); - System.out.println("expected image is "+Integer.toString(goodFileContents.length)+" bytes long"); - - boolean isSame = true ; - - if (contentsRendered.length != goodFileContents.length ) { - String tempFilePath = writeTempFile(testFileToCompareAgainst,contentsRendered); - fail("rendered image is different size to expected."+ - " ... image from the renderer is here:\n"+tempFilePath+ - " rendered image is "+Integer.toString(contentsRendered.length)+" bytes long"+ - " whereas expected image is "+Integer.toString(goodFileContents.length)+" bytes long" - ); - } - - for( int i=0; isSame && is!+4+NGKq-A!fbc#701r*SgNG`E_fRwhgbB`3?u)Y44NkW>&6k(sHTCl0UW zu|jt;rKN^PNC|0Du`(sHz(AlRMMEGY{fQ`So4Mxw1K$09oUhOIe7K*r*1hg^KLv-w zV5?WIUkL(%R`36D-%lXW@*N=1vJ2*4EuFkPdMOtKvKijLZ%;&4jA{h)-231Ov$uPG z%m0^aVNJ~sagl4k;eRwcF!lRzNU!wpIwJHEJN}D(&0I@^Q{noQxIV|P3(alzk!yx` zH^uLv`nTRd@}w-o!!aBWvo%tBN&(>^F^PufQ&SmXDUFL3phqT;Eg(?c_Af!8*SA5S ze|LTZ0!5TB2mSnEsj$P*OI6-GxD2!#{r9E6A^2}qkO(j&Dxc{9rb^8$j^!#b$j;)} zQe{V%uOpIKOjqpUdH5f!RG_UBu9#sgRMMn)(Mv3SCnK7d0=T74&S;nQeg&9)7bnkc~SBTvg|>I1`S(p@xrYrHwB49MDle#vExiNYu70g4&T& zVMBW5jy4TLgV!Z&FUOw+@+3hh8Tv{x{l#J~aG*#(`p-wLo#I0>CkeX=7Y-&pX?dQ9 zk_ow8oHoOU-ZpoY@vfmXS>NjIRxRRYa*gy_gsS_en?LyX~LxOLA1X`?K4OV#xbn41G7!SHoWcyoRreD z?Nc#k6m&Ayx05n^(=|i0f!Zr*$DsydQA^Ogo!`Ig zU4JKiqUr@c5nOs9hms5=(bBP{lZNUx?RG*m_vAwhGKYec7i@MlM8+N>Fx3JHm=XS_ zxBe3LB(U|AruG^53B7Sa`AcOERM($gQcvvv;B;@v| zpSMtW1Q|O7;159(laKGcAY+SWmH)%WS1hK0NeVv;{#=ho)VZ|#HO&jZPU1vOK`=oJ@p|$JD9^Si&3AM-m+0_*=jd9HS2^i*HOk zXU~k{hCe(yHSQ;7QOIfzExDOM5OR$nCkU^&9=`2eO&BL?dc?SNmtRq13NUe9-fDnlpTGmuyv_cSj_JvqFRLo3A)m&ZRWvY@P(nXFeZXSn{y;?j3 zhX10=hv&PrR3m7fobF9Q*Jpq8t|E3dlEQ{v+EQqC7RmC0j4Hr~g^9_b6asWn-FM~6 zY?(L1JrLGw)TpLb9~?FW^hpEV%2{G)?)zxb#1aYwjnYfCi98tW^|ARrHo^`1Q_aqn zQ@P5D5V;M_64~^OcXGUnt-Ba8&TmKY*E~osUo1udLkJ=_SKy^e z!s}Y10R9$Of|^R}_w5{a_gj5GW~Dj*mx9`6yY;4D)hk4GhsP(i0j_QIWUMb99&uIc zHB&eQ*c~Igh~{!k-c{2zqlNmKmxR3D77vlG0I{kzD1M3aA_Va(UAc?4$C#gdGNQr5 za|aJxI@)b3i_eY_^v_(jQ03;#Z=l0Q_b)Uoz4AP=&r@a4?%C`03k?bCzsRJ&UR1@2bT<71H7l$Dz9(w}or!XCkPu))flVak zx8s!(?DeHqS)$Wn*U=?9JL_mE#+sqGWyQ-M-(B-uC8|3+3V_0&Hk8XOb-l3=DwpDE zY9R?%cx}*+%$by)_c`LSR@M{5bp;^h-zU;|tW=XDSi@UHr_oQAJ6Y z<37oy640_j7+|AY9i3D(?q`0>yeMo*R7SweR=e9vcPs$O>r8;Xj* z{@p~NC}T|a*fvo>|%qK|Zs=IC(L_maZate;scRH(eCTMNgW9xSEWdOwPy z8B?tudqncY&+*l3l1KH3Qk_8Jgm#}Y-X;~EW{;d;!+{ZXJqzbPEu4&L@-R)o#bd5j zjf*R51*}h7B=Agl%vs(<3}bqVl)yXBreY8s3z4$psk0l0Ag0%g$AECKZbQdCdCs#0 zA#3a(lGxCy2Ty`-;hw&~=2I4xU6iaRsEiGU;odfk%E&O}d8;WiE#)&i-ph|4WE86OD&lUM!A(aueWVKI>^h6^~HA~fji)S>T4l}B6@;+%{Axw zRYx=8Mnv?B=h-O~gby7gPu7*PT-uwFT79W^nSXtwis%_ng;xgB%TLU|P}_=) z21da0X2m_SZcBNzMx;cW-mp_K6!mS@$v$_#QHu|b0;tP5_SDN8?fgly^8E_&#H#1C zZM+YTyYO8+ZcF((@q!a#Bqe;7!{pna;4vA2Mt6!sMN=0XKK5w!$9yA2fzsNR!g9LA zULJP>IJg)VwsxbdB0= zTRf*(%<%CbruNnPYNs8chF9JUg>9{-_0KHsE!Y`Jj54${rR+sf6w)h#^NM>!6N{~Wy%KLAx2=F&L@Nh+%*PafwscRVEh`ffim{v zE5RZw(kNZDzCR67H)4?f3JngJj9D{cK9o0eEiz(+AcXdAC_TO^jidG2=Gw+gp%tGr z8RMe|{o6e*cg3WYIIT`BG0hGs>fXk(NC!SSi;u^a*y;xR@o=!Uwxwa1jBCFUv;|6A zOEdGhY~mwI?5*X}TW%+kxImhguQGAH*K2){@on))gL{iqIhMkb zP2@I4E8nsc!On$zEcuE@V4wNHL;im5@47pKlH^%^N?OvKe9jmOYy<0JxwYt^mO01O zbBS$fR9Ig6Ab~@Qe5eCvw3K*9LiH=C*>;AHBb2O`HBJL+dVL@Tr<8~X^#&=vvwVfm z<4z$vl zS6-C-@oqc1Lk?|KkwC_0*Zqn~&p?c};l!Icf3%#Kx*oyQPd`Q>O z$TV$IN-Rmh&d4roeAk`MLA6pqK1P z_#8_5=p1(Ax~MPS3$`x9CFoNcV9rUr-F>gs};Ne33}ixL>mu!q6c=m=xK zzUEBf8I>OAb;kl(yS1z}^K{KdqjoZ5Vf<0pw4qzZeQ{s|H}Sodk-@i}JRVZX+f|4kI$p3$H9__|ODL zox0SDj{6#j;5WzdQ0n##XiGVj&LA*E3J@Z^W`5}0%5(EGF_HrAspj|(=ACiG5A z5DR6eI|j2li8H;2F&8u=>+-|)ptg_R^>rQY_<RC?z6#;|w$&_~cC<$PmrJ6U!Yc zDjZiw6T_Bv3cCLeoLH|#c;##NZJ>5%tu(&x^;D`J9t3lO3f3IR=M`(HeRiAY^phF+ zs7*iE<;j=FevZ%W^|KHY^l3C6iG5D!H UPfK0;>IUr(3EOvn@9AIv0}zZ1Jpcdz diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testDifferentColumnsAndRowsRendersInStatusArea.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testDifferentColumnsAndRowsRendersInStatusArea.png deleted file mode 100644 index 5e1accfa2a59e25dbc9d6d67d65afe1d30ad2757..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5206 zcmeI0YgiIkx5sgu(RnMiGgCTgXzw&9bxNJQr=fMcl@*3Jv=o~$CB~;> zG*hHN6H_rYyrVWoW+YxfNbnY37(sAQkp$7h%sJ=l`FOsZcYoN=e%7-;to3`=TKm6O z?nSVV-Y(-^002Pm>={pg06>eWIZu79quFg)4~_!>`+#RXPY0&LB>c1wjzO7kWrST{ zTl{(`@8}`xYp?vN2_OHw{XChJy*JF)irf(FWyLc#*-Z)IpV{w$a2Roab#APrB)Biw z>-1L+-&>O**D@h*zVh0eeE3Q_rK0TQTE$GqB2EfVOUs?<-uwX>0gsm2*}<7*c8WD` z&n+_mAf#oV#ub~d0D!)8S^&VG8W#cG|1$lbk|>}1Q*f59U3%>D)l$KIe1;D)Nj3s@ z<8`%1nnwh-P8g1Vi)bT<&%k)rH@y5`o`3~sJax_-Z1$2~&gd#$xwhT?xedJiP{0%T z(77cR<;bhD4#E2)z2}m}Z*Jk^!$BDP6&v)*d|o}KOCG|eB-+Fq^?h&o@nqwkncNSL zhB`c&;N~-8j%AlIRYz_${%BpqJ5C75s7w8D@i};Qj$S~=h4BcqrM z5@#*)LeG6{<)z8M4C3d&tgB=r(1RSg?-vZ^^y!Ka4Kq^G0QL3#@)Mm1*EYPUHXFUQRV{cqDD*;=&GD#+ zE~GGy6u-AGI9JKWotFI?qE5f3Q&qape1GDx%J6Q4|Mt3Iihi5K1@euw%#@BQLB z&iqm$sL0CA{@BVv>Kss)S+n2W+ReG1^jhfPF@dc`Zbh-(-;I9o?}ZmOUKPIgy!kZx z!V?fxJ9}LRjN;7Iy@q=NAEPQHt&EZLinZclf@S5&V~D+^2yW^4D-Cc)9BNRe0kG9X+)>i`p$x&LwYp-MhSb+hQn;TjfS;X^gc`#( zPa9H^rn_sjAGpNPcn5W>rtUIw;@5Y{Ozyi{HIVcpTE3upha<|??vopv6LOVC1@sMC9 zFS@br*Rm)y*c^pKXp0mV@NM57;m7?3GlDs!N`By8aRGk0u6r4Az*(q?gd3c7k~B90 zAjXYSQT##v?X9D9%rDiIh+4+M|E@<(z|KkA;vckMf;=<7;1)N+)bsln0|@h1R)y6RbIUZp@ju%9+l1pvJJ*NgZ6@9mF^=-OAb zJl~updm~6dd`LW+Zs>|x<$R(S-_=FGM+X*Jqb2igMy|fEs~Sm+$_(IPnp10hhe^cJ~BMZe}*Sqi38q_n`l7<9>Gw+&8Ezac$+;P+7KM9Xt`Nx|$qg9x*S5=qhJ&vB1RKPP1?> zdaB^#3w4n^aZS!Mj|J6iNa~&B96=Y|ATQA|iiUQ8Pss7|*4vULOFETaM4X1_T^GI+ zAnA{am#v$W#;}hQ2_&#(!olv^fN2&ig6p2}Xs9QG!=Mg(2_seGSs@n(dJovOqup&R zwp~R5tOh7?Ag)GJY;$kmmmFILtgeB#6FhlFl!DS5{;q_-T6>dJiJAISnGqK-jesIc z!h7L|B|oPtuP1N4+4r`|l5YbCBHs9#JZ8aW zytL`j{JW~CP^5%aU__Dx@5~Y1a+e4_fs7aJyMoZDCaYkB;Mi9Y1=ysO@_IhMNC!OB z{HhQJT^dvk_6tjWriKS{hMQ+zN-jVMKT@|$>^8$dMHbt&&gP;E#LyR)BO0^hfiGUG zm1Ms>OW*Pqi5O4;kKI@39@^FAo>Etq)4>WKsGR=RE~97 z6DKCq=vjNj7UlfmT6$4l9?5jTISH3y!M$1J@&(Os3D^iDWY&I+w=lxnpi+(Zq{}P# zJGNZL_>9CS%ynrTx!x*}6c1C}2KH>G@SCh@=<32xa}c;?Clp4zlF7v_ie?Z70;b1G zcLz41ghp&N*Nc6!VDsL<#`>-c;BE=(WNaSx@Y7bdeno7g!5y9rb*2|GY-wGdu^lK& z|I}F8)nn{Dt{e6pbwyP-*ec1a`5>90`XwtE(MjsZOnQVLCqQ)~Ed(uTae}=I=FFHF z^2~v#l$j#lA(U+0cmB0U8Tj`|()3A*Y7yYnW7iY!@=j5E zTw$nvMMb=r0w5RO&qXHeFv4u0S#4&Sm_~d%wvd<28iyB=<(nxo!Mk1zRpMJ|Otpj7 zP_*J)0%Euri4TLaP1`s`Tl)z!y(sE{V1ad7rzNxL^s?R8N9+A>s#Ay0E4U`kL2%SO zcb`oxXT}20->Jyp+>o0e&!Sb)dR%IhiU;HtD6q|xGnFaaSmD)lMeycAZMa1--jv(c z;kpe9_omf=QUrk}`=w62qPJV}73)G3Wa}pVHqr4VcTW^{tou-`SIx>?x++GOX)qwF z$yEGE1Re@^gZe#+Nn-sY;#H4vN%TEe193RyWL$H2df4z?Y!hDzgk<1WH|?5i`%9v9 zz*EQmNB@P)jJIIIQTlr++&)sMcgA*a%QO&RQ?#nV>$YVjAsslOHy+=qV*Zt) znBIJTTM5X3Viqv52~k}KO%`M>g{dB*yF*&H%i$r{Y#!_Apni#cO6oF*ihYX3_OyTg z{c8C%j+Y%^{zscRf&cCCSlu(F!{Y%?w1kbNjf70@?Au{Ua*SiONox0|w-P+m`gT~< zUHBw})3?bSgo8k$MKkwAjp_{WdyNIIDFtN^*V+#31|`q<>Go3Ydd|6Ox^hHbiz)-uU06 znmR$RB);5pb|>|GUywF7e=C!Rt46OkZc{+ydW`90+U3Au&Nc*oK0qO^cXF{6HRTh= zPnfzFBhm=unNap)4W!*xFNEGP zvt1`*%ONHKz0Z(K*W;0Y>+zWjm;d#y-LK)bf~*FmZYT{sT_tp@<-Mtr=Kf_nDsmyqWZ-QE?flW9IO`WIP2CB~kb1D<41`Zr^{SH`ExJGN=D?sOA zZ`Qr8u)iw0L0xI|%nW+If_HRAeL3JApG2vYcK&fT(2qQ)9Pr8XN2x|vBRu0PMAuTL z*n5le#QDS5)ix@@Kg_>pF zc8Q|7u`!hnp*}ox^~ST%+Mc!d0+S}J1~`<1aHnVzxP492Ra?oG<)7xs+J(|4JHz=- zsC5BvLi8+nAVqKyjbn$FZ>x`qvQREAqCWHmHZtw^m(pk@gDmj?m(SD04ka4m+P4aW zgrV`5_=Vz56{RhU>qcFcmJZD-o0_&jP1tBRuG>^<(<8aU|K3uJS3&YteT{KcR|yDni=UO)u3k~%IZid`E?A(*sWQlXMXMMXg*1mW78`|W3skIu=P;r!S4WocYOhXcak^RZd8W8|A`6!Y@0iDaR0IM@e7k@M0;Z5 zY?m(oZQGVzn<_SqGP*17=1{)P@qe;wcg3Y2fLomC!Qt2&PVa2_@`s$;Ge9h_Nnjhb z?UN4<-j6N35f%RN{H1HU)2s6N0BcFM1gXmA(q0t9_@(0#QC&$iIdSB+ziATEe;y9# z^(^@i0LYAd7jR+mFaYpp+-3lv)AJp`SA?Aaz)Zt?0Kils0PsuK+e2?9cuT=sBfQOm z|Km7(;nL3G34*B%1BdcLp7N!#`?vFr10a}IUAV^Y+fCM_!6y)_&w*-ltKEpPyes+i z4cKj7e=zlfwz&nDXq28O_7NtOp;TjCXhZsoW{?LpF})V5qo~uRr?t(6d9o<^3dq)Og=QLzlyhxs}B2P~rpmA57F# zl!3JHY~l;GdU1!?lo8u+%xI`ruNkT3zPmL3Y2xSGf!#_B<5()`Nwp9!$_w& zi1-g-n=8z?*teoi_9Aqr!nnF%YJ-oH-j-^Utpn)8XoCT!v^cPBl1Zlc_|3qKWkR*>Qs%0=c~h3T`Zh zpcXtN%hrAthh(LSOhg`r4C}>#GQi13UOTFG(0Tnemsa zE(({{rCPF}E7>6P;QK54vy(2g4d&FZVS4aALFctAmH3QUxC69%HLb&Tb3>QyBnO2$n3WWb1=_MxCg-8sA}y_Kl*1`p7um$6NdKY~ z3i24iL~-|9r&+jOZgj#f(}JBYeVW99z;3H$v^rrl!j~4PjNDh?Y=NPBl0<#WD5%o; zE2OH1!5;USm6sjC3JuCRU7ETXcC6@3Pd)bHvduLtS@S)J@G=3AG6O9zm z`Z^TMnNm787X!-Rj?0qw>X4bDN(?SYX}k7%fS|GM*tqwcQ?Jc%G4@FD+5xPz-S0iJ zKHn}Z9#kE1YjjJ}zUKKis+KM!u6Q&acBMuspJo~6P{tAC>SZPe85ZJH;R6q=wPB)< z48|k;9cBZ-`~ao+$|EWRw$Pq!|$`j*)}k2k8yQR-># zaq`5}ghZi};ya6Nif4VBdiGaC28Ja*N2x>+X6-~4s~EgK`AY^i+UlARCmy;u5FyI8 zU-VU8*$3l?9PP={Zf0s6Gl0tK=|OclFUB&~w{qOLtiz_>9eT6}^WX*^sC=515bwmF zep1oB9;;LZ_bm3x30sBdiczJ!;ZtjUU>VF<2tl=ayTh9ZHj{I`^9z#WMtdh+S|WAz z3sC8Qltlc@M=8TE-s0d5MX~^Co}-TX`H{Z-0(QhiTw7CvbqpaJnz1~60!2ZL+P=)e zQ1FY6J5pwPd8_tky5iGDl<~%Zfx(q>Aj-&VNt-eP9ruJzmw^qEz&fT_e-!KbAd1tK z6gYgcrb(i@#Ux4a`Qa>w+~LLo@szcj)YW>0yrCygqNys1AkUZ~dbdiFJ)9%Oe z%^4C-!g_0l`oAcJ-Q^Wy+>4xNUv0J5r5~`cA+kCS@ptiY_z_^@)UIkb@vb9RO8JS} zG;AuRrOdBc$d`AdiD3F}t-HErznPIHbeoAHoJ4~no&KzD; zLYp6Z>8K$>g)M6xCCy6S*jhc)Xa-`a%lA`*&sffhwmygta^Zh{cpR2z+)Tn5yQh!B zQG`d@2?hmM+g7S*n?tpU+pp5O*cLC{IVJ}62E$;uN&g^3n9LQhLbfrc$XMnno`?Wc7-;8Ocynd6iJdEZYQk}7be$f zV`B~Nx#d+Yzstw3#;AL%BAPM*(3{M3EeNUqk(=zPzaMGgswB;m&$;^h?Nb|+AT@Ed zWcWWz>^^c##khA+#7yOl{=!igg0t=(dxGxCztf>&;hsllHL}mm_R4)QDa7XWQV73h z+!F<@VD<-Snp-T(JUlQ_(*Z3j#UZ{Hs5J{JsP$}sFR_B6brXI>vM@H*>rCV9X&2m^ zI$5FWFTeBp=@BP^x!P^)-qmTlFuDJLJKBp+;299|S$5#b$+fJ#-QQcusu=3@P4EnX z!xOSX*wEVriVb6!{n)d9UZAQQ`Qi0E?}3@n;LR=d6vAv3@3aU{QPG=#2&>v32K?;6uSv&lCTuc~ zW2vu1rq`3ajEl;e+u)ZQY0yuJebLFTwqe$`=GHxQ7wmC$E=S4lf*e+}pB0DtaruG)rxTYdsU$3OxGoORgy#Mv{6 zQ0=bbXp0zJ)crgiU50a{NAtgfK=6jWa50pTWC}_0;@mux}JPv&R$;R*laOfNK!G^C- GUivo#lgp0) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testInboundTrueRendersInboundInStatusArea.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testInboundTrueRendersInboundInStatusArea.png deleted file mode 100644 index b14b8e56818f2999b5ada3d85a76f92489e1db03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5340 zcmeI0do+4J$woT+Ta2LnZ$24Gp@Y(;aVmLw7vY;;X@%Q;Yv{|cW-Fu zrawDay)1RH;#OU+;ko_RT@ODp+aWo>Z}ZOw;9I^w`svMoZasG9?qloz{keP0Zo7UH zbY}Y=haT1z_m}48&!DE}n>Wm*p8i4Rt*fa{R}YH^5(W?~pMn;4H5^wxCpukOjX}iK ztlERxWA|+Yfd(r;pocBnL7}`vyv>4I!x~0+3ra1CV#am;G}V=do$& zt6r5YyS-7HTqb1bl?|@0SzfLz@#@HrcsIWC0kcIRc`OGHp4GR0OAr^?dWJhWD3Y#{ zF6eI8DE<)Zfnj`vx&&~Anz`IdPEbOW;jMHPQ;ck>Z7TDp%oiuCMazcwDvV@7u=GL; zB;eFB{-cgRfs%rC8kLRs32eUke5lP&%!XdPig85hPIq`b& zM1~Sx5-7c3pM-!8^@!-|xI)33i!{guWeViO{gl&n`Z>|o;f$A$-S1O%oduJ{wo)PISd+@Rrvjh@s&*A{;eO>`e| zG244mx+z~fnI!6uNHt`H+o*06`qG1RW7wisi=5Or;m6qc$#3Z>{z0QWrH?}LI&WRT zQa}4k@+i*d-jHyRhaZgUJEx}{usBan^NFmpLx2++Zapt@+NhB4H@&}{e#R#AEdlGj zG`A1VPpP!0D*6QPzIQ0hO~qnazgt9&(=DPD?pe7=e^)4+-5i-j_-U-h4kXuNaseL^+WDVVmuuU!+D}?)_%=N)+BnX)4a=lKxA08!o z3{G!rY-;=T+O1~c7)|OhB>Wd3)c4^>PiMQ6YCA)Vn&f4qDY3gcsqvyi-Q@~pDi9)I zFC(3Vq2{M1UyX>o&K5JA$bILCGfjlnA+ofpu2CIGu5<=3racjfY_>~ z7FRm@fFZ^ZypmV;t_!l4>Zr*1M=EW(Rl*c|4CR(4;HDL;4${`CssV8=nyZ(o0>vIJ z2=3E#A4{}jW%bty(stkO+ysJOVYD5FMv22g<>9`;3AGKf5S#>Xeur+3324K> z+}S@1@#AXDfVfqU@rHqxztL1tS<-=<}0AO2d^)4TR8IH z@QGgt-LE`s(32pulTcQWD;ONdy_sr7u)-t6XPn^0`HV6xaj^SY;Pfw6O&6}X5LvOh zH5FYv3`ohT$qxNHS#+QgwM15nV95_6lqJ5=9nJFnYYzz~`2Q#eO4O&ldzKA`X&EW+0+E=V4O&=Kan`df0y->Vi)?&uO zeMIl^LIL_*%=m|Xi9nYyBUdU`Z^$YnwutGm*Q*`P+&fTeEmI4G@VD(H<0!)^^sP!5 zZ&3_{;Yw}qtvrF*=3DP68EmVu@c75)e?*dCy*CXcKuDjsd#W+t`b_7*ZKbkwzrLy9 zw7BG||IKYe!kzvLM5YD!R7RDgUxn&U)odi4w}JEZ@lV~6yo-P-Gs*_u#-W#q&On=X z3U9D08_UXXLYJMpQ?Vx3-}}T+$YhtETypvsA37!{gJziBBasF8yvZ~)b7>~r-QCkA z{n?A^@j?cWEcywgErGR0tarc^$OAy5p=>eYi%V5&w`!>zBZkT_zPz!FLXww=Q0Pdi z%P_`%EPI?Qs*qiyBAyO5k;(ZQXo6GBlZFK+L(?d3C72) zG_V({L>eKIdRk$hvl4XM(9PEowIMUSVZjROiL_~4>DxLDjV>(iY*+gMe(JTS7Se?l zbhAsq*ON{!LeZXTgzYdBZ&MP~wXIqi`I(j0GuU*C)*GlWKDx8+;gcGll?vu}N7c$3++ zAi|R8B~aBAbZ2E{-h0u?SvVV*V>*YUMZ{k82Mb)^zwVYk_HP^?8T$la+i9C0A~@P? z^zyA_^JkMgdS{yaMzc+x-&u{fArCHiK~&QCj4^!7s^kAmh2|(6-XTj8r5@pY7BRbQ zOQ`k0_)AGbS0L2}UVjE(MS1l(_^9FQrxt`XD*_?D@wD%#s)Nzk zO8Z4o2DL$qkp!=xB@3bG5!Fol`E+9voQ3n)!>dH^C4Rv=O@9r`WNPWjnS?=YO4k6T zwlUK0a=xR#rsoSYr}cqsw3w||ywnvsKGvN?3e|`uRevj=**`U;P^WYA(=rO zhrK;ypmX***)1znfSF3-C>8iolb~}ckjot!O4!=|#nLa0Sr91IBzr~V47roLkivIo zca!_R^eFsDsDwd=G-_vGi3bD(88z9MwB14|(6)2t(>F z!*Lrj>H5_l&3ks`Yi&4RnL%A0@)XC=){i?MDtgc(m6h~~*dvCn)CWNbO36SrY&#-8 z+&9{>r_7iJbg44URDbl)zX;p~1oF;a2xL{}dk*%Kq0?6jArPqe^CO2&T}G-W@CzYv z3GTmLeR@*=w|n_UE_6K2173Q5)IUb8*de@!4Yf_r*fFu9Ar zHD&30@=9wKXvG+_Ty=NphSGXW0?#1$b;N|fn{g}n*2d;Zh?3+HSk3-ph!#R9lq6c!hsECY z^>NrMIv>I@*Mk*NA?9u{f+gv|tP+|;2KkTXJ75t@!qASSbqSg@)>guKR}~WXS)94> zW0%szH09${e$NtH%W-3^+s1YQ&^(_E+VPrU%ORHbx;I6P^SVpU4nb*6w^%?PVqDhx zq8G^H$Sf#18;C zb2oIK#vg40v((hq7o~J4Okw%N73fpsDVUX<)TWS#Y6*cd{&f^D53Pt83ofG!WS^=D zR|Mx$)pusR3<6NGC}rV^^jRes9pGQUdCw_2Wy3`xipVyqE{$~-W-Ne6pni7}Rg!*w&G zZbPH&n#B)fvN}zuqc5U@nHfXLyrXkvq8F$lBHERVETG`E|Fy?uno$wLX(cnOIj($C zq$@8lh&7W>J4E`5AHf&2u8W(2|J~u7mT>Jgm<%;V5|M8UDp0xWQ^z<53BZw+?K`X? zZ3KbiR3bscZdtUB;?4S_f5MIZl~mP;Ks zdJur2%zCfMMkaY4#l>Wg7PlW8?d@E(=fHhHjS5 zv+K#ZylUObh|=JF)ahK(-lY*RgBh{F&hfQ*N-uA4CZ{=_n}xePM}Q&C1de}@fDt>m zF0RSknC$-PgvFZadiA>*jT2>FR}1hn>#ueWTGiFgzMq-QU_+fyEB%gC_#NK&y<*Qp z2(bn08X;k0D{<{TCRS6rGN6gy1)L&+ZbfacFTPJ1#a~pEE>s_FYiRw3wme~$Kh`ar zvJa-ZrmZ1E$DF^l=H#=T5f_#3R3U8f#;wCx_}P95Pw;;a}XK>7gtEO zLdQy=d@dbv!QQ?+(qnNas(X9!+?)HfFH_au8;;buX_o zfU5p8ahKW!G$JBJ6JKf9KRXUY%?Lj4iB~vXARHU*z*j8ac%Bc>Em-;+?T3w*23YOB zwYDoDQQEn?!aX=l33E$~_tT7pId*2fn(|HYbK-k>cP|k>bwzwi$aR$#<1sC~-KA+8 zVMAen3%_byF8bEBXsdDBl<+LmVh!S%iS&gj?=$P_JO z{BnFx)~nhmvdIU{uzY}a`X&pdeCI~47st7Df8u`AqPV+99eS13eJPP%4xK8x+0vju z(;`ET7GXbz89D7_;^j~yK^>NiBb22CUcu)ZF>3ni^4}Knq@L*?g$N_qKkre~aSCnw z9*XoHQ<2Fa-X@C8>(^o@`nhfwN9H7ZW~-kFOR9X@0w}`t=>S@Dc7O6?zCY+jLE5cw?kDn9$7cYs_vXLzK zL(Z;s@)v@spn>e^P&GHBxIWunEUp#fh;Jg}>rMqF(gnp^e(Jl$ZOE~v$xn{FJcFmx zaWUa~)7@riB>V2qB?UbwikA@ z(3SYYIF)Gt^x2-s(pK+L>AQ1`MXvmWGKE^+V4k-B2ktS;u(s^vv66BLN8qD^N_PN3 zh|{DTJnR+M>U}UR+4KOtV0~n61C7zTQJ(g;&f9JQVY~2Q#>!vzK}{S`zSmSm*6cZW zVcDv{awL}e{%+Dx58bQ-asF&V3~pMLU#*baU15|y^1;f9UO%lwCVfx=Fp$E-tOI$a zpuES-^7kIn8%IY~fw|`sJGy>cx(%98eoRrt5zn4nUI9`fT7R&aEZ7yqE_ymEYha}- zgWFQ@)-4j74Qp)#xmLa(z6Qq6};RJ0h{f~ah)9VLFX1q#zb%1|OrTx#oT$2u7L%^kg$mV$*w_mK1TNMJK*u8SKXX*<6fGXj z3CSBMQ>`WNd|lqylS1P`>UhB~#WO}q@|QIXm|;Gr-fA4cpRR3G!YR=X7-WB!+tq&- zgxL876d;x%t~T~)3smhY%JPxg&WnOH~6S1g$YeYpqAZC zh;cQq2gL5}+AqB3r-C>0`%Sv`^nA@q_lw*$IMi_8vS5eHC?cIUc_VB)>=1|N=i@!P zE}eEWk<*mW1n5}qaRn5I*%B7+A}zUGr+6bLY4JVO9fwzld9G`T@h>#5!vblmOR@{! z__?h$$(KD!IT0Djq@>^$O4_t??hE)2wzugOc!+apJ}vS(Z@NWxwy>#Cz_Rw}k5nMC zW4&E|S+Xi07BpEo40EmjJUnPVuyh7CmPM#zMN{$Cd`KH35iRBBTM5RPJvLYpaa(VA zyY^lM4wd|2OLtD94+pm`dAVEPe7YuFPdX*2|4qZPiMXn7@DM`;s|H2O6n(_Q!p|4u z6~o;7yO9U`LmDMUAEs?AjM%55y;)KgSd<{^z+KLb;N{#Nc}>akcmBv91-y?PVzq(P z6aBv$Q4eR5PPmvi3=;q#v@xnPjE8FHm*_W zkI)PrB|^jqF-D5MW*Bu|o3QfN6ghGNf3StjdX<>qWjrb?Vp#OyFb=d6xXtM%)c8|B zUKzX{+6#?{on7^%-x1CPSElwn&R-D!i(PovrgYl*dq$5;G0DsBZ5{J8k}#lSW%9y^ zqV@d5ZXukM0cq<<^mW4xMPw-N^w*E0gvEM{le?H0?J6y0fitB6628WbR~~{sm?;J# zE$(-6_6T%k4RAtoSB%q&HQMOT)MP5Ru^*HF8ZhtyPAZ!0$6Kf8f<;@|wPepNsvz?5 z;Q5_F=A~__Vx2w`1^*V03N9pL<%TZ!ftpAO zr3C>D`taI>`0kw5n{Wj!)Hhd<-Dkb&dS4XDLRfpw=@d0MMRdQ<0IV9+JzP;r-`rOo zzw~c<^<}r9MHMeql_)XE@0vYSJVBQ~1O#4BUAaArgF1%8-Z*oISG1qN2Su|2nZ#|h zDs7*KgJVlmi(p;w*+NYK_bpy^zCOe_Z#xwzncBpqMZ?%F6JGOgB+wd~6Q;1=AfK?* z?JT7b8ikJST93IcU-j4Do}tsO-k^{KAxtu}5)tlsnLni)$MbDJ+>-A+zLv~-Q7Ub?W;1{#f+Z*H&`{Ve?N&5+}HVR>g(%5Oqu1r zf6(LbFJs`_$z1=tvN$2D9h3TYmCQ`Xc)H?BFuvSn+9Y1+?>(Jzn1PJA?O~<9;#SYs zOV8r4N!o8dcA*!wi}v=d^yoGFvFq+FzUhV`_Hba&zPUVMyG>6-00}mEeo~N&HVp#g ze%rHbyAC=^$)vkxi!9oQ&B)qf9M~sBs36-Z&yyc|fp3+aUWvfd(&ULq_PI)S7g_D? z=%BKTm@;(!e?aruO`Yvi{qU%bk){0QM0e};Lj$hT*P}|NZ8*#640V{8V0@cLiz?CC z{*HnNo^3?1omHly;eUwccrCGI%3AP^M4wOco=<}~H$^3{Us?8dcz)BZx@NLlvU8&2 zm@{S-_glkao-({UB1_rv$;3`>vM>#+k%uL3!F4m}qWj*_ogGwkmh!-VO>QkovCk!i zR8Mv&7<<(qafask{m}BV^I2JS27Hkup5{YMqsz2I@%~t!dyD1PhyJ5(xGvGTu)`nV zI)rgv?rw3Jp7zdu*RB_gQD@VcB385wQ{;kc)MYc;U2)AA+&2BvLw~yN=}yHip+y>S z-1o!xeBJaMMq=csq(d9)F|C zKIePrn$~)3IJ>dTjM>UxH8?C?ioUFaY=^UChR?YtT-4PFs4HrARf$J2-2?gW+3S{PQ=^@3gRGl8=W8>!UY1KaMhla&*3YapFB>>|$k2})P5+Hz^rNyxL5zTxLfvVkDS#*_c2?RdJ)ow*IV W#HFg`_B}u3^U&i*8b3Yv^?w6UjILb( diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testTextAOnAllRowsRendersOk.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testTextAOnAllRowsRendersOk.png deleted file mode 100644 index 066fbc98ff8221592307ea8fde0966c61bf249c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8493 zcmb7qXIxX+_V&RjC>n4?MWo49L8Z6QK?etrP@JG3Eg&r-CG-{`ItbV(N=fL>AZY$l zBy^<-2tz_qU_fe&K#-21gpfeq6L4nkoqNB$U-s{meRkG<*0a{y&w>Y6EsUZ3C;0&Y zfL<}Vi~xW=N&vv)y`L9+(tAB78URkMUb%efS{QO+?BKGzvF)klI6zAAh>*mQBYXDj zxn%wG#ZyQ7kINl9bM36%F9)A4C&%A^^Yxdqy+e*cUIh>l*6qzzI@g)=LPPJw@wZ(e_nox5LNb(2JR$gA4^FR zP_?hE=tw+3v0KcLWM@}jMO=Yeox0=9> zCQALv0|CTz;_h)@&fo8lj4h34;~?7ll^t9Y|Ayf2D=B}wasYT{#YpHtH4iq+wDi5; zS{ImycR1>MTtc$sfR;WY1N6rFoXaWb$Sy93Nh4)tUy0KnHjVhaSmgl*j?n*bLnnE-Hc=^uk>l;7A)*B;=G z#h9M76Tj0Tn|PF^Dgdm~V9K=&rNC%{<%FJZ<^kZDY<`Ani$=4EIoB_(lT}o8sw(yD zcPBpg^AGb0!}uRK0DK+0MWYprLsmXWgZ?n?KF?YV*U}hOVpH7q0$<+?woQ_$Rt4(~ zbzzwx8FZAj^s^mj&pwAifQ#sV7`Jm9*Lr|DL47FAeIM6)utl93nt2ES>K}C2QtPQd z{RH6!G>^AV{y{xJ?fs4G2Z)4Nifl{QL#{I(*T_lRq-pc7$+QSJue{)581Mo=iuMZ+ ziz2k}tBLRcZ4gx=`6nLpdVKiU|zmz6n!^Eq42@oJ?qLWz4 zNBdZ?-XvzQ!{SFS^h(4MmgyHpR|7X1>he^Bp8JO!xXg7SaB%!<0Kr}LTiF4_B_Mhu za^uDFue*2j2EUHO8{OO+l!fdXHCXG&nn+(P0O*m(#zS{%VUY^#b?)Nm+#@LFt>>0$#HHvHz#WA#eQAw*OXq@3?#|z>9pOfmjSIbbIn6IP%r=D! zf#H`{1jc!o>jlsMffgCnFsk`fu#)^@1qK2f;qO4O{A|wPcM^~>Q{@4I+|>d-!>;eF zl%K(fmAs__^3B5}5=}Ubp#0VWW{oVVZ?CA;nOx&9R1Qv+Q*U;0@lD$-pLx~Xwe$S; zfB$g3=#gr%irr|y#q}Ig@B$YOqGjXR@S4CH*BbrN9U{vx?swQU7n?>s8xwA+?K1-a z#|ItgdyN8E+s8&wkUtg=I@+7baPfmPW7PiLG;|_`@p#YDp`@!?S&BJeFDSpCy7J7I%5QA^VdY$o8NA^4pFF$C5Q0`enXV?V3o2Z!uSG zS^~2`9CNhZ_J2$2J~W-Cjd#`0sqWYhe0cQ8l}`Klb075y*G9b#Bu-F3m8mvf8ovYM z>Lg7WHwOupBge62JtY^FGl5VN+0IO%DU&PNp2)C;#>A$&e_%Z0O`yKJk z)23VMy|LdTH(d&AkyEea!zHsC4>+j*J>0bxpx=6C3_O!8(1*|*si(V|vGP3^)&{T4 zXsMEUfU3n-gs4pE{=7_uLxXXA@y1YQA@{KYRy*pgAEy`Q+|4g3-n)~|uSfuQ7DSH( zLh%Qi?VBN{^{uHhk1|0gR{5B8sypW%89zFHJfMG8;~q+F9{_ldB;&oBbfrg6AhkLh z^H1Ccqu?F)QT7kM`vuRhsq`Aek7#fw+M8{ki>&X@3Mzj>@BcXt4j2DbdqVM+H81cf zR{DdsRF*-~G<6q2X*E@c0O!!SR=d;g+(+xs z2bD%7?kv!HuY}Y}cK{gCI5TkaycZcXzO+bi_X~~xmAf)8&Q)Zb0Gbw4r+7q{MD>Ll zj_Zr$ju#yQUPHVfuyL91$^LwB3!)X63PKCZtOF7gHHsz#p9R{m}y0z&&<4R%O@Hjz_zw%`|zAB?LO#wCMsd+0#{ zZ>JIRHVNY_q5b_M2M8^jxRi?vY=O3Le5627uch+^vfnLFAw*$AEczD@ci@iWtvxKA z-TE*CdSL8-C1_c4jFxZqVSR}bJQsstFYvZb$w4R@xnd=Xl~O6bdX6H1v+w|KU?;Dcz9fxX zLLLHuj_MiEqeGCu;EkX#k8%~DN#W3gT3$15ElF-TjT;W6}1Gjk+-*vxyrFf3cVcq<$kcDbg# zlUT-%rQSUR38<)Axq)L%-BtaTFYm;_puRL2f#4|TNa{;&pO3ud!8HG)8n?wqG)v0s z2vu4+|Fb~x$5fmuH{LrXyZzUfmot~&Ales55-+=mwNdHqEKJLR{K%o}dC-?# zN+Ltao6dy#OQk2LM##Mpn1!C&1vBPQLzEgP&TpyX4IGMh5^xeg%T~@qe46BZriYdD z>OC7(GC2jy6ZuR-E#v?aZH_eR8lS9Xysk39!q|=kCmQ_*=^F)xOCa*3e5+313=J7N zOu2!;Z`$V82~sRHXx%CT;dFSeH^8(-YRqz^ZBkODV{tuka}->)>s#I3I8 z#@WO_LJf?O5rUn)AvBKDxnO&`-t<&%r>cBtSBmLaX;vGRDuyz+I$PzjFEt_0e8R^k zZ|ge2(8aAKsxJ&X{aVi5J&p0p4`n{lgdH3-gS0Sy}`zS>KWQeC8qIHO6ro`Z1n^? zE>GrFRdQCYIYheg*D)_82_vd9wJ}};w^{7H;v;Wa6aEV;@#pabUFM|TsVwy7kWLCT z+p~cXA0L`Tqx>MD)e-o7$4r??wg;zexe(DvKx*4!&2xjwk93eCgmkhe(siigzV zU<2zzrRkec#zTbcD^x5lflkxlRHxc8EtdrC$}7f)w;e{hEBQlROL$fc3nXwE-6Z)u zV$?GzzF@%&-X2Lp-o@I_nori|WNlEz6unBT-4^tU7J9s!+#pl6)W&;~2O8Do$Z;JS zq=p_fjBl>yb4COf-adU7|2C-dFH-1M_4|J8ip(`p@Z_)Y99DCtS?E%1W~)nd-+2^d z$-Iw0M5d1f=6VNi%|v*~d{7TR(us`einLA@wxEm6@N!+hB|BvQWC=4dB0ZB2Gd%A#niaYiccBArgAB!0oz+M#{0B|fNVa!=c+ zhwWni%(tgdJXxkp5{lJ)UT%EGVB)V}h;HaN`dpf}rRXI#`;9m_CvS@p^kS)sD)q>% z1&m`atexm+vr-_(U54$^NQkS8TyZswC}mU!MM~TU3s^5J2Cc_UyeWf^(dQ~Pq%6Cc z?bzzVJ6VO5yk^lYTjf$wZp@bU(Df|Id3N@@n}_KKI8ARdF05&0NhpSAoK1Q^&m3tD_?i@1 zUt}VwUldvc#n&e?*>%Jh)IN6({9JrQ-TYbve24I(uXs{864z%@f!BvZBNulV4gnP{ z<~&$g3x(5%^OGI(nb24Ap9?+v?sRND9i;RH#<_<>zEV;*p^K*rw&lVi1G-p}^yy+r z*|mGyV}`o2gl`?wOQgGbk;F@@j2I`p?Y05DzS`|11)lqQ#iL0O7X>Y@uUZi)7+>AY zMJz>WCYNj-gpcKAMP*2+*+su>AF|t5R@Fm1vPnf$d$Ez_QpwPl^Orh$7&vLrZ}#ZY zt=g)b@LE}eJO*y~A|BkfTti9!_`^DO*@J2GN?Ya>?y2`taTAD#j}AkdW`*3&oGa5# zotV0aM0XEkOyI1*(L3Qk6WZHqcv9LueBq0Ia<1%5uO;-thQo?X!L~WA;FTO}Fn$BM zB-l`?c6Z=GL9|tNTjL+@J@3?DAx1--L4|nPrFXS!W|21ZkmArn0x=?4FEOM;qW z|5l6tD$VZUO6_pcc8mzErL7wcHhn%3*;B^)?VpboLU>MW%3-qzxg&I8OF*-CaQV_`WEia6;Lcv3Sq{!dx+U7g+< z3s3^ZEjS%4{`G2+9)3fe0l=MNd(qBs*~^O5ZfYWR6VYydo1X{xR0x*sr5_rO_+Fod zED(PUT&w`VsXO{$Rg_xV;&eR!X9!S#f-4xTn*Ww#h2S)wT^Z2==66t%d2unRl2RVL z6Yg9C%RXvxZVhLWprb^9DiL zHIH%Q&PfoM5~;HOJ6iSqx%d~cbEe|f&Y66m5Fl+jCra|?$*v8W2*YGS>wgsbM3IMY zX$7x0o8h=V`p?~fO0(GZwWYx1EhSLCi8AEZmNjd8k)xPc0u>ZUx={H;ANPzI{JrsXXayCUBrqdu8fDSx$gt<0T8&h-xR`ZCdc*Z7_DzbyZ@f4lZ2*TF~DX~ch zG~#RoR+i4ifmUn#eQ#IoN8J-`HZ-k&oH}u4ELvI;XtH)sGTnX~?G`CA(~B_vwY!ac zu#mg?%R;x@6}!%Jnf*^m0BW=ttvz6mq4b@Yr2VW_n1PDp4}h}`*MDXGJYr5i=&N%d zpo~=e-ieh<1%f)2+cjEsQ&Sc1^f%_1B{nJZZKN>r=!336>gk-t^B8sLk;kH*I_mg8!k24 zx|lay4N(OB6qe<;Bo(#W&a(qRVU*wj&igkVXQUbkDpFWoVL#bS(Q`*WOO>fPPh6pX zSsq?q=XS_G!~{4)V6-UZp{DS!ouD8qwiA8*?Qa>^7YP9Nl`!WC!8pZu%d}xo#m$gF zQS)){dT6BP+j*9!I;e&Jt--);H9#ML0Dx_{axj?Mc3OR0X=`82y*(Jev1DcgD)|Q= zJ4c-pQL&6T;bYJfV8+VNsC_5qB%XU%L7wXr#kf}Ry`Vxc{;u~2Zc}#a92pGZT_sod zj&YF6!5oRsE- z)99R?$N?QgQ+1)E{uoNWqGgS++J&?*M$6-SN6_OZP``?FnehdVt~NP{>x<_OaW&vU zLlEl8?5Lu?s8SbzA#9 z7Ma6njMUT(=laz`?e3PlV3+MqApBP+PD8%>LOh2|SZO}ptS6upE%yeirEU0A=K_Z> zJ%7c{m09;&E$aA~i&BE3t?1AmY%}oR`YYH8jdE+#pC>*k#wkLPy5-&3wE@v8Z2yfl$bExf z`xzSv2y*zWTTV-G1&I@;MVHwq*vgBEANP^wJfZg@oK8E!9vZyrM~M_ncNS?>!G51% zQdg*X&G8-sdJb@wPuJ?wmw80HdKOK`F0t)f;A`5p#Nd~vGGCKO_0hr|dnT)iV*BYf zEogxmA&&u_t9|r7A9%4D(PeX8Dx}@dP*WokMR3)gx)NnKj-2vln`IdASWFn$&AuG7 z&2T%*6m)Np`FvHpn4T20ucC^R1Uhi1Tow2l>L33c(n9otM;)HXH{E*tVlJ^58n6jA zT9dmOFh_=8(L%L)U*jY6dtS55ZN0@~e2F)it7A#2n{s&F1Mb?gbO$`Sggi~o(x%ow-`=Qf1D+0wI#j|K7}f6m5k$9tzVbp=(D?$EwINF z6xIkWOZ?cw+hzUew^_P@Q{Hkpz>9C*&g_}wZul`<9(P7WHz$aYc1!=T(jb}tTfIAn z*D+)ZwJ#&#Y3){>_4eqt1E#T2tU+wtdN#!8!n4`{M6^KZfl}GZo6BB?k-j>(b!?#q z6weNiUJujrPF?bw!fcolSjr4b*fpYZa%q}nR=2KAYJ}KWrJN*sLZv+>n|8K<%_d4k zx1FIpd0j#Al^oZ9*eEsnR*vK729c()?BQdQ6S*&E{PAT4bit_&tt08kP){9=mA=OI zdeC{^CT5NA-1jZVA}p7~RXR)PVv6T+QxCqe;9DV^_4&ax(hwfzJV3(!L`ZW*@^93C z)CSSX1x2AP`l@{WVsD5q?FBXo1BTmBGCmh5Cz8-M=tJlW!Ix*@@$OjU?S08I zB{N&+`T}5uP<$obQeiF2Ejm9tU0vQlHm%5{K`}CvkOp7(p1i`rCeiC*>_~!4Q(fuJ zz@f8wN^D2>+U%~)?-)6Ob^a-380&W5K(`K)x+G40Qh>B$5fGStM0%uk*ibUc*FZ6? zu>u5WNibGJu&n3=QAS4gSwR4-^hrX}sLe!_QgsfTWzc79v`F#)ss0R^`St-vIR!nD zx?HwQU$!q;T(N=|?_b$+LtnBUXLfCgv}l7kS?Ai`^l;Bxv9(xa%-44y@jbXTvI*bY zEil|mA7VB`pFr_-mbX{JCs|Q0w)z4%lEJ45RQY!QyT$l|LC4|lE)YonQcXWO(Ib6A z&PYa&sfuO4C_hZspW|hp1u}^{!#RKZSu1 zf9uc>eT>JnmHNr(2s46)L1Vyu)cc%p)%u{iDX(ew7hTg&B@vqE?L+ zra4TOuKNRx?E|lGeL`vI5pfBXt3><`W*l!bu+uPw+6<=RnjeuGQYH~h#r>RD^Q@uy zrFf3Rtln`ZbTOJrNsW+fqCF*zKJX`Gn>QHaBCxIg`JWsjN1IH-MNTiB?l9HISkU*f z7YbmhMARt?wr~Y;dHtl@rVfc7jl6*M#46NN%HzUd781zYG4fmzspO}AaC$=& z7C4gl|A2j&sIlCDZJBK`R%U1DjON@(5Gbg;W8pH^2e zF`NBZ#nQTvi7XuPf0@2+4?98+?C4oR7DOW_cBqu+w2iq&Xdk*>kX|1orjUkx-QKgh zCH8+iL^5xfp-dqCKi`0zp|>^E*($ufUEWK&5mLsbN=111S=o49p2;gZjh@)w`h_?( zO|=2N6+GqFwpHQ9n#3RcA0Zm$^-&ew6>K(dEz=`UL1ds~6;5j4x!|PTN^jNESN5<8 z$pr>US8PQ*e!?;0bwkhQQU*9d6}oSSISu_=={OgaoamdWGO{>Hg~}f(-Xp!yNLj2e z7cR4DRDe05UeNZ*PS#e@AG~8b+^ts4v4UM7@+8ktM2WVaBR|1TVR@GkUBAKasx9~yD&PLwOiBN&7Y-FLgL%={)pbg7Fwnzx|WeB3YsH}UCB$lrTbM%DDVP*UBjWs zh;^TCyY_wY#lf$B_mf6%!tC+i>lV8!FHh@#E$`{0eVe6QPi-`7?%V9b_9w>f+Gx>d zzWd;)W7sCMvlh*}N|!pXbft?QRGgD_ewxzHd{E1z#^DB^)+?%pqe&_cQrnmT2zbAA z%B1Jn$yI>wGY$X%PaW3)0Hd`4z$1zU0C2wS3&8b{CY`6F|9^#@m7L&pWH`KWt+* zjiJ~69D+d@S=gqom`d~=SqjG?>em!m&Q&|mYcz+K)~1p_=HH{F2+PTz#S0%oLs1W8 zq+^Q(KNrVA5+gtyeyklRQIN!oP%B-<5w-f&DB4ClK+2>~yRIowi>s@s@BCEFL3{1~ zOVuR(4w-{DAI4E4lRt=4Yk3+L{{ifS{TmF-E2*k#*8BNOEP!NNmmfr)eBXaty_Fvp zYRnnEYFJIN%y5$0v{WMhqp@f(p4@D$l%&krWZhi~P0Lo_;e!yMmccMC-RUEkOKZTH zzkW!MQ$Hx+fP^&VRX)vp_!z?YP9F%2BebtpZs3nl!ZU=FN~}Qi={D>ggVeN0{+L5r z;4rH1wWpJOp*rJ}0>a$8zR$2Q7x~j+r}=7Lzsmcu?m0p`5UHNaxpq-5q@+X+^PabE z9B@zUMk9Aa8KOguq^_a1#{(^iDJFgG9ahi$N@NeH!IeB_FV{M&7Siq;X9vam{aOyx1yjfa2a)m$Q#Gcec9(i)x`?HRefox)wFnZqLHeqg<>kTlUxv> z=+qXBbvbrE*^_1v$@q2i9fJcu{CrPh^usJgw}jGiCYW9Zz8NaH4>g_)o!D+8f6p{ z7rdXbCeGM(A2oSB*W(}b@e-etL72=|U)B4ZsmG24#>e?MT^pUq<~=o*7iAU{KZsj5 z`{cjKq~&UJ_^sUK#zzwmNMj&;5FDQb9XGthJBBXqgL&V*JK)9we+bf9;x2fvEf)va z&xz{ixBrNG9V;-il)R}~t+akFJx8?<9dY^H0yk#zl|4}b>_J&5B1S&nx4F~Uzx)(j zWCatS$z~SqR5YT4;sV#rrt?s}pO5nGGlbNO*su~WWMI2Vq@HRYHsW$~nY6HIJ{-K% z*@gvJRqSJOZ=grqa)(8+HY8D}KC;22lG>iC)=eX{LA!#c9ktAn&kMZeL(j)msO*SDCG>pF@ z8|`=NRY%uU#|r+N=xGIq|I-A!i+Gsya`hIwi;}GNALA9Y$0+aZ)`J)_1HX{?F+Ir$ za6cSkidfC13t*J!WHG}`E{3z@)g%4L@KD{}*Y|pf*JplseLv6Kzp&IF?Q(WAt++*3ng5@`Woy<|C~SNQ(r&0TTLkRL5&@v5{-#-^m2yq`|YX==6a-~ z5qb0DMt3an9GYK3sPk2;HeB~P;7;v$)%7|M98g%^>n6Ac6$B>>7Ry57$;mq5J@?JT zFU7x+<_h^&?Fc`5m=St|P6LQ~VgV2<3f*#Oo`F}U%|w!a z9c>~)kXOsF@_$@^zW48{^#8Ffexj%+_(V$*{W0c~ktVpX3h+K-!J0ysBu~o0e)rY93W!6p)$j#1x z@3*p~)m4lCQ|rEO+UEpZ)}hirw|ZBou6ybi>IR7*2P%+eQ;$s!It`5;1bv*EeJ<5= zN71C(2cct{kbROYR-;?XL?dtc)oIDf?rWpGh+gd(mSp8>=S49qLYiHqN{gvn?v!my zoSkT79E_bIUQ2GFv>t?4U(aqHJOmKHN zvkcCH5vR~6)Zwsiii3VJFh&k5625g@c6n$`qQAgp8b;@rq(EwT23_Do!v)IC`3@Aq zLj#Wbp16QVvu~hTiJ6J=Y+}Qbq7oJz1NAcgro*{?gvxrP3-X^dDWm;_Vz8V8)?j9C zxvM~9f%>38?U^3G63E^etK@h9NsnLICFVpDh(xO<*hsI|e81x(c2D1$!;br0-gz6>balMw zRUev`CF_0iGdx-|*3CX$u}vVR=0E;C;50Vj04mkIl@;(39u<}13ox#gtcuybKbCO3 z@#=)0Sd4E>CD?Zhq^z|}eqR~FCvt1E@0y+MDq8DfQ|lkUFPA4eu`|v;;tZYB#*q6H z+4)+0(LjA$>J;8A1s*dkz5#m&y~c@Rjv;cN8c|&vGi+z6ibl1MC-_qK4ctN@`#!2f z@d%OVrB)$HD>OaV0ZV!~UWczPEnr@5z^V@jJqe;H?L?xdzu)J$5jZ@iW@K|5tE#f# za}_^@%=W1CI&aJKX~V&aa$V}6xAx9jXM;~Xw8#F@Z|D;d6PAer5%yP=9>{>?(=rQ0 z9ag)tz-n*-N1{AZ6upv_1GMfK7nl|%fkazmWf~gP;;w&LDq*pMJ)(GZ`Aci|II2>S zizPBk?sk{u#Y6$AEp-)cgF%bgDoMK{F&{poNqO5}bz!o&k#Vui)^es}qp%Sd=;O#_ zIPGgHqXz+T2-h*fc)u^#dUi7S1Tp*;tcaboU7A zb$yARL%2}Uq z1QMN{5(n_bOo|?}ggE<(<_i+76v%_$4A`mEt6)ZDTeu;DML_G@TE|`qbTXKDB~$O= zdEibG&$YSxdT+Wi;qvr}V;E&3ILg^}vcK>1L_tRTP(`DcbI^>iPRDTDN!Xs|bI_O! zo1E`8nHxO7%4!x|^mV+hJe`&2^+!rFF|}Yy=7A4f5LuEqGtwE%jQ^kQbi2V&DZ59J z!^%Ks^QE~6%^-_nx5@8wSalur!yJTHYd*}rol2|P<>?%W|FvD9o7wo%V_z^2euLqZ4p(gNs~s_Qd3xs6KA5w1Hzd6@n#d(73^x;&u-O7)Fx z9xg?dY_$98B$9g}d7F4BeH#f1sj2p@!#RPBf0P8h@*xl~gff)eokN@=v|`AL1XzwW zZh5JIlN8T4uo8Gn+lcn;h)U&nE>U@eNuN7EY<+$E>-;p8F9b6~SX!wli}XtJk<#P> z1e3%e5bvdRw1;eQv9hVUp~;y1N8p`r9rq}-?XawhPk{?>%fKnZ{(z$fl}fOX$? zBrHKh{-v7|O&OHlH*V$Q$tURuEs@W$`HpVFdceM&c^!WE!0!UrPJfY3b@TL36;s3i z;%K6$^DY~p_hm&Uzc|lqp215fC%W7vjKE{YcsrPHZ+Liur-=n><+khN;X6yMI~}&- z$EH(*3yX$@?7I|P=+JZOhN~i%v+yV}b7)Mwm-$MVSZ0HH6I-=k46Bc;alvIrqzs@J zMkC>yr#pHTS@ouE#MbN>aLO_L4~WG9uo9YD!*wt=h*_CfW|BNx-JT9k{&xg7t(Q1( zw|^`w$hqv|uU~PKeI;@UiHZ`fwy>mioXft%pyzh|7#i6I1ATfa%9hB#$e3=3x4&lE=%jZB;WU{^BpD2{n4KVST;JXId6$9RIE9{dbO$p@xQvwEm48K%u@X}DfrdHbSVu8 M4hZ#cIuUd8pA$C(PtCw(+iLA=prL@h5( z7cZGwa?DCoGer}@CQT~5;aw0&8AU}OR6-;`4$V35S?fLjy??%I%|Fi{&wAEg`}cXi zd;j)#XLx(LL)ROxhd>}ukE5<9A&}MkA&^xO>(*-D^#1*N3Iwvv*TdEMRD9svD4}xS zX{_%25zA{ie3nb;N!J9QOx3DySNW{l@m=p%&Np^^_x0M}4YzOBZ*o5GO7Z*l-twt+ zYwsei^%ia!bG%_QO@Ag9&Ax|E+P>@_Q5MHYB#sz+g+nL_7dlsP@FniKzjfYVfHDYj zC8l5t1ac~GHRQ^SHY0EBdM|z|?KI*KX-H)4t&&XPu9)}1OOjJufRk)l18u99JQm+XNM1)j3oe=W}>1B!dfU`8q`lO-Q{I%0b zJR?2Dd%J8aIj`j>K#(jT(6QJGWdzK4W;sdzzFAn=?cQ)5Hn1L^FSOh6B{b?7){^KY zpHFpoFp~`FIs*133_Oj}klokm@ywy9Tl0rznAp z9Sy z7O>IK8`Fg+21lqHA#=FTq)3OaBZql0jGk?tgrn^5-U@V@B!a#AIZxXa(GA4V(~QEb zwLAD}=^=Qc#Yejj-_XDym4wtVR&*t7o=^7=4Fu0r8o(?4BtI8UPbV4?B3cQU$FvA^ z^rMa8N>kQb2J-;DTT`u`gUUDw+@+|Xyogo`WhibVAXs^FnJWh>^8BJum!(Uf+nw&< zr#@K;8Ne%N`RiP9$Z?bI&3k&jF;Add!hX>nVrj+28~GxL<^l0my2jba%R4U-`uv4xJqesLK1n$5#+xK}EYIf%F2t zyzvAJGb5~t1tTlEr(P#fXv32+&3%h~FJ%q>&%~|$H#dA!Q?g|?bb576J~?Fi8XUnU zqdysPNUS$1Ae+*Gl}k){FiwwQCc^PF$>YqFaC7&vJqk-G=rlu{d*&{w19?u7kA*>+ zq_PQe!Y_0{X;8|}Vc(4Z!wxH{Db-(U$Dh+slLgd-40cZZr~O^%#9IC?;{jY}ZHYLr zu>eDYWiK=b=DK2!;Bd3vZImKi;IZ5h?5ia>ZqW5d5gG5bZer(^%m!(T?l5O0+ z&z%YJ=>NNl$AEG-DK{y%N|*lkp&nQ)7?@lAruK!I0-Y@E%Tq&XPxAnHep&K5<%8?5 ziO1LD^)0_@*CQWjh8vW>8y~l$&$qW+x*r%H)Z~vL3x&~d>}E|27>$%{pW82K7RLwe z-$mawS{iB5Z3u?(ImylN6%G1(@?iH!yefiE-O#~dq~))igPCr1b-Apqb#$1fy%C=wcQsnK` zU7q7X>NcmFS?G_th>kS&@YMnlFq{gmI1t6^26)fhEEGy&gyylYOlj*o~s~- z;(mlco*>phAOmF($it@px|II<=r2y#zYzR|Ks%uR)eHW=A-E>_#sEar-m1=+h|)es z;uHsIcVomLl_y7Zz<8CkslzF!vMW?&!nm7w2f@L(M_I&_-?NB}$&-2`Q&v2M!6K#R zR1_^;Mky94qV21sID_yOO1+647OAgw6%L)FyygcDv4ZCK}1#8Y57d%n(N0!PkEdkRw-nPLB%ob1kF*cxFgOB(wr7DpK zGp-2x)rptuZj6uXhxSl~aS!16;dsGR6`Kq!UnD3xn@>>3;De0*}uNCdI{>fQ;Iyk}nnwU;X-DV4)ySBjqDj#>Y4JvA3re9FVy1MtH3j zd)^+AV}U6fhp5`w0Q<2Y_i5(yKI8;*eCr+w_0N4q7KRLc$YK9#fF})k*{lm^2`UnW zp#}3CkWo0jTI7hSH)GLNsYfMJ2J*Pz}BkTFbef=;+n8mOwRG~2jt38s%s6GjKd zo{h9qI0Wpr*gL=tn_dm$DpJ89PS0{SJU~UQTTZP6*atr^77llI zR{+fL+1F>DL(MNaq5Q!MZ!v8zvfOw1II(>)x(+1`ks@;y6y$@Tp^IYCTwTXIO*#4{ zH0Lg6fV@E*f@8r`>l0{)<@Y^Su7OQ}TK=tenv&-=Ji*j_Z}5K!L(}OsQ(5tZUn)$>^gJ0&y2DH<9$~1x zY$n|uU712mp{!j`(!1!(+bg|-oW(`>_B(gnOh{+y`RE2W!-96>PSaBrYmiiHH{Wre zb{%fUoOU*IK;4kT#upCTnD{IOD8jidKWlNlI36x*jtvCRf$XapUY>Uy@fWjuU(!h7 zE~2nmZ?&tu8yKDpGdz!S^E=0?e(wxrttz4)aIBmj=zhFNZ zC5g0AIB4i?FK)J^)j!fP;3nQfnh2)C+85{pp(s>X_=F^3r9+Mj3K!6*MM9B6GWF2J z4vy59>iODOMf-jl2Y=wD(U`y_{Tb8%Z2Z_Euq?>4zE3zyy+_JGj;?Ai`q*4aRIm+Q zbuRTGV|SMN`#H-dSxv@Nx9nwifvsl#P>?^Z`GF@=G|Ba3OiBd)HcH`SM_}J;r=0xey?TAnVqXX>rDgt{2TA)_lBbu!V*%P?3**@Q$uCSO*mdO_#H=`cU0 z*Za|C^UW@wG>rv}L-Kq0OS++R*R%$r%>Ah6L_|fyCWB$zag4kBL~7ym)bNqy%rB+4 zSTf!9ODp`-f9Sjz4REw9@|8!4nR`(C*}Ir{_3(v)9~O3PciZ&1>V*~(f_K`YVx zT^seOAsTYvw*ExhflTH};pGLa&&EGBmC5Ry3)uMIsygtES<%&nn9-|lY2P8vE+{So z@fizAb8R$J-^kXt4!PJpUszS%GwZ{}otR0X6g4(Jzo!xNg6j1(qcY1T!Dww#v-M`e z1zRws2HGtv&q1DRJNr4ALUiAO_{V`yaA=H;+X7)XYQI)MqmQ7HAlLHU7$zFFKxY%v zX_L|Da(Mox91m0eAS;NwQolI#A!E8MArM_ng;!6#Zc~NXQTq1Jy(_AWuiKX6c`o+* zKva(8MpKs8has9-Wb65VOf_Z~-7AwKQ6URYz!!zx6hDg(isDWyc78jfqv3o|xNKX| zuXc!Nhw47E@F37AYSC_a76?jY=Aq;#&=4k)xh^pFtEzr7EInUa@KvJjB+^p-5OYYxyhtf%Q44jt2Yz);nFRwsVGYoy#-Iy-gY zh-uCnZ5!|MjD2W+T3dNBTS>yDwCG>wzXt3`rBWHKaCX=80d606zAzpKo4Lff)J?L~ zHa{Tq{I{}A;%t_iG*!tWz-6)_L+Jgoht|baC&Yk-ZPKn`Vf|5ii%O!)LGk E6IkS;MF0Q* diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testTextFieldRendersOk.png b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/mac/testTextFieldRendersOk.png deleted file mode 100644 index cd50cb9ce78358f276e77ae07334484caa34039b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4943 zcmeI0YgE$t*2n)&O*WY}XKd05Z`G7DjhT++1yr&db#%EboDBtta3p`qeAj<+r{ z9XsZfi0P=6p%wxLC>ACqCYcHfA|)v%0xAI#x8t01)_HNBchB?YdC{BSZ>_!di|^X| zyY~L9T^1G!vtF}t4FCYvhY#&P1^}OV0DwjE>Q&2;*FP8L1Ay&@!~286vt#7r=>CAy zr!D9AMPB}}J=5-sc#EL>m#;&^Hh*_?@A=mUf@pgVd3m1`9S0uC9cxyH21uyV4i^XO*cnzvYPal~ZxXcQ@DlrVsFfCk~8jYnHzxBH8>o zu(YA#GoWC0Sxs2T^c8xs}wbCSlkWstCaZmnZaA{9&^d1J*r;K!@^xMIM$s+!)j|3Dv?#0__i}tB&>fCy=6Cs&w6-70MYh@l*CmP2Gxv$f|p#T2S5GcH~`EqbQH9 zwi$Zgqah@-x;H!RW>Bp&l`W)mNtAcBU;@9G?SDjB0~KZw2UtraMZT3T0^^iX9e3|# z9T7St`W+J%nIhYbU_Z)4QVj>Sx8(-PRmnB3rF^-W6G}tD}l230;b_kcA z6M6)HMRHRi`Lq64$rd4}E^rIWz1+xS(e#s7IfF@9@)Tv_QHEP2KP!0c87E#qqn@m& z5v9XrZvRuq0aw#2?~p+z@=or(p|Vg#0)!wQ6D3D=ozzk#i_d803mp6a2|gA;qh|2M zsD?3cWaTQ5<;XYaCFcwKEbVYuo8!{BIY@!uj4$ihZBY~EMMv(Sw}X;Fq`EnBcx2I6 zE2>H|aEg2~9i!EgGAlLIOqxVkhBWpCw1ki+EnZ>}3XZe!B<8wO$*$~&0w~^GXPPXImm5$+XM)SfA#S6Kie6be1 zEC)+Ik;d9Tta;G;uzhbF~A};W{vNTg?i_m zw|o0JkC8L|Xin@%F>H0La$;nFaG!YsLaM;PmY*x?$pbte@|`Vy@Fuq?nss4G_K{6a zej&O-VH<&pc20$Nt-SQ>jIX3&$ag|ym%^XDI-q%p%nnam@Ma_%O7U{atp9TY<*kvB z)5WWall!_NkeYVywQJ(Hy;to(&m(x{Q?&?sA{ww=@sv*Xvh+acts@>u(M78(2D0p%pdW`osK?=SKy$ zZ_XdOWS0 zY?@G^5n0>yZKKY)lYb@L7`hJ?y!{(#jwjF1kY!)h=j1O8`p2d}D@snAQq)=L4xhR} z&Fj$&4yX+6)jTcS8G(f%{JICPTJ2Q0SFF+cv`Ud8pTvpIHc{M5**a$goM-OAKU&5G zJdrv5Z(R5(aJ1O@4Izou)iu%iSU*;jiHpCFt#M{o(990TkD(@Kk@W^1^!p>JtiY$K z%6H6Hc_|-Ci{x3Nv*RX?h>3+PvvJ>JdO9Z1&i)fRhabPWO1BMCYFYszfg8b;}5GOAkE6$yW59>Nb5!~RT2VHK#ilhmP4Bk0kcdOhBdN>irD#9aICp2y5a zYxzTnt$M~gO6iMRnm9l?VLsXgb&W$Z5p2J_n2!)apM}Q9y zd^U0>Ep^_=jvs26u|KxLe{}9n9x*e#Gx`=*PwF7T2P4kv9!b&NEg@(LDp%U>r7WOo zK-18+LBHO)Kl}G(hk?L%lK@*>`J}NpoAIS1Y`F7;naoBy`{tLcN;CPhvCXdK??WY* za0r%$x>402Tf8EQ#c?))>)1GsXF*v|@Nj_jh0xc^4D)dDlfhlJA73c`j`W?Lu}|e0Y=9%^sFK^E`cbT1ov*?e2;~rNqDYG36G*LY1_QlzM0H! z9VwQ9R=n)!f_k{K0VL6s$Aqd>e)q}77Dwra91}Vt%%+WriZii5__O09oewZM+Utrh z62@f0R|`GsrVV*Fasn!JKw`6rLwRfCtvD;q+%e+pXgorGTY{N2G(FO-H}UdW21`wg z=!f2^yFQ5#jTRvc&_bnm|C;giC^*ry^aQ8%b@y!1b}4$1ohI_7#=M?4TfmE=tWz}i z!S|+-0WfyV_`1U(v&ZEOwLZpH%}AJDw}E#%sztv?ixH*Mu}Q3Y#>{F-Zal>Wtn5g~ z&Ud`zW#R_B!2L6GlJsF)xf999(@IrFG1@1IC9w!t+tAo_70ejb|Ec$u*`wZQI7-{<2@R%Rn*>t;y<|IHh z>&e8RV?c`9<*w_W#5QAzHK%s2^6*?e8o+JKh<18a{Fj&Q1I;u7=w*iy$Sb{I!8~ovm%W8d~Bn7 zT7xY4FAHpP+A<#B{3O^GfiJE4k!V&Tfg}-#TqXL-C)_eq2 zQiFv`K0aeY+T&KuvXFNn<$j6t@h8e|!Mm$msd7sU70XHnYEgRUZnCBw*m5?Ie9t(&IEI8e4-h`ZKn=IcQ zW4cNohRrS8#4G@|DQ+cnRz1ZTL-er%W&2MVl)>u<@wjhDz8d?L&*t`I>>3Q}N$ze& zQ?A@Is06P9gVit?S@@@(VdIBFX1JM$a<@K1Y2l=j-<}iCf57{%`q~pHor1nMbG?GvxXgC~{;!uqqQ zn_uJmKKLoRHbW3`qWUU6HfRjaJUN;mdU1FJJ9>%I65QY0@7x*vWgUywzt_p@OS%^t z_H`yKT4nhC0a^I>$b8GB;I$sD9lypt+F^F)$|KD@t#p?hQw_Mf{_ieIuTAU3V42V@ U@^6^sLm6=RKYt^4cVA9t<0`s2LktoNMr?!BM= z?Dg)w-;B#nc6-0k{6;}RVeiEstgk32>;Nk$d=c^0F8K`2?G8#oLCgQ5^@Xdq{J0b0 zFV1>+X|L=*{KdZSkAA88mFic_!)3PLMeRJh^9kEq(Oc2zXu^drvoGxK*|C0S>q5=p zZ?eIzv4`w8zw@%%Tj}QWEka?pwf>G+71jFNVP9=17%s*jmV7jjyXHoQ|zD;#uYl@t`9!E(L+==fGaVO@Wxf&#(e3x)4^e^335#NV9w{}&3s zm$+7A{N7|SEo;Q?tzH`H>=dg1n+8V@Mtjz>k8k)9jJeCK1yEaMF0rlmdI`ujYf(yK zznE&oijHzacNJu|H+V6bWOo@;0xm)9}JCzu$_H?F4h5iSE=~6-jybBxgBavnC>UOt_ z6wXLvfK*6Kpl!*UU2Kp3EoJU+oCkj`nck>)Gn3Q77_2$uF;yQ0J}ArKEHidu5rK1j z&{gL}$d)Z)BCYd$x&*B^*jlHkCTt#5)EWS!EGm)_oFa;SG@sp03Oj~P7-8-^=v z2JgjsF0mI(bE09Qht(U|Wd{90_DRGB_lANGtP#lq_UxOyT)ch|ip1eQVMbRjg9{TP zCsG@>yajk#E@4V}z}vK}QPja%qiJsWV;&?0!ZD)Ft%Mr?f=-BIiftm%Z~S;#o8z~| z+5EdPFb@#uuD^Q^RZp8A6&nR-S;Z+syoH?E7mL7US3)_`7Y?X{zMD@D56Rft@`Nw$ zFQ#fh!VRa&w|q`Jc(Nep$An|`DdgAX8`laA%)qNo-x&k4>Ex}COYs|- zfaK1piM!LQsGR(0r2BhChO?tzIu=1h2@Dv;)!Ny@Nip|TZH|$}vvwq6k)}zm#Jq{V zmIBvEXrXb$Xj0ou6;<7xS3Bu~j#L2o5U}kIaKMlTYV`HCgP%9yH?!ugMjB<^8a0Yg zQPG-{$p3=$wO~XeeTLp0E#ZPp;@e~J?;kP>tEukPf*=>ompD5`IqhYuGPk7djcQ+h)8r zJjrd&+M2VXSmqq-YVOb#rO<0BQK$OHg)axkVdmaj=(I>)tFeFZRG}jX!#xJ0>qhcf zf4QuAL<3riOn~QoVGA`ZOnox?oN)b!ii7!EHMiWw?0BT5=E%mSwM#s8^GPD+L1wYk zDt+2ytuxqgx%6#v85SWEaj5c{AJKPj5CQouvC^w>ySAajcE#Os8~KjnLPn;2NAMZK zcI@cZ1G8JQ4+!0vY0{1CX)&WeojJ5{Xffi6N%Q{Vdmvwp1dBx=CcwCW9}-m%?doOg z0LYINymZffflrBQ7LK8FyMh8(V!c6iuedfcI@pIMP8&0JU~S`(UyMd*n1m^vK;viP zZZ37Q1zxkGht9QT(AQI4$6dI|?`TeI*4eYaH6?s~ILhqdu5-C9TuGpIY9hQiCv2e0 zTSzgsohxFH&~Rz46DEMG2P= zM$b!1731cY@e>yr zf&;Pd-?Ka7TGF(H!>ONlE$@Qs36{Shodu0)F&!KyhI)0hJEp#*4LqpdjzA>Br=C;Y zoxSoy^L#tDf(1?Tk3Ql!Vzp@B{7{bxV*77fKMEeFt#*7oGds$iowBc~5XE&=Ncn&6 zUfiGf)*bW1G!7fffF0=NRhzr3oaRQ5j#X3D?JiEYGXQs|M;ntH+qYiFb#Pu{BTqMY zYP4q7yQXyD(2i{*uZ=r6cd%zi&m^fgZ zG4L%KP4mYoObE5wujLW%Hzj83l&5J)53W-uLb|aMI z93oO*fKeV2xZoz1d&|EOj8cCHyUvcCnXmTu$q!ZU8SDS}s@v_hfm>=5c(6Xx=&Fj( zn*`bn2O3>H=|0hnv=aO#vNm^A3LWFxcR0qj$`L(<)&%(y@W`Z?U;vx84$U5U%eXzJ zCWz?;YbiY*3d3}QC+ahVCn=m>x1Tm4Jp{1+F|H{QM=ADiJ7`gfEBx6H@+GetXod+( zUw9RK{uH-q=9qf#kUrFQe%WvLO#C3fCevZ@kDg0Y{`IJofOcQ?4VDcox`bD-*^`lZ zqG8HMxST$%H2a#c&Z~A+5Fg5Jh`jzNwJ!yH3SeO9tf1E*%Kr6-W}X zDHUv)+}CsE3}F}V* zb606=5>oT)B@e9&7MO zSaq?Zb!#QXX>ADskrNCD${pm}#LEVzDxBl<7YH9LD)Wkz1cuc9xpdQd%Rg?=tt3&t zc<5-|IUJDeq7I{ZVQevNxg#>0-bMiSGP-%R(+Z_v_mt zX*mP@h`0~Lv{-VJ^fFOmF}nPcWYLfx9K#fqD;3pQeh8=Esb}+UCbzaHB4%j0Agamz znDeJ2CG2R!ZvP|bmDN!hfR0S zC~V{hKw#Rhe)QQ9v7e4LsmMlKW1&ktnVO! z{1MUHWS}ED;y<6~9y4_3P&2*8`Ko~q_uxLBUJ~ygmdq^oXsxx=_Toq64LLqG1Y`MC zsV>-u{8LO_VANIoCovYMmi_ewc?wOWNNmb2=aXDXZ{hvnOu4+I&m-q}ui&bIOzK>8^gj61tm%`dul=** z2X#<^+cW7FNXJz^H)C~un3^rI99=%&*H}>wbUz1uzw|Oha>RebU{TJ}5O~6sbPsB| z=m$8HQ>t#t8>;@~YM~sWPh%dC6QXf%lD0s8U;-IBmI-7r4)jLun>9%~0xC9hG@`a< z0Iv<0Q)k8}%44hZEc7e?+e_5;cPr+9-+|he@k$seHLN8gqG8dMV&Wr%F=tcWrwSK( zO8ZBViwd(SBtcJmj!^Cd9N>rVnG+QlsW%M?s%!K<*acKgDj%K8LYB;H_hpQulmod* zxLifT!Cij-#Ray&cgd!_nl32+d74NV-nG5b6T7sAA%Lfb4Lnl4Btwuj%<0IdQ#I1( z$nA)dJEK=Ag>D%CeAwG7rt=W5apldE{m`@esU@JSscL=DHsznP?-9$d*X?E#u>`wY z(toDLBF5gsck?ez!1HB=jEWjfJR^;N1qfR;a-|P?ygH0T+^vJ+|=DU$5W1GEvHBTytQJ*&P!a zgrxTSH&qpByTNn^nnV34FB@;0^sPAq5Q=d#oco+k4xW)=X7Y4{S7WC_3R0R|;s6)~Z91UAGrb{CXlf&| zwmWX7xatQ2l_z?^SrdBwTS8Oc&<`^AV%PEG*ilF+2`L$ivkR!39Kp+4c=GfraAL~a zJH?S|J=n^BGm@K{&z(P6OW=8%l9>)uWtU95ZuM3B-E;Is4* z)s8D0;ItqxIME=X_ynsvy}E`^K>@Atpvl)Z496i0L)-%dFA87B`J zOhb7{)$*nWTG=tqJ8&$hV(uj21ri1?E^D+Byyxg)b4)dR<$VEg6kT`_=q9-dUsTV_ zDxJj(wf8xaF4dJyu zz6FD)p4-f***QelPF_vHBS*l?JbTu2GCB+e?MpT-OH>M_uQj-iKMv43Ldk2vZHIj) zy9qb%ZgjD%26)6N=o{3j?XzRZ5N~*{gapHhj%smEe3dSxvfCxeILf)+&)Bi~DkVlL z(%HTwkUwGSCN1`mV`m)uM{j$bl8vvGO|l{AC+Q0iZ;7XuzjQpdcjF$#&iF%+DTyXj zd$=qsapaG4&Zkd%+Q#iD-zzBaq(BF^sc8$g6&{#Mzbk|`9MxEV*2YR>Q4O}cbQOJU zLwhejVjNPo`hcsiDZT~h&p>81pN}~(_iK~LkanS;=pN0&%S0O|@x(UgAGa+6Q$SvS z0d#O4V;*Mt?^OCv5cMFo!`1`I=39^DGZ9vvdcrN(01g{2yV)lo)(Sk-p|^x-#9GJS$UXhgoX=oF7_M z^a*QMNo@{a-i&C=-Y+nYznplH`qwT8Cl!9s3TEXx0k2H^K1`DVzoCOz?@< zgz{D%(eQ*-gfTnoX=jOfmA z_h(Hr-H6vD@nfuoNN?#C^5OVj8@ERrC%SO-ema1uXy1`K&1n|RiExUlY(tW(L-;Q< z1GYM)uUwCPUjbePqWFIvcfRTaVV@QPU!E3LC+YNw)+o}5ce z&7WIl8}zjAmaS$Q8PNqkEEGkL`_-0qjqLJxipC7KQeHQ0hMAPn!Q3~1hBn-RJO}pD z5AQm@u{&UwEqRuEhPLrv8Rd|_RG;s*Ex_b_p7t@ zQ)CLH>yJh?^s)I&d)8xT^)_4)nD?qyPp0k={uTR&6-_KaVi{>jrL8f|cBw1VQI)v6 z@b;Pey{9xw^EVD2S~Dq-F23C~*)Of4agONcbl)ILOcd~k{dd; z(s>bxnHc>#IYhvD+g7I9|3L6f<#UlJljDqDvN*-A?%7s42dt7qOn|##F z-$1je4CfwQ_&K)Bz%IR;j-|lB$(V6DHgHk;7z!=#y!xJ+H<_Sqgt;oO|8u987NMJh zOa|DUeO%lG<^~MprDoTAtXXQ1SBt<_c>1nT!4*w6&<>I)q bFNS9AygTc diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/windows/README.md b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/windows/README.md deleted file mode 100644 index 6b905ca1e..000000000 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/test/resources/windows/README.md +++ /dev/null @@ -1,7 +0,0 @@ - - -Windows test images - -So far nobody has recorded and checked any test images manually. - -The test case currently ignores image-compare tests on windows. \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/TerminalOutput.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/TerminalOutput.java deleted file mode 100644 index b0ee264a4..000000000 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/TerminalOutput.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.zos3270.internal.properties; - -import java.util.List; - -import dev.galasa.framework.spi.cps.CpsProperties; -import dev.galasa.zos3270.Zos3270ManagerException; - -/** - * The 3270 terminal outputs to store in the RAS. - *

      - *

      - * The property is:
      - *
      - * zos3270.terminal.output=json,png - *

      - *

      - * The default is json. - *

      - * - * - */ -public class TerminalOutput extends CpsProperties { - - public static List get() throws Zos3270ManagerException { - return getStringListWithDefault(Zos3270PropertiesSingleton.cps(), "json", "terminal", "output"); - } -} diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index cb7143652..c87f21433 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -44,13 +44,10 @@ import dev.galasa.zos3270.common.screens.TerminalField; import dev.galasa.zos3270.common.screens.TerminalImage; import dev.galasa.zos3270.common.screens.TerminalSize; -import dev.galasa.zos3270.common.screens.images.TerminalImageException; -import dev.galasa.zos3270.common.screens.images.TerminalImageTransform; import dev.galasa.zos3270.internal.properties.ApplyConfidentialTextFiltering; import dev.galasa.zos3270.internal.properties.LiveTerminalUrl; import dev.galasa.zos3270.internal.properties.LogConsoleTerminals; import dev.galasa.zos3270.internal.properties.TerminalDeviceTypes; -import dev.galasa.zos3270.internal.properties.TerminalOutput; public class Zos3270TerminalImpl extends Terminal implements IScreenUpdateListener { @@ -64,7 +61,6 @@ public class Zos3270TerminalImpl extends Terminal implements IScreenUpdateListen private final IConfidentialTextService cts; private final boolean applyCtf; - private final List terminalOutput; private final ArrayList cachedImages = new ArrayList<>(); @@ -78,7 +74,7 @@ public class Zos3270TerminalImpl extends Terminal implements IScreenUpdateListen /** * @deprecated use the {@link #Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFramework framework, boolean autoConnect, IZosImage image, TerminalSize primarySize, TerminalSize alternateSize, ITextScannerManagerSpi textScanner)} - * constructor instead. + * constructor instead. */ @Deprecated(since = "0.28.0", forRemoval = true) public Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFramework framework, boolean autoConnect, @@ -89,7 +85,7 @@ public Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFrame /** * @deprecated use the {@link #Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFramework framework, boolean autoConnect, IZosImage image, TerminalSize primarySize, TerminalSize alternateSize, ITextScannerManagerSpi textScanner)} - * constructor instead. + * constructor instead. */ @Deprecated(since = "0.28.0", forRemoval = true) public Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFramework framework, boolean autoConnect, @@ -103,7 +99,6 @@ public Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFrame this.autoConnect = autoConnect; this.cts = framework.getConfidentialTextService(); this.applyCtf = ApplyConfidentialTextFiltering.get(); - this.terminalOutput = TerminalOutput.get(); this.textScan = textScanner; getScreen().registerScreenUpdateListener(this); @@ -150,7 +145,6 @@ public Zos3270TerminalImpl(String id, String host, int port, boolean tls, IFrame this.autoConnect = autoConnect; this.cts = framework.getConfidentialTextService(); this.applyCtf = ApplyConfidentialTextFiltering.get(); - this.terminalOutput = TerminalOutput.get(); this.textScan = textScanner; getScreen().registerScreenUpdateListener(this); @@ -275,18 +269,7 @@ public synchronized void writeRasOutput() { rasTerminalSequence++; try { - for (String outputFormat : terminalOutput) { - switch (outputFormat.toLowerCase()) { - case "json": - writeTerminalGzJson(); - break; - case "png": - writeTerminalImages(); - break; - default: - throw new Zos3270ManagerException("Unknown output format: " + outputFormat); - } - } + writeTerminalGzJson(); } catch (Exception e) { logger.error("Unable to write terminal cache to the RAS", e); rasTerminalSequence--; @@ -294,56 +277,6 @@ public synchronized void writeRasOutput() { } } - - /** - * This method creates png images to represent the Terminal screens and writes them to the RAS - * @throws IOException - * @throws Zos3270ManagerException - */ - private synchronized void writeTerminalImages() throws IOException, Zos3270ManagerException { - - Screen screen = getScreen(); - - TerminalImageTransform imageRenderer ; - try { - IConfidentialTextService confidentialTextService = null; - if (applyCtf) { - confidentialTextService = cts; - } - TerminalSize termSize = new TerminalSize(screen.getNoOfColumns(), screen.getNoOfRows()); - imageRenderer = new TerminalImageTransform(termSize, confidentialTextService); - } catch ( TerminalImageException ex) { - throw new Zos3270ManagerException(ex); - } - - List terminalImages = this.cachedImages; - for (int i = 0; i < terminalImages.size(); i++) { - - TerminalImage sourceTerminalImage = terminalImages.get(i); - - writeImageToDisk(i,storedArtifactsRoot,imageRenderer, sourceTerminalImage); - } - } - - private void writeImageToDisk(int imageIndexNumber , Path storedArtifactsRoot, TerminalImageTransform imageRenderer, TerminalImage sourceTerminalImage) throws IOException { - // Prefixing images 1-9 with a 0 to ensure ordering is correct - String imageSequence = String.format("%02d", imageIndexNumber + 1); - - Path terminalImagesDirectory = storedArtifactsRoot.resolve("zos3270").resolve("images").resolve(this.terminalId); - String terminalFilename = this.terminalId + "-" + String.format("%05d", rasTerminalSequence) + "-" + imageSequence + ".png"; - Path terminalPath = terminalImagesDirectory.resolve(terminalFilename); - - try ( OutputStream outStream = Files.newOutputStream(terminalPath, - new SetContentType(ResultArchiveStoreContentType.PNG), - StandardOpenOption.CREATE); - ) { - - imageRenderer.writeImage(sourceTerminalImage, "png",outStream); - } - } - - - /** * This method creates JSON representations of the Terminal screens and writes them to the RAS * @throws IOException @@ -384,23 +317,23 @@ private synchronized void writeTerminalGzJson() throws IOException { } /** - * Creates a copy of the original TerminalImage, iterates through it's TerminalFields and FieldContents, - * and creates a new TerminalImage with confidential text removed. + * Creates a copy of the original TerminalImage, iterates through it's TerminalFields and FieldContents, + * and creates a new TerminalImage with confidential text removed. * @param terminalImage * @return */ private TerminalImage removeConfidentialTextFromTerminalImage(TerminalImage terminalImage){ // Create a new TerminalImage based on the one we are iterating on - TerminalImage newTerminalImage = new TerminalImage(terminalImage.getSequence(), terminalImage.getId(), - terminalImage.isInbound(), terminalImage.getType(), terminalImage.getAid(),terminalImage.getImageSize(), + TerminalImage newTerminalImage = new TerminalImage(terminalImage.getSequence(), terminalImage.getId(), + terminalImage.isInbound(), terminalImage.getType(), terminalImage.getAid(),terminalImage.getImageSize(), terminalImage.getCursorColumn(), terminalImage.getCursorRow()); - + for (TerminalField terminalField : terminalImage.getFields()){ // Create a new TerminalField based on the one we are iterating on - TerminalField newTerminalField = new TerminalField(terminalField.getRow(), terminalField.getColumn(), - terminalField.isUnformatted(), terminalField.isFieldProtected(), terminalField.isFieldNumeric(), - terminalField.isFieldDisplay(), terminalField.isFieldIntenseDisplay(), terminalField.isFieldSelectorPen(), + TerminalField newTerminalField = new TerminalField(terminalField.getRow(), terminalField.getColumn(), + terminalField.isUnformatted(), terminalField.isFieldProtected(), terminalField.isFieldNumeric(), + terminalField.isFieldDisplay(), terminalField.isFieldIntenseDisplay(), terminalField.isFieldSelectorPen(), terminalField.isFieldModifed(), terminalField.getForegroundColour(), terminalField.getBackgroundColour(), terminalField.getHighlight()); StringBuilder sb = new StringBuilder(); @@ -417,7 +350,7 @@ private TerminalImage removeConfidentialTextFromTerminalImage(TerminalImage term String fieldText = applyCtf ? cts.removeConfidentialText(sb.toString()) : sb.toString(); char[] fieldTextCharArray = fieldText.toCharArray(); - Character[] newArray = new Character[fieldTextCharArray.length]; + Character[] newArray = new Character[fieldTextCharArray.length]; for (int i = 0; i < fieldTextCharArray.length; i++){ newArray[i] = Character.valueOf(fieldTextCharArray[i]); } From 1a591461f2e2db842d39c0312515b55681e288dd Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Tue, 30 Jan 2024 14:46:09 +0000 Subject: [PATCH 158/263] created a more meaningful message for cicsterminal & cicsregion cicstag mismatch and tests Signed-off-by: Savvas Kyriacou --- .../cicsts/internal/CicstsManagerImpl.java | 14 +- .../internal/TestCicstsManagerImpl.java | 121 ++++++++++++++++++ 2 files changed, 128 insertions(+), 7 deletions(-) create mode 100644 galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/test/java/dev/galasa/cicsts/internal/TestCicstsManagerImpl.java diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java index 181b103ec..a91823646 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsManagerImpl.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.internal; import java.lang.annotation.Annotation; @@ -212,8 +212,8 @@ public ICicsTerminal generateCicsTerminal(Field field, List annotati ICicsRegionProvisioned region = this.provisionedCicsRegions.get(tag); if (region == null) { - throw new CicstsManagerException("Unable to setup CICS Terminal for field " + field.getName() - + ", tagged region " + tag + " was not provisioned"); + throw new CicstsManagerException("Unable to setup CICS Terminal for field '" + field.getName() + "', for region with tag '" + + tag + "' as a region with a matching 'cicsTag' tag was not found, or the region was not provisioned."); } try { diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/test/java/dev/galasa/cicsts/internal/TestCicstsManagerImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/test/java/dev/galasa/cicsts/internal/TestCicstsManagerImpl.java new file mode 100644 index 000000000..9d000765d --- /dev/null +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/test/java/dev/galasa/cicsts/internal/TestCicstsManagerImpl.java @@ -0,0 +1,121 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ +package dev.galasa.cicsts.internal; + +import static org.assertj.core.api.Assertions.*; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; + +import org.junit.Test; + +import dev.galasa.cicsts.CicsRegion; +import dev.galasa.cicsts.CicsTerminal; +import dev.galasa.cicsts.ICicsRegion; +import dev.galasa.cicsts.ICicsTerminal; +import dev.galasa.framework.Framework; +import dev.galasa.framework.spi.IManager; +import dev.galasa.framework.spi.language.GalasaTest; +import dev.galasa.framework.spi.language.gherkin.GherkinTest; +import dev.galasa.zos3270.spi.NetworkException; + +public class TestCicstsManagerImpl { + + private class MockGalasaTest extends GalasaTest{ + + public MockGalasaTest(GherkinTest test) { + super(test); + } + } + + private class DummyTestBad{ + + @CicsTerminal(cicsTag = "TERM01") + public ICicsTerminal terminal; + + @CicsRegion(cicsTag = "REGN01") + public ICicsRegion cicsRegion; + + } + + private class DummyTestGood{ + + @CicsTerminal(cicsTag = "REGN01") + public ICicsTerminal terminal; + + @CicsRegion(cicsTag = "REGN01") + public ICicsRegion cicsRegion; + + } + + private class mockCicstsManagerImpl extends CicstsManagerImpl{ + public mockCicstsManagerImpl() { + super(); + } + } + @Test + public void TestGenerateCicsTerminalBadReturnsError() throws Exception{ + // Given... + DummyTestBad dummyTest = new DummyTestBad(); + List managersList = new ArrayList(); + managersList.add(new CicstsManagerImpl()); + + GalasaTest test = new MockGalasaTest(null); + + Framework framework = new Framework(); + CicstsManagerImpl cicsTsManager = new mockCicstsManagerImpl(); + cicsTsManager.initialise(framework, managersList, managersList, test); + + Field terminal = dummyTest.getClass().getField("terminal"); + Field region = dummyTest.getClass().getField("cicsRegion"); + List annotations = new ArrayList<>(); + annotations.add(terminal.getAnnotation(CicsTerminal.class)); + annotations.add(region.getAnnotation(CicsRegion.class)); + + // When... + Throwable thrown = catchThrowable(() -> { + cicsTsManager.generateCicsTerminal(terminal, annotations); + }); + + // Then... + assertThat(thrown).isNotNull(); + String error = thrown.getMessage(); + String expectedError = "Unable to setup CICS Terminal for field 'terminal', for region with tag 'TERM01'"+ + " as a region with a matching 'cicsTag' tag was not found, or the region was not provisioned."; + assertThat(error).isEqualTo(expectedError); + + } + + @Test + public void TestGenerateCicsTerminalGoodReturnsOK() throws Exception{ + // Given... + DummyTestGood dummyTest = new DummyTestGood(); + List managersList = new ArrayList(); + managersList.add(new CicstsManagerImpl()); + + GalasaTest test = new MockGalasaTest(null); + + Framework framework = new Framework(); + CicstsManagerImpl cicsTsManager = new mockCicstsManagerImpl(); + cicsTsManager.initialise(framework, managersList, managersList, test); + Field field = dummyTest.getClass().getField("terminal"); + Field region = dummyTest.getClass().getField("cicsRegion"); + List annotations = new ArrayList<>(); + annotations.add(field.getAnnotation(CicsTerminal.class)); + annotations.add(region.getAnnotation(CicsRegion.class)); + + // When... + ICicsTerminal terminal = cicsTsManager.generateCicsTerminal(field, annotations); + + + // Then... + assertThat(terminal).isNotNull(); + + + } +} From 8cece6d2b55604dab92d74fe2fac43b7a2918e0f Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Tue, 30 Jan 2024 15:25:51 +0000 Subject: [PATCH 159/263] corrected test annotation implementation Signed-off-by: Savvas Kyriacou --- .../internal/TestCicstsManagerImpl.java | 39 +------------------ 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/test/java/dev/galasa/cicsts/internal/TestCicstsManagerImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/test/java/dev/galasa/cicsts/internal/TestCicstsManagerImpl.java index 9d000765d..2f75441e9 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/test/java/dev/galasa/cicsts/internal/TestCicstsManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/test/java/dev/galasa/cicsts/internal/TestCicstsManagerImpl.java @@ -22,7 +22,6 @@ import dev.galasa.framework.spi.IManager; import dev.galasa.framework.spi.language.GalasaTest; import dev.galasa.framework.spi.language.gherkin.GherkinTest; -import dev.galasa.zos3270.spi.NetworkException; public class TestCicstsManagerImpl { @@ -43,21 +42,12 @@ private class DummyTestBad{ } - private class DummyTestGood{ - - @CicsTerminal(cicsTag = "REGN01") - public ICicsTerminal terminal; - - @CicsRegion(cicsTag = "REGN01") - public ICicsRegion cicsRegion; - - } - private class mockCicstsManagerImpl extends CicstsManagerImpl{ public mockCicstsManagerImpl() { super(); } } + @Test public void TestGenerateCicsTerminalBadReturnsError() throws Exception{ // Given... @@ -91,31 +81,4 @@ public void TestGenerateCicsTerminalBadReturnsError() throws Exception{ } - @Test - public void TestGenerateCicsTerminalGoodReturnsOK() throws Exception{ - // Given... - DummyTestGood dummyTest = new DummyTestGood(); - List managersList = new ArrayList(); - managersList.add(new CicstsManagerImpl()); - - GalasaTest test = new MockGalasaTest(null); - - Framework framework = new Framework(); - CicstsManagerImpl cicsTsManager = new mockCicstsManagerImpl(); - cicsTsManager.initialise(framework, managersList, managersList, test); - Field field = dummyTest.getClass().getField("terminal"); - Field region = dummyTest.getClass().getField("cicsRegion"); - List annotations = new ArrayList<>(); - annotations.add(field.getAnnotation(CicsTerminal.class)); - annotations.add(region.getAnnotation(CicsRegion.class)); - - // When... - ICicsTerminal terminal = cicsTsManager.generateCicsTerminal(field, annotations); - - - // Then... - assertThat(terminal).isNotNull(); - - - } } From fae20dd302128e95a544b6938091f2ca4db03895 Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Tue, 30 Jan 2024 16:08:07 +0000 Subject: [PATCH 160/263] bumped version for cicsts manager Signed-off-by: Savvas Kyriacou --- .../dev.galasa.cicsts.manager/build.gradle | 2 +- release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle index 2a85c1122..7e623261b 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa CICS/TS Manager' -version = '0.30.0' +version = '0.31.0' dependencies { api project (':galasa-managers-zos-parent:dev.galasa.zos.manager') diff --git a/release.yaml b/release.yaml index 98c671c9f..8a1458784 100644 --- a/release.yaml +++ b/release.yaml @@ -32,7 +32,7 @@ managers: isolated: true - artifact: dev.galasa.cicsts.manager - version: 0.30.0 + version: 0.31.0 obr: true mvp: true javadoc: true From 8ac56eefef22ada7dfc9794a37b3e4d0e4034516 Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Tue, 30 Jan 2024 16:10:24 +0000 Subject: [PATCH 161/263] bumped version for cicsts manager Signed-off-by: Savvas Kyriacou --- .../dev.galasa.cicsts.manager/build.gradle | 2 +- release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle index 7e623261b..21bde66e4 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa CICS/TS Manager' -version = '0.31.0' +version = '0.32.0' dependencies { api project (':galasa-managers-zos-parent:dev.galasa.zos.manager') diff --git a/release.yaml b/release.yaml index 8a1458784..a5e49fb42 100644 --- a/release.yaml +++ b/release.yaml @@ -32,7 +32,7 @@ managers: isolated: true - artifact: dev.galasa.cicsts.manager - version: 0.31.0 + version: 0.32.0 obr: true mvp: true javadoc: true From b9891382c8bfd3dcb1c54998b405b7e2c3f2e1c0 Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Fri, 2 Feb 2024 10:43:17 +0000 Subject: [PATCH 162/263] updated Docker Manager to use GalasaGson Wrapper Signed-off-by: Savvas Kyriacou --- build-locally.sh | 2 +- .../dev.galasa.docker.manager/bnd.bnd | 1 + .../dev.galasa.docker.manager/build.gradle | 2 +- .../docker/internal/DockerContainerResourceMonitor.java | 5 ++--- .../java/dev/galasa/docker/internal/DockerExecImpl.java | 9 ++++----- release.yaml | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/build-locally.sh b/build-locally.sh index c8484c08d..e3c85caed 100755 --- a/build-locally.sh +++ b/build-locally.sh @@ -174,7 +174,7 @@ function build_code { -PsourceMaven=${SOURCE_MAVEN} ${OPTIONAL_DEBUG_FLAG} \ ${goals} " - + info "Using command: ${cmd}" $cmd 2>&1 > ${log_file} rc=$? ; if [[ "${rc}" != "0" ]]; then error "Failed to build ${project} see logs at ${log_file}" ; exit 1 ; fi diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/bnd.bnd index d08eb78ed..87225772a 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/bnd.bnd @@ -8,6 +8,7 @@ Import-Package: com.google.gson,\ dev.galasa.framework.spi.cps,\ dev.galasa.framework.spi.creds,\ dev.galasa.framework.spi.language,\ + dev.galasa.framework.spi.utils,\ dev.galasa.http,\ dev.galasa.http.spi,\ javax.validation.constraints;resolution:=optional,\ diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle index 8039fa35e..f2bf7b752 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Docker Manager' -version = '0.31.0' +version = '0.32.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerResourceMonitor.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerResourceMonitor.java index 9fd904b8c..25cb21e3d 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerResourceMonitor.java @@ -12,8 +12,6 @@ import java.util.List; import java.util.Map; -import com.google.gson.Gson; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -24,6 +22,7 @@ import dev.galasa.framework.spi.IDynamicStatusStoreService; import dev.galasa.framework.spi.IFramework; import dev.galasa.framework.spi.IResourceManagement; +import dev.galasa.framework.spi.utils.GalasaGson; import dev.galasa.http.HttpClientException; import dev.galasa.http.HttpClientResponse; import dev.galasa.http.IHttpClient; @@ -42,7 +41,7 @@ public class DockerContainerResourceMonitor implements Runnable { private final Log logger = LogFactory.getLog(DockerContainerResourceMonitor.class); - private Gson gson = new Gson(); + private GalasaGson gson = new GalasaGson(); private Map dockerEngines = new HashMap<>(); diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerExecImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerExecImpl.java index fc64c108d..c3f9c4ca1 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerExecImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerExecImpl.java @@ -13,9 +13,8 @@ import java.util.Arrays; import java.util.List; -import com.google.gson.Gson; + import com.google.gson.JsonObject; -import com.google.gson.JsonParser; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -23,6 +22,7 @@ import dev.galasa.docker.DockerManagerException; import dev.galasa.docker.IDockerExec; import dev.galasa.framework.spi.IFramework; +import dev.galasa.framework.spi.utils.GalasaGson; /** * DockerExecImpl. An object passed back used to monitor and control the exec process on a container. @@ -44,7 +44,7 @@ public class DockerExecImpl implements IDockerExec { private boolean finished; private final StringBuffer outputBuffer = new StringBuffer(); private long exitCode = -1; - private Gson gson = new Gson(); + private GalasaGson gson = new GalasaGson(); private static final Log logger = LogFactory.getLog(DockerExecImpl.class); @@ -70,10 +70,9 @@ public DockerExecImpl(IFramework framework, DockerManagerImpl dockerManager, Doc try{ ExecJson eJson = new ExecJson(false, true, true, true, this.commands); - JsonParser parser = new JsonParser(); String json = gson.toJson(eJson); - JsonObject cmd = (JsonObject)parser.parse(json); + JsonObject cmd = gson.fromJson(json, JsonObject.class); JsonObject response = dockerEngine.sendExecCommands(dockerContainer.getContainerId(), cmd); if(response == null){ diff --git a/release.yaml b/release.yaml index a5e49fb42..e1d4c7f52 100644 --- a/release.yaml +++ b/release.yaml @@ -148,7 +148,7 @@ managers: isolated: true - artifact: dev.galasa.docker.manager - version: 0.31.0 + version: 0.32.0 obr: true javadoc: true bom: true From cc586c5f558fec657ceb11a360837f6e5baa7527 Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Fri, 2 Feb 2024 13:17:01 +0000 Subject: [PATCH 163/263] udated Kubernetes manager to use GalasaGson Wrapper Signed-off-by: Savvas Kyriacou --- .../dev.galasa.kubernetes.manager/bnd.bnd | 1 + .../dev.galasa.kubernetes.manager/build.gradle | 2 +- .../internal/KubernetesClusterImpl.java | 18 +++++++++--------- .../manager/internal/OpenstackHttpClient.java | 6 ++---- .../internal/KubernetesEcosystemImpl.java | 5 ++--- .../internal/LocalEcosystemImpl.java | 5 ++--- 6 files changed, 17 insertions(+), 20 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd index 8744bbeb4..83496edd3 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd @@ -7,6 +7,7 @@ Import-Package: dev.galasa,\ dev.galasa.framework.spi.cps,\ dev.galasa.framework.spi.creds,\ dev.galasa.framework.spi.language,\ + dev.galasa.framework.spi.utils,\ dev.galasa.kubernetes,\ dev.galasa.cloud,\ dev.galasa.cloud.spi,\ diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle index 540240c81..f56980889 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Kubernetes Manager' -version = '0.29.0' +version = '0.32.0' dependencies { api project(':galasa-managers-cloud-parent:dev.galasa.cloud.manager') diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesClusterImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesClusterImpl.java index a8e2c398a..8aab9a791 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesClusterImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesClusterImpl.java @@ -19,7 +19,6 @@ import org.apache.commons.logging.LogFactory; import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import dev.galasa.ICredentials; import dev.galasa.ICredentialsToken; @@ -29,6 +28,7 @@ import dev.galasa.framework.spi.InsufficientResourcesAvailableException; import dev.galasa.framework.spi.creds.CredentialsException; import dev.galasa.framework.spi.creds.ICredentialsService; +import dev.galasa.framework.spi.utils.GalasaGsonBuilder; import dev.galasa.kubernetes.KubernetesManagerException; import dev.galasa.kubernetes.internal.properties.KubernetesCredentials; import dev.galasa.kubernetes.internal.properties.KubernetesMaxSlots; @@ -228,18 +228,18 @@ public synchronized ApiClient getApi() throws KubernetesManagerException { private static void applyNewGson(ApiClient apiClient) { JSON json = apiClient.getJSON(); - Gson gson = json.getGson(); + Gson existingGson = json.getGson(); - GsonBuilder newGsonBuilder = JSON.createGson(); - newGsonBuilder.registerTypeAdapter(OffsetDateTime.class, gson.getAdapter(OffsetDateTime.class)); - newGsonBuilder.registerTypeAdapter(Date.class, gson.getAdapter(Date.class)); - newGsonBuilder.registerTypeAdapter(java.sql.Date.class, gson.getAdapter(java.sql.Date.class)); - newGsonBuilder.registerTypeAdapter(byte[].class, gson.getAdapter(byte[].class)); + // This section has not been incorporated into the GalasaGsonWrapper as it involves kubernetes packages and + GalasaGsonBuilder newGsonBuilder = new GalasaGsonBuilder(); + newGsonBuilder.registerTypeAdapter(OffsetDateTime.class, existingGson.getAdapter(OffsetDateTime.class)); + newGsonBuilder.registerTypeAdapter(Date.class, existingGson.getAdapter(Date.class)); + newGsonBuilder.registerTypeAdapter(java.sql.Date.class, existingGson.getAdapter(java.sql.Date.class)); + newGsonBuilder.registerTypeAdapter(byte[].class, existingGson.getAdapter(byte[].class)); newGsonBuilder.registerTypeAdapter(Quantity.class, new Quantity.QuantityAdapter()); newGsonBuilder.registerTypeAdapter(IntOrString.class, new IntOrString.IntOrStringAdapter()); - Gson newGson = newGsonBuilder.create(); - json.setGson(newGson); + json.setGson(newGsonBuilder.getGson()); } /** diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java index 5707b3619..46a3158d3 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java @@ -26,13 +26,11 @@ import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - import dev.galasa.ICredentials; import dev.galasa.ICredentialsUsernamePassword; import dev.galasa.framework.spi.ConfigurationPropertyStoreException; import dev.galasa.framework.spi.IFramework; +import dev.galasa.framework.spi.utils.GalasaGson; import dev.galasa.openstack.manager.OpenstackManagerException; import dev.galasa.openstack.manager.internal.json.Api; import dev.galasa.openstack.manager.internal.json.Auth; @@ -78,7 +76,7 @@ public class OpenstackHttpClient { private String openstackComputeUri; private String openstackNetworkUri; - private Gson gson = new GsonBuilder().setPrettyPrinting().create(); + private GalasaGson gson = new GalasaGson(); protected OpenstackHttpClient(IFramework framework) throws ConfigurationPropertyStoreException { this.framework = framework; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/KubernetesEcosystemImpl.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/KubernetesEcosystemImpl.java index 0534f689f..ea7392b96 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/KubernetesEcosystemImpl.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/KubernetesEcosystemImpl.java @@ -35,7 +35,6 @@ import org.apache.commons.logging.LogFactory; import org.yaml.snakeyaml.Yaml; -import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject; @@ -49,7 +48,7 @@ import dev.galasa.framework.spi.IFramework; import dev.galasa.framework.spi.IRun; import dev.galasa.framework.spi.InsufficientResourcesAvailableException; -import dev.galasa.framework.spi.utils.GalasaGsonBuilder; +import dev.galasa.framework.spi.utils.GalasaGson; import dev.galasa.galasaecosystem.EcosystemEndpoint; import dev.galasa.galasaecosystem.GalasaEcosystemManagerException; import dev.galasa.galasaecosystem.IKubernetesEcosystem; @@ -91,7 +90,7 @@ public class KubernetesEcosystemImpl extends AbstractEcosystemImpl implements IK private final Yaml yaml = new Yaml(); - private final Gson gson = GalasaGsonBuilder.build(); + private final GalasaGson gson = new GalasaGson(); private String dockerVersion; private String dockerRegistry; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalEcosystemImpl.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalEcosystemImpl.java index c7dbc34ae..41b7f550c 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalEcosystemImpl.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalEcosystemImpl.java @@ -34,7 +34,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.http.client.methods.CloseableHttpResponse; -import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSyntaxException; @@ -47,7 +46,7 @@ import dev.galasa.framework.spi.ConfigurationPropertyStoreException; import dev.galasa.framework.spi.IFramework; import dev.galasa.framework.spi.InsufficientResourcesAvailableException; -import dev.galasa.framework.spi.utils.GalasaGsonBuilder; +import dev.galasa.framework.spi.utils.GalasaGson; import dev.galasa.galasaecosystem.EcosystemEndpoint; import dev.galasa.galasaecosystem.GalasaEcosystemManagerException; import dev.galasa.galasaecosystem.ILocalEcosystem; @@ -95,7 +94,7 @@ public abstract class LocalEcosystemImpl extends AbstractEcosystemImpl implement private SimPlatformInstance simPlatformInstance; - private final Gson gson = GalasaGsonBuilder.build(); + private final GalasaGson gson = new GalasaGson(); private final ArrayList localRuns = new ArrayList<>(); From 89b5d0b6cb1f077229d0e75a03e9f7c56857800b Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Fri, 2 Feb 2024 13:33:48 +0000 Subject: [PATCH 164/263] udated GalsaEcosystem manager to use GalasaGson Wrapper Signed-off-by: Savvas Kyriacou --- .../openstack/manager/internal/OpenstackManagerImpl.java | 6 +++--- .../src/main/java/dev/galasa/http/HttpClientResponse.java | 4 ++-- .../internal/GalasaEcosystemManagerImpl.java | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackManagerImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackManagerImpl.java index 4097363d6..472596e15 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackManagerImpl.java @@ -20,7 +20,6 @@ import org.osgi.service.component.annotations.Component; import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import dev.galasa.ManagerException; import dev.galasa.framework.spi.AbstractManager; @@ -37,6 +36,7 @@ import dev.galasa.framework.spi.InsufficientResourcesAvailableException; import dev.galasa.framework.spi.ResourceUnavailableException; import dev.galasa.framework.spi.language.GalasaTest; +import dev.galasa.framework.spi.utils.GalasaGson; import dev.galasa.ipnetwork.spi.IIpNetworkManagerSpi; import dev.galasa.linux.LinuxManagerException; import dev.galasa.linux.OperatingSystem; @@ -73,7 +73,7 @@ public class OpenstackManagerImpl extends AbstractManager implements ILinuxProvi private CloseableHttpClient httpClient; private OpenstackHttpClient openstackHttpClient; - private Gson gson = new GsonBuilder().setPrettyPrinting().create(); + private GalasaGson gson = new GalasaGson(); /* * (non-Javadoc) @@ -408,7 +408,7 @@ public IDynamicStatusStoreService getDSS() { } protected Gson getGson() { - return this.gson; + return this.gson.getGson(); } protected IIpNetworkManagerSpi getIpNetworkManager() { diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java index 76f9380bf..bde13ac55 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java @@ -24,7 +24,6 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSyntaxException; @@ -32,6 +31,7 @@ import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBException; +import dev.galasa.framework.spi.utils.GalasaGson; /** * Parametrisable representation of a response to an HTTP request. The parameter * describes the content type of the response. Use the static methods to create @@ -277,7 +277,7 @@ public static HttpClientResponse jsonResponse(CloseableHttpResponse // JsonReader reader = new JsonReader(new InputStreamReader(httpResponse.getEntity().getContent())); JsonElement jsonElement = null; try{ - jsonElement = new Gson().fromJson(sResponse, JsonElement.class); + jsonElement = new GalasaGson().fromJson(sResponse, JsonElement.class); }catch(JsonSyntaxException jse){ System.err.println("Unable to parse JSON from the following: " + sResponse); throw jse; diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/GalasaEcosystemManagerImpl.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/GalasaEcosystemManagerImpl.java index 5235a1cb9..9fe8c9be8 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/GalasaEcosystemManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/GalasaEcosystemManagerImpl.java @@ -37,6 +37,7 @@ import dev.galasa.framework.spi.ResourceUnavailableException; import dev.galasa.framework.spi.SharedEnvironmentRunType; import dev.galasa.framework.spi.language.GalasaTest; +import dev.galasa.framework.spi.utils.GalasaGson; import dev.galasa.galasaecosystem.GalasaEcosystemManagerException; import dev.galasa.galasaecosystem.GalasaEcosystemManagerField; import dev.galasa.galasaecosystem.IKubernetesEcosystem; @@ -77,7 +78,7 @@ public class GalasaEcosystemManagerImpl extends AbstractManager implements ILogg public final static String NAMESPACE = "galasaecosystem"; private final Log logger = LogFactory.getLog(getClass()); private IDynamicStatusStoreService dss; - private final Gson gson = new Gson(); + private final GalasaGson gson = new GalasaGson(); private IArtifactManager artifactManager; private IHttpManagerSpi httpManager; @@ -551,7 +552,7 @@ protected IWindowsManagerSpi getWindowsManager() { } public Gson getGson() { - return this.gson; + return this.gson.getGson(); } public IDynamicStatusStoreService getDss() { From 0658bb737333c26426bbc6879280bb923b69e718 Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Fri, 2 Feb 2024 14:49:32 +0000 Subject: [PATCH 165/263] udated zos3270 manager to use GalasaGson Wrapper Signed-off-by: Savvas Kyriacou --- .../internal/KubernetesClusterImpl.java | 18 ++++++++++-------- .../dev.galasa.http.manager/build.gradle | 2 +- .../internal/ElasticLogManagerImpl.java | 4 ++-- .../build.gradle | 2 +- .../dev.galasa.zos3270.common/build.gradle | 3 ++- .../screens/json/TerminalJsonTransform.java | 8 ++------ .../zos3270/spi/Zos3270TerminalImpl.java | 5 ++--- 7 files changed, 20 insertions(+), 22 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesClusterImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesClusterImpl.java index 8aab9a791..3eebd64f3 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesClusterImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesClusterImpl.java @@ -230,14 +230,16 @@ private static void applyNewGson(ApiClient apiClient) { JSON json = apiClient.getJSON(); Gson existingGson = json.getGson(); - // This section has not been incorporated into the GalasaGsonWrapper as it involves kubernetes packages and - GalasaGsonBuilder newGsonBuilder = new GalasaGsonBuilder(); - newGsonBuilder.registerTypeAdapter(OffsetDateTime.class, existingGson.getAdapter(OffsetDateTime.class)); - newGsonBuilder.registerTypeAdapter(Date.class, existingGson.getAdapter(Date.class)); - newGsonBuilder.registerTypeAdapter(java.sql.Date.class, existingGson.getAdapter(java.sql.Date.class)); - newGsonBuilder.registerTypeAdapter(byte[].class, existingGson.getAdapter(byte[].class)); - newGsonBuilder.registerTypeAdapter(Quantity.class, new Quantity.QuantityAdapter()); - newGsonBuilder.registerTypeAdapter(IntOrString.class, new IntOrString.IntOrStringAdapter()); + /* This section has not been incorporated into the GalasaGsonWrapper as it involves kubernetes packages + * and would result in a circullar refernce. + */ + GalasaGsonBuilder newGsonBuilder = new GalasaGsonBuilder() + .registerTypeAdapter(OffsetDateTime.class, existingGson.getAdapter(OffsetDateTime.class)) + .registerTypeAdapter(Date.class, existingGson.getAdapter(Date.class)) + .registerTypeAdapter(java.sql.Date.class, existingGson.getAdapter(java.sql.Date.class)) + .registerTypeAdapter(byte[].class, existingGson.getAdapter(byte[].class)) + .registerTypeAdapter(Quantity.class, new Quantity.QuantityAdapter()) + .registerTypeAdapter(IntOrString.class, new IntOrString.IntOrStringAdapter()); json.setGson(newGsonBuilder.getGson()); } diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle index 4019bfd2a..e17d2592c 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'HTTP Manager' -version = '0.31.0' +version = '0.32.0' dependencies { api 'org.apache.httpcomponents:httpclient-osgi:4.5.13' diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/ElasticLogManagerImpl.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/ElasticLogManagerImpl.java index cfdf0943e..a818d7ea9 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/ElasticLogManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/ElasticLogManagerImpl.java @@ -20,7 +20,6 @@ import org.osgi.service.component.annotations.Component; import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; import dev.galasa.ICredentials; @@ -40,6 +39,7 @@ import dev.galasa.framework.spi.creds.CredentialsException; import dev.galasa.framework.spi.creds.ICredentialsService; import dev.galasa.framework.spi.language.GalasaTest; +import dev.galasa.framework.spi.utils.GalasaGsonBuilder; import dev.galasa.http.HttpClientException; import dev.galasa.http.HttpClientResponse; import dev.galasa.http.IHttpClient; @@ -204,7 +204,7 @@ public void testClassResult(@NotNull String finalResult, Throwable finalExceptio this.runProperties.put("tags", tags.toArray(new String[tags.size()])); //Convert HashMap of run properties to a Json String - Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").create(); + Gson gson = new GalasaGsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").getGson(); JsonObject json = gson.toJsonTree(this.runProperties).getAsJsonObject(); logger.info("Sending Run Request to ElasticLog Endpoint"); diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle index c289791a1..88613037a 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Ecosystem Manager' -version = '0.31.0' +version = '0.32.0' dependencies { implementation 'commons-io:commons-io:2.9.0' diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle index 924fb2d86..441394474 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS 3270 Terminal Manager - Common Packages' -version = '0.31.0' +version = '0.32.0' dependencies { implementation 'com.google.code.gson:gson:2.10.1' @@ -22,3 +22,4 @@ ext.includeInBOM = false ext.includeInIsolated = true ext.includeInCodeCoverage = false ext.includeInJavadoc = true + diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/json/TerminalJsonTransform.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/json/TerminalJsonTransform.java index a238c07c7..3b5af677a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/json/TerminalJsonTransform.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/json/TerminalJsonTransform.java @@ -7,9 +7,9 @@ import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; +import dev.galasa.framework.spi.utils.GalasaGsonBuilder; import dev.galasa.zos3270.common.screens.Terminal; /** @@ -20,11 +20,7 @@ public class TerminalJsonTransform { private Gson gson ; public TerminalJsonTransform( boolean isPrettyPrinting ) { - if( isPrettyPrinting ) { - this.gson = new GsonBuilder().setPrettyPrinting().create(); - } else { - this.gson = new GsonBuilder().create(); - } + this.gson = new GalasaGsonBuilder(isPrettyPrinting).getGson(); } public JsonObject toJsonObject(Terminal terminal) { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java index c87f21433..d7d9b32e7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Zos3270TerminalImpl.java @@ -22,8 +22,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -33,6 +31,7 @@ import dev.galasa.SetContentType; import dev.galasa.framework.spi.IConfidentialTextService; import dev.galasa.framework.spi.IFramework; +import dev.galasa.framework.spi.utils.GalasaGson; import dev.galasa.textscan.spi.ITextScannerManagerSpi; import dev.galasa.zos.IZosImage; import dev.galasa.zos.ZosManagerException; @@ -53,7 +52,7 @@ public class Zos3270TerminalImpl extends Terminal implements IScreenUpdateListen private Log logger = LogFactory.getLog(getClass()); - private final Gson gson = new GsonBuilder().setPrettyPrinting().create(); + private final GalasaGson gson = new GalasaGson(); private final String terminalId; private int updateId; From f57d737305b007561980909fb2991f74a7735bea Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Fri, 2 Feb 2024 14:57:04 +0000 Subject: [PATCH 166/263] bumped versions of managers Signed-off-by: Savvas Kyriacou --- .../dev.galasa.openstack.manager/build.gradle | 2 +- .../dev.galasa.elasticlog.manager/build.gradle | 2 +- .../dev.galasa.zos3270.manager/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle index 4bd34b5b3..3298b6e95 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Openstack Manager' -version = '0.31.0' +version = '0.32.0' dependencies { api project(':galasa-managers-comms-parent:dev.galasa.ipnetwork.manager') diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle index aab1c6279..0f6055e34 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa ElasticLog Manager' -version = '0.31.0' +version = '0.32.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle index 198329b1a..bac5ea090 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS 3270 Terminal Manager' -version = '0.31.0' +version = '0.32.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zos3270.common') From 06b3eb72548b672048bc34b43cc0a0252d630849 Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Fri, 2 Feb 2024 15:01:01 +0000 Subject: [PATCH 167/263] bumped versions of release.yaml Signed-off-by: Savvas Kyriacou --- release.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/release.yaml b/release.yaml index e1d4c7f52..5b1033a65 100644 --- a/release.yaml +++ b/release.yaml @@ -163,7 +163,7 @@ managers: isolated: true - artifact: dev.galasa.elasticlog.manager - version: 0.31.0 + version: 0.32.0 obr: true bom: true isolated: true @@ -175,7 +175,7 @@ managers: isolated: true - artifact: dev.galasa.galasaecosystem.manager - version: 0.31.0 + version: 0.32.0 obr: true bom: true isolated: true @@ -194,7 +194,7 @@ managers: isolated: false - artifact: dev.galasa.http.manager - version: 0.31.0 + version: 0.32.0 obr: true javadoc: true bom: true @@ -255,7 +255,7 @@ managers: isolated: true - artifact: dev.galasa.kubernetes.manager - version: 0.29.0 + version: 0.32.0 obr: true javadoc: true bom: true @@ -305,7 +305,7 @@ managers: isolated: true - artifact: dev.galasa.openstack.manager - version: 0.31.0 + version: 0.32.0 obr: true javadoc: true bom: true @@ -489,7 +489,7 @@ managers: codecoverage: true - artifact: dev.galasa.zos3270.common - version: 0.31.0 + version: 0.32.0 obr: true bom: true mvp: true @@ -497,7 +497,7 @@ managers: codecoverage: true - artifact: dev.galasa.zos3270.manager - version: 0.31.0 + version: 0.32.0 obr: true javadoc: true bom: true From bab1598d018b445dea5e1b6ced1867d6780b186c Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Tue, 6 Feb 2024 14:27:38 +0000 Subject: [PATCH 168/263] Managers README updated with managers tesitng and doc levels Signed-off-by: Jade Carino --- README.md | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 96 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 781a68ad1..025d4670b 100644 --- a/README.md +++ b/README.md @@ -5,32 +5,124 @@ Managers are grouped by type within the parent folder, for example, the "galasa- Each Manager comes with its own set of associated IVT tests and Javadoc. We're adding new Manager every month. Look at the [summary table of Managers](https://galasa.dev/docs/managers/) for a list of available and planned Managers and to find out what they do. -## Contributing +## Contributing If you are interested in the development of Galasa, take a look at the documentation and feel free to post a question on the Galasa Slack channel, or start sharing usage and development experiences with other Galasa users and the IBM team. You can also raise new ideas / features / bugs etc. as issues on [GitHub](https://github.com/galasa-dev/projectmanagement). Take a look at the [contribution guidelines](https://github.com/galasa-dev/projectmanagement/blob/main/contributing.md). ## Documentation - More information can be found on the [Galasa Homepage](https://galasa.dev). Questions related to the usage of Galasa can be posted on the [Galasa Slack channel](https://galasa.slack.com). -## Where can I get the latest release? +## Where can I get the latest release? Find out how to install the Galasa Eclipse plug-in from our [Installing the Galasa plug-in](https://galasa.dev/docs/getting-started/installing) documentation. Other Galasa repositories are available on [GitHub](https://github.com/galasa-dev). -## License +## License This code is under the [Eclipse Public License 2.0](https://github.com/galasa-dev/maven/blob/main/LICENSE). + ## Building locally Use the `./build-locally.sh` script to build locally. + ## Updating the versions of things Use the `./build-release-yaml.sh` script to scan the contents of the managers source code and populate the `release.yaml` file with version information taken from each manager source folder. +## Manager testing and documentation levels +Below is a table with the currently available Galasa Managers as seen documented on galasa.dev or visible on Maven Central, the level at which they were tested/are being tested, and the readiness indicator as described on the Galasa website. + +**Manager readiness indicator:** + +- Alpha: This Manager is being actively developed. It is subject to change and has not been extensively tested. +- Beta: This Manager is almost ready. It has been tested and the TPI is stable, but there may be minor changes to come. +- Release: This Manager is feature complete, has passed all tests and is deemed release grade. + +**Manager testing levels:** + +- Local: This Manager has been tested in a local Galasa Ecosystem +- Isolated: This Manager has been tested in a Galasa Ecosystem with the Galasa Isolated configuration. +- MVP: This Manager has been tested in a Galasa Ecosystem with the Galasa MVP configuration as it is shipped as part of the MVP. +- IVT: This Manager has been tested locally during development. +- Other Managers: This Manager does not have its own test but is used for the provisioning of other tests. + + +**Managers documented on galasa.dev:** +| Manager | Level of testing | Documented | +| --- | --- | --- | +| CICSTS Managers || +| CICSTS CECI | CECIManagerIVT ran in a Local and Isolated Ecosystem | Release | +| CICSTS CEDA | CedaManagerIVT ran in a Local and Isolated Ecosystem | Alpha | +| CICSTS CEMT | CEMTManagerIVT ran in a Local and Isolated Ecosystem | Alpha | +| CICSTS | CICSTSManagerIVT ran in a ran in a Local and Isolated Ecosystem | Alpha | +| Cloud Managers || +| Docker | DockerManagerIVT ran in a Local Ecosystem | Release | +| Kubernetes | KubernetesManagerIVT ran locally during development | Alpha | +| OpenStack | Other Managers | Alpha | +| Communication Managers || +| HTTP | HttpManagerIVT ran in a Local Ecosystem | Release | +| IP Network | Other Managers | Alpha | +| MQ | MqManagerIVT ran locally during development | Alpha | +| Core Managers || +| Artifact | ArtifactManagerIVT ran in a Local, Isolated and MVP Ecosystem | Release | +| Core | CoreManagerIVT ran in a Local, Isolated and MVP Ecosystem | Release | +| Logging Managers || +| Elastic Log | - | Alpha | +| Ecosystem Managers || +| Galasa Ecosystem | Other Managers | Alpha | +| Test Tool Managers || +| JMeter | JMeterManagerIVT ran locally during development | Beta | +| Selenium | SeleniumManagerIVT ran locally during development | Beta | +| Unix Managers || +| Linux | LinuxManagerIVT ran locally during development / Other Managers | Alpha | +| Workflow Managers || +| GitHub Issue | Other Managers (Adhoc) | Release | +| z/OS Managers || +| RSE API | - | Alpha | +| z/OS 3270 | Zos3270IVT ran in a Local Ecosystem | Beta | +| z/OS Batch z/OS MF | ZosManagerBatchIVT ran in a Local, Isolated and MVP Ecosystem with overrides = "zos.bundle.extra.batch.manager": "dev.galasa.zosbatch.rseapi.manager" | Beta | +| z/OS Batch RSE API | ZosManagerBatchIVT ran in a Local, Isolated and MVP Ecosystem with overrides = "zos.bundle.extra.batch.manager": "dev.galasa.zosbatch.zosmf.manager" | Alpha | +| z/OS Console OE Console | - | Alpha | +| z/OS Console z/OS MF | - | Beta | +| z/OS File RSE API | ZosManagerFileIVT, ZosManagerFileDatasetIVT and ZosManagerFileVSAMIVT ran in a Local, Isolated and MVP Ecosystem with overrides = "zos.bundle.extra.file.manager": "dev.galasa.zosfile.rseapi.manager" | Alpha | +| z/OS File z/OS MF | ZosManagerFileIVT, ZosManagerFileDatasetIVT and ZosManagerFileVSAMIVT ran in a Local, Isolated and MVP Ecosystem with overrides = "zos.bundle.extra.file.manager": "dev.galasa.zosfile.zosmf.manager" | Beta | +| z/OS | ZosManagerIVT ran in a Local, Isolated and MVP Ecosystem | Beta | +| z/OS MF | Other Managers | Beta | +| z/OS Program | Other Managers (CECI) | Alpha | +| z/OS TSO Command SSH Manager | ZosManagerTSOCommandIVT ran in a Local, Isolated and MVP Ecosystem | Alpha | +| z/OS Unix Command SSH Manager | Other Managers | Alpha | + +ZosManagerFileVSAMIVT + +**Managers documented as 'Future Managers' on galasa.dev but already released on Maven Central:** +| Manager | Progress | +| --- | --- | +| Liberty v0.21.0 | Empty interfaces but nothing implemented | +| Windows v0.21.0 | Minimal implementation | + + +**Managers not documented on galasa.dev but already released on Maven Central:** +| Manager | Level of testing | +| --- | --- | +| CICSTS Resource | - | +| Cloud | - | +| DB2 | Db2ManagerIVT ran locally during development | +| Eclipse Runtime | - | +| Eclipse Runtime Ubuntu | - | +| Java | - | +| Java Ubuntu | Other Managers | +| Java Windows | - | +| Text Scan | Other Managers | +| z/OS Liberty Angel | - | +| z/OS Liberty | - | +| z/OS Security | - | +**Managers set to be removed from Open Source Galasa:** +* Phoenix +* SEM +* VTP From 61d29aefd2f9e68545263ffbb8534fa9cea56564 Mon Sep 17 00:00:00 2001 From: Fiona Ampofo <64271621+Akyiaa@users.noreply.github.com> Date: Wed, 7 Feb 2024 13:46:40 +0000 Subject: [PATCH 169/263] changed javadoc comments and default reg to harbor.galasa.dev Signed-off-by: Fiona Ampofo <64271621+Akyiaa@users.noreply.github.com> --- .../galasaecosystem/internal/properties/DockerRegistry.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/DockerRegistry.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/DockerRegistry.java index e3454f276..d5a7767b3 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/DockerRegistry.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/DockerRegistry.java @@ -21,12 +21,12 @@ * * @galasa.required No * - * @galasa.default docker.galasa.dev + * @galasa.default harbor.galasa.dev * * @galasa.valid_values a valid hostname * * @galasa.examples - * galasaecosystem.docker.version=docker.galasa.dev + * galasaecosystem.docker.version=harbor.galasa.dev * */ public class DockerRegistry extends CpsProperties { @@ -35,7 +35,7 @@ public static String get() throws GalasaEcosystemManagerException { try { String version = getStringNulled(GalasaEcosystemPropertiesSingleton.cps(), "docker", "registry") ; if (version == null) { - return "docker.galasa.dev"; + return "harbor.galasa.dev"; } return version; } catch (ConfigurationPropertyStoreException e) { From 80b0629c7cf75d3af4412d95cf5dfda464c7a3bd Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Tue, 13 Feb 2024 17:30:42 +0000 Subject: [PATCH 170/263] Correction to README Signed-off-by: Jade Carino --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 025d4670b..8aa72b276 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,6 @@ Below is a table with the currently available Galasa Managers as seen documented | z/OS TSO Command SSH Manager | ZosManagerTSOCommandIVT ran in a Local, Isolated and MVP Ecosystem | Alpha | | z/OS Unix Command SSH Manager | Other Managers | Alpha | -ZosManagerFileVSAMIVT **Managers documented as 'Future Managers' on galasa.dev but already released on Maven Central:** | Manager | Progress | From a8d525ea19d4ba5972f21a53f1cae065c5ef2b30 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Fri, 16 Feb 2024 11:33:42 +0000 Subject: [PATCH 171/263] Added spi.utils package as bundle import to http manager as showing as NoClassDefError Signed-off-by: Jade Carino --- .../galasa-managers-comms-parent/dev.galasa.http.manager/bnd.bnd | 1 + 1 file changed, 1 insertion(+) diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/bnd.bnd index 4b88b50e1..5ffc885ff 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/bnd.bnd @@ -5,6 +5,7 @@ Import-Package: com.google.gson,\ dev.galasa,\ dev.galasa.framework.spi,\ dev.galasa.framework.spi.language,\ + dev.galasa.framework.spi.utils,\ dev.galasa.http.spi,\ dev.galasa.common,\ javax.net.ssl,\ From c72600506bba226016657d1cdf3973e3d4d100fd Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Fri, 16 Feb 2024 14:41:07 +0000 Subject: [PATCH 172/263] get local builds working again after gson failures Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- build-locally.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/build-locally.sh b/build-locally.sh index e3c85caed..2d3452950 100755 --- a/build-locally.sh +++ b/build-locally.sh @@ -126,7 +126,7 @@ fi # Over-rode SOURCE_MAVEN if you want to build from a different maven repo... if [[ -z ${SOURCE_MAVEN} ]]; then - export SOURCE_MAVEN=https://development.galasa.dev/main/maven-repo/obr/ + export SOURCE_MAVEN=https://development.galasa.dev/main/maven-repo/extensions/ info "SOURCE_MAVEN repo defaulting to ${SOURCE_MAVEN}." info "Set this environment variable if you want to over-ride this value." else @@ -168,12 +168,20 @@ function build_code { goals="build buildReleaseYaml check publishToMavenLocal --parallel" fi + # The build process does this: + # gradle --no-daemon \ + # --console plain \ + # -PsourceMaven=https://development.galasa.dev/main/maven-repo/extensions \ + # -PcentralMaven=https://repo.maven.apache.org/maven2/ \ + # -PtargetMaven=../repo check publish --info + cmd="gradle \ ${CONSOLE_FLAG} \ -Dorg.gradle.java.home=${JAVA_HOME} \ -PsourceMaven=${SOURCE_MAVEN} ${OPTIONAL_DEBUG_FLAG} \ ${goals} " + info "Using command: ${cmd}" $cmd 2>&1 > ${log_file} From 8e67b0fac6e6707c1df4257d17b697bd283dbb53 Mon Sep 17 00:00:00 2001 From: Fiona Ampofo <64271621+Akyiaa@users.noreply.github.com> Date: Mon, 19 Feb 2024 09:47:55 +0000 Subject: [PATCH 173/263] changing docker registry reference to docker proxy cache in harbor Signed-off-by: Fiona Ampofo <64271621+Akyiaa@users.noreply.github.com> --- .../galasaecosystem/internal/properties/DockerRegistry.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/DockerRegistry.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/DockerRegistry.java index d5a7767b3..51b349dd0 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/DockerRegistry.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/DockerRegistry.java @@ -21,12 +21,12 @@ * * @galasa.required No * - * @galasa.default harbor.galasa.dev + * @galasa.default harbor.galasa.dev/docker_proxy_cache * * @galasa.valid_values a valid hostname * * @galasa.examples - * galasaecosystem.docker.version=harbor.galasa.dev + * galasaecosystem.docker.version=harbor.galasa.dev/docker_proxy_cache * */ public class DockerRegistry extends CpsProperties { @@ -35,7 +35,7 @@ public static String get() throws GalasaEcosystemManagerException { try { String version = getStringNulled(GalasaEcosystemPropertiesSingleton.cps(), "docker", "registry") ; if (version == null) { - return "harbor.galasa.dev"; + return "harbor.galasa.dev/docker_proxy_cache"; } return version; } catch (ConfigurationPropertyStoreException e) { From 75601d12edaf47afce0cd8474982a5e13a941505 Mon Sep 17 00:00:00 2001 From: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:17:36 +0000 Subject: [PATCH 174/263] dont fall over if response isnt json Signed-off-by: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> --- .../dev/galasa/http/HttpClientResponse.java | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java index bde13ac55..c4e4ccf8c 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java @@ -274,17 +274,21 @@ public static HttpClientResponse jsonResponse(CloseableHttpResponse if (response.getStatusCode() == HttpStatus.SC_OK || contentOnBadResponse) { String sResponse = EntityUtils.toString(httpResponse.getEntity()); -// JsonReader reader = new JsonReader(new InputStreamReader(httpResponse.getEntity().getContent())); - JsonElement jsonElement = null; - try{ - jsonElement = new GalasaGson().fromJson(sResponse, JsonElement.class); - }catch(JsonSyntaxException jse){ - System.err.println("Unable to parse JSON from the following: " + sResponse); - throw jse; - } - if (jsonElement != null) { - JsonObject json = jsonElement.getAsJsonObject(); - response.setContent(json); + if (sResponse.trim().startsWith("{")) { +// JsonReader reader = new JsonReader(new InputStreamReader(httpResponse.getEntity().getContent())); + JsonElement jsonElement = null; + try{ + jsonElement = new GalasaGson().fromJson(sResponse, JsonElement.class); + }catch(JsonSyntaxException jse){ + System.err.println("Unable to parse JSON from the following: " + sResponse); + throw jse; + } + if (jsonElement != null) { + JsonObject json = jsonElement.getAsJsonObject(); + response.setContent(json); + } + } else { + System.err.println("Did not attempt to parse JSON from the following: " + sResponse); } } else { EntityUtils.consume(httpResponse.getEntity()); From 28dcc1a19d0c3c9914f83d8b22083c9e7fe9261e Mon Sep 17 00:00:00 2001 From: Fiona Ampofo <64271621+Akyiaa@users.noreply.github.com> Date: Tue, 20 Feb 2024 11:06:28 +0000 Subject: [PATCH 175/263] changing examples to generic 'docker.io' Signed-off-by: Fiona Ampofo <64271621+Akyiaa@users.noreply.github.com> --- .../galasaecosystem/internal/properties/DockerRegistry.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/DockerRegistry.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/DockerRegistry.java index 51b349dd0..71e6051b6 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/DockerRegistry.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/DockerRegistry.java @@ -21,12 +21,12 @@ * * @galasa.required No * - * @galasa.default harbor.galasa.dev/docker_proxy_cache + * @galasa.default docker.io * * @galasa.valid_values a valid hostname * * @galasa.examples - * galasaecosystem.docker.version=harbor.galasa.dev/docker_proxy_cache + * galasaecosystem.docker.registry=docker.io * */ public class DockerRegistry extends CpsProperties { @@ -35,7 +35,7 @@ public static String get() throws GalasaEcosystemManagerException { try { String version = getStringNulled(GalasaEcosystemPropertiesSingleton.cps(), "docker", "registry") ; if (version == null) { - return "harbor.galasa.dev/docker_proxy_cache"; + return "docker.io"; } return version; } catch (ConfigurationPropertyStoreException e) { From a12c9d83cdcb307428a3b3d2619de90e51e4842d Mon Sep 17 00:00:00 2001 From: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> Date: Tue, 13 Feb 2024 10:31:14 +0000 Subject: [PATCH 176/263] fail sooner if id revoked Signed-off-by: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> --- .../dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java index e0ba2c03b..c27456111 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/CicstsDefaultLogonProvider.java @@ -126,7 +126,8 @@ private void waitForLoggedOnText(ICicsTerminal cicsTerminal) throws CicstsManage String[] pass = { "Sign-on is complete" }; String[] fail = { "Your password has expired. Please type your new password.", - "Invalid credentials entered" + "Invalid credentials entered", + "userid has been revoked" }; try { From 6f74e524a3496afb15f4cc2080e517f68d1e5905 Mon Sep 17 00:00:00 2001 From: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> Date: Thu, 8 Feb 2024 14:41:49 +0000 Subject: [PATCH 177/263] overload deleteJson to provide a body Signed-off-by: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> --- .../main/java/dev/galasa/http/HttpDelete.java | 40 +++++++++++++++++++ .../java/dev/galasa/http/IHttpClient.java | 11 +++++ .../galasa/http/internal/HttpClientImpl.java | 10 +++++ .../http/internal/HttpClientRequest.java | 20 +++++++++- 4 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpDelete.java diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpDelete.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpDelete.java new file mode 100644 index 000000000..bb271c731 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpDelete.java @@ -0,0 +1,40 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ +package dev.galasa.http; + +import java.net.URI; + +import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; + +/** + * HTTP DELETE method. + *

      + * The apache provided HttpDelete does not allow the inclusion + * of a body, which goes against HTTP specs, which allows it. + * This simple class now provides the capability. + */ +public class HttpDelete extends HttpEntityEnclosingRequestBase { + + public static final String METHOD_NAME = "DELETE"; + + public HttpDelete() { + super(); + } + + public HttpDelete(final URI uri) { + super(); + setURI(uri); + } + + public HttpDelete(final String uri) { + super(); + setURI(URI.create(uri)); + } + + public String getMethod() { + return METHOD_NAME; + } +} diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpClient.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpClient.java index 5e03102ef..735e64a76 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpClient.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpClient.java @@ -163,6 +163,17 @@ HttpClientResponse postXML(String url, String xml) */ HttpClientResponse deleteJson(String url) throws HttpClientException; + /** + * Issue an HTTP DELETE to the provided URL, receiving a {@link JSONObject} in + * the response. + * + * @param url + * @param json + * @return - {@link HttpClientResponse} with a {@link JSONObject} content type + * @throws HttpClientException + */ + HttpClientResponse deleteJson(String url, JsonObject json) throws HttpClientException; + /** * Issue an HTTP GET to the provided URL, receiving a {@link String} in the * response. diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientImpl.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientImpl.java index 41837df46..1fd6e86e3 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientImpl.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientImpl.java @@ -189,6 +189,16 @@ public HttpClientResponse deleteJson(String url) throws HttpClientEx return executeJsonRequest(request); } + @Override + public HttpClientResponse deleteJson(String url, JsonObject json) throws HttpClientException { + + HttpClientRequest request = HttpClientRequest.newDeleteRequest(buildUri(url, null).toString(), + new ContentType[] { ContentType.APPLICATION_JSON }, ContentType.APPLICATION_JSON); + request.setJSONBody(json); + + return executeJsonRequest(request); + } + private HttpClientResponse executeJsonRequest(HttpClientRequest request) throws HttpClientException { return HttpClientResponse.jsonResponse(execute(request.buildRequest())); diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientRequest.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientRequest.java index b3e571501..b9d3c6957 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientRequest.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientRequest.java @@ -16,7 +16,6 @@ import org.apache.http.HttpEntity; import org.apache.http.HttpHeaders; -import org.apache.http.client.methods.HttpDelete; import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpHead; @@ -32,6 +31,7 @@ import com.google.gson.JsonObject; import dev.galasa.http.ContentType; +import dev.galasa.http.HttpDelete; import dev.galasa.http.HttpClientException; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBException; @@ -324,6 +324,24 @@ public static HttpClientRequest newDeleteRequest(String url, ContentType[] accep return request; } + /** + * Create a new DELETE request + * + * @param url + * @param acceptTypes + * @param contentType + * @return new DELETE request + */ + public static HttpClientRequest newDeleteRequest(String url, ContentType[] acceptTypes, ContentType contentType) { + + HttpClientRequest request = new HttpClientRequest(RequestType.DELETE); + request.setUrl(url); + request.setAcceptTypes(acceptTypes); + request.setContentType(contentType); + + return request; + } + /** * Create a new PUT request * From ef9bc7e68c0e100b41194d7b5c76d0f92a777948 Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Fri, 8 Mar 2024 11:59:28 +0000 Subject: [PATCH 178/263] updated commons-compress versions Signed-off-by: Savvas Kyriacou --- .../dev.galasa.docker.manager/build.gradle | 4 ++-- .../dev.galasa.kubernetes.manager/bnd.bnd | 2 +- .../dev.galasa.kubernetes.manager/build.gradle | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle index f2bf7b752..c1a479f9f 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle @@ -10,8 +10,8 @@ dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') implementation 'com.google.code.gson:gson:2.10.1' - implementation 'commons-io:commons-io:2.9.0' - implementation 'org.apache.commons:commons-compress:1.21' + implementation 'commons-io:commons-io:2.15.1' + implementation 'org.apache.commons:commons-compress:1.26.0' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd index 83496edd3..4f65d266a 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd @@ -31,7 +31,7 @@ Embed-Dependency: *;scope=compile commons-codec-1.15.jar; lib:=true,\ commons-collections4-4.4.jar; lib:=true,\ commons-lang3-3.12.0.jar; lib:=true,\ - commons-compress-1.22.jar; lib:=true,\ + commons-compress-1.26.0.jar; lib:=true,\ gson-2.10.jar; lib:=true,\ gson-fire-1.8.5.jar; lib:=true,\ javax.annotation-api-1.3.2.jar; lib:=true,\ diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle index f56980889..30893ec9b 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle @@ -42,7 +42,7 @@ dependencies { } implementation ('org.apache.commons:commons-compress') { version { - strictly '1.22' + strictly '1.26.0' } } implementation 'io.prometheus:simpleclient:0.15.0' @@ -51,7 +51,7 @@ dependencies { implementation 'com.squareup.okio:okio-jvm:3.0.0' implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle:1.7.22' implementation 'io.kubernetes:client-java:17.0.0' - implementation 'commons-io:commons-io:2.11.0' + implementation 'commons-io:commons-io:2.15.1' } From bb4e924b2a60009a068d52f1fe952aa1b2431257 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 13 Mar 2024 12:26:38 +0000 Subject: [PATCH 179/263] Deleting the galasa-uber-javadoc project as it is not used and doesn't contain anything useful Signed-off-by: Jade Carino --- .../galasa-uber-javadoc/pom.xml | 85 ------------------- .../src/main/java/dummy/X.java | 10 --- .../src/main/resources/Dockerfile | 5 -- 3 files changed, 100 deletions(-) delete mode 100644 galasa-managers-parent/galasa-uber-javadoc/pom.xml delete mode 100644 galasa-managers-parent/galasa-uber-javadoc/src/main/java/dummy/X.java delete mode 100644 galasa-managers-parent/galasa-uber-javadoc/src/main/resources/Dockerfile diff --git a/galasa-managers-parent/galasa-uber-javadoc/pom.xml b/galasa-managers-parent/galasa-uber-javadoc/pom.xml deleted file mode 100644 index caa762a3a..000000000 --- a/galasa-managers-parent/galasa-uber-javadoc/pom.xml +++ /dev/null @@ -1,85 +0,0 @@ - - 4.0.0 - - - dev.galasa - galasa-managers-parent - 0.25.0 - - - galasa-uber-javadoc - jar - - - - dev.galasa - dev.galasa.uber.obr - 0.25.0 - obr - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - generate-sources - - unpack-dependencies - - - sources - ${project.build.directory}/sources - dev.galasa - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - javadoc-no-fork - - - - - false - ${project.build.directory}/sources - - - - org.apache.maven.plugins - maven-resources-plugin - - - copy-resources - generate-sources - - copy-resources - - - ${project.build.directory}/ - - - src/main/resources - - Dockerfile - - - - - - - - - - - \ No newline at end of file diff --git a/galasa-managers-parent/galasa-uber-javadoc/src/main/java/dummy/X.java b/galasa-managers-parent/galasa-uber-javadoc/src/main/java/dummy/X.java deleted file mode 100644 index fe36f78a7..000000000 --- a/galasa-managers-parent/galasa-uber-javadoc/src/main/java/dummy/X.java +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dummy; - -public class X { - -} diff --git a/galasa-managers-parent/galasa-uber-javadoc/src/main/resources/Dockerfile b/galasa-managers-parent/galasa-uber-javadoc/src/main/resources/Dockerfile deleted file mode 100644 index fbedbd81e..000000000 --- a/galasa-managers-parent/galasa-uber-javadoc/src/main/resources/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM httpd:2.4.58 - -RUN rm -v /usr/local/apache2/htdocs/* - -COPY apidocs/ /usr/local/apache2/htdocs/ \ No newline at end of file From c4c53794d5ecc9ce94c5a63b4353022fa8c76a6c Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Wed, 13 Mar 2024 15:34:52 +0000 Subject: [PATCH 180/263] bumped version to 0.33.0 Signed-off-by: Savvas Kyriacou --- galasa-managers-parent/build.gradle | 4 ++-- .../buildSrc/src/main/groovy/galasa.manager.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index 95eb643d5..a01ddf214 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -9,7 +9,7 @@ plugins { // It is used as the version number of the managers bundle, which contains a yaml // file which is in a release.yaml, but published to maven, so that the OBR build // can pick it up later. -version = "0.32.0" +version = "0.33.0" // A configuration to publish the merge exec into configurations { @@ -192,7 +192,7 @@ publishing { name = "Manifest for managers bundle versions" artifactId = "dev.galasa.managers.manifest" groupId = 'dev.galasa' - version = "0.32.0" + version = "0.33.0" description = "Conveys bundle version information to OBR builds." licenses { license { diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle index 1b6352821..c4c80e397 100644 --- a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle +++ b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle @@ -6,7 +6,7 @@ plugins { dependencies { api 'dev.galasa:dev.galasa:0.21.0' - implementation 'dev.galasa:dev.galasa.framework:0.32.0' + implementation 'dev.galasa:dev.galasa.framework:0.33.0' implementation 'commons-logging:commons-logging:1.2' implementation 'org.osgi:org.osgi.core:6.0.0' implementation 'org.osgi:org.osgi.service.component.annotations:1.3.0' From 5520647be117e934f2234ec6892579643844ad7d Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Wed, 10 Apr 2024 16:49:09 +0100 Subject: [PATCH 181/263] bumped versions of changed managers Signed-off-by: Savvas Kyriacou --- .../dev.galasa.docker.manager/build.gradle | 4 ++-- .../dev.galasa.kubernetes.manager/build.gradle | 4 ++-- release.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle index c1a479f9f..7cde16592 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle @@ -4,13 +4,13 @@ plugins { description = 'Galasa Docker Manager' -version = '0.32.0' +version = '0.33.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') implementation 'com.google.code.gson:gson:2.10.1' - implementation 'commons-io:commons-io:2.15.1' + implementation 'commons-io:commons-io:2.9.0' implementation 'org.apache.commons:commons-compress:1.26.0' } diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle index 30893ec9b..1ea3a957e 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Kubernetes Manager' -version = '0.32.0' +version = '0.33.0' dependencies { api project(':galasa-managers-cloud-parent:dev.galasa.cloud.manager') @@ -51,7 +51,7 @@ dependencies { implementation 'com.squareup.okio:okio-jvm:3.0.0' implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle:1.7.22' implementation 'io.kubernetes:client-java:17.0.0' - implementation 'commons-io:commons-io:2.15.1' + implementation 'commons-io:commons-io:2.11.0' } diff --git a/release.yaml b/release.yaml index 5b1033a65..f364d1ef8 100644 --- a/release.yaml +++ b/release.yaml @@ -148,7 +148,7 @@ managers: isolated: true - artifact: dev.galasa.docker.manager - version: 0.32.0 + version: 0.33.0 obr: true javadoc: true bom: true @@ -255,7 +255,7 @@ managers: isolated: true - artifact: dev.galasa.kubernetes.manager - version: 0.32.0 + version: 0.33.0 obr: true javadoc: true bom: true From ee5820fd9aea36a44ae2179631802d425048f578 Mon Sep 17 00:00:00 2001 From: Holly Hunt Date: Fri, 26 Apr 2024 16:11:13 +0100 Subject: [PATCH 182/263] changed list of developers to one galasa contributors for maintainability Signed-off-by: Holly Hunt --- .../src/main/groovy/galasa.java.gradle | 38 ++----------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.java.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.java.gradle index d82ed5b74..bda13eac0 100644 --- a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.java.gradle +++ b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.java.gradle @@ -84,40 +84,10 @@ publishing { } developers { developer { - name = 'Michael Baylis' - email = 'Michael.Baylis@uk.ibm.com' - organization = 'IBM' - organizationUrl = 'https://www.ibm.com' - } - developer { - name = 'William Yates' - email = 'wyates@uk.ibm.com' - organization = 'IBM' - organizationUrl = 'https://www.ibm.com' - } - developer { - name = 'David Roberts' - email = 'david.roberts@uk.ibm.com' - organization = 'IBM' - organizationUrl = 'https://www.ibm.com' - } - developer { - name = 'James Davies' - email = 'james.davies@ibm.com' - organization = 'IBM' - organizationUrl = 'https://www.ibm.com' - } - developer { - name = 'Kees Jansen' - email = 'kees.jansen@ibm.com' - organization = 'IBM' - organizationUrl = 'https://www.ibm.com' - } - developer { - name = 'Jade Carino' - email = 'jade.carino@ibm.com' - organization = 'IBM' - organizationUrl = 'https://www.ibm.com' + name = 'Galasa Contributors' + email = 'galasadelivery@ibm.com' + organization = 'Linux Foundation' + organizationUrl = 'https://github.com/galasa-dev' } } scm { From 1c271b6e865fafa6170b4d69b9dea8dd95307641 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Mon, 29 Apr 2024 11:59:24 +0100 Subject: [PATCH 183/263] Fix ZosManagerBatchIVT failures (#934) * Add enum for statuses returned from the RSE API Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> * Use enum to allow 'COMPLETED' to be recognised when updating batch job completion Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --------- Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../build.gradle | 2 +- .../manager/internal/RseapiJobStatus.java | 58 +++++++++++++++++++ .../internal/RseapiZosBatchJobImpl.java | 24 ++++---- release.yaml | 2 +- 4 files changed, 73 insertions(+), 13 deletions(-) create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiJobStatus.java diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle index 1ecec7aa7..7c2ee4f60 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS Batch Manager - RSE API Implementation' -version = '0.31.0' +version = '0.33.0' dependencies { implementation project(':galasa-managers-zos-parent:dev.galasa.zosrseapi.manager') diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiJobStatus.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiJobStatus.java new file mode 100644 index 000000000..3209c6fa6 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiJobStatus.java @@ -0,0 +1,58 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ +package dev.galasa.zosbatch.rseapi.manager.internal; + +/** + * An enum to hold the statuses of a batch job that can be returned from the RSE + * API. + */ +public enum RseapiJobStatus { + HOLD("HOLD"), + ACTIVE("ACTIVE"), + ABEND("ABEND", true), + COMPLETED("COMPLETED", true), + COMPLETION("COMPLETION", true), + NOTFOUND("NOT_FOUND", true), + UNKNOWN("UNKNOWN"); + + private String value; + private boolean isCompleteStatus; + + private RseapiJobStatus(String value) { + this.value = value; + this.isCompleteStatus = false; + } + + private RseapiJobStatus(String value, boolean isCompleteStatus) { + this.value = value; + this.isCompleteStatus = isCompleteStatus; + } + + /** + * Converts a given string into an RseapiJobStatus enum value. If no enum value + * matches, then the UNKNOWN value will be assigned. + * + * @param jobStatus the string to convert + * @return an RseapiJobStatus enum value + */ + public static RseapiJobStatus getJobStatusFromString(String jobStatus) { + for (RseapiJobStatus status : values()) { + if (status.toString().equals(jobStatus)) { + return status; + } + } + return RseapiJobStatus.UNKNOWN; + } + + public boolean isComplete() { + return this.isCompleteStatus; + } + + @Override + public String toString() { + return this.value; + } +} diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiZosBatchJobImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiZosBatchJobImpl.java index 87b802a0b..7295f4207 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiZosBatchJobImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/src/main/java/dev/galasa/zosbatch/rseapi/manager/internal/RseapiZosBatchJobImpl.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.rseapi.manager.internal; import java.nio.file.Path; @@ -590,16 +590,18 @@ protected void updateJobStatus() throws ZosBatchException { this.owner = jsonNull(responseBody, PROP_OWNER); this.type = jsonNull(responseBody, PROP_TYPE); this.statusString = jsonNull(responseBody, PROP_STATUS); - if (this.statusString != null && "COMPLETION".equals(this.statusString) || - this.statusString != null && "ABEND".equals(this.statusString)) { - this.jobComplete = true; - } else if (this.statusString != null && "NOT_FOUND".equals(this.statusString)) { - logger.trace("JOBID=" + this.jobid + " JOBNAME=" + this.jobname.getName() + " NOT FOUND"); + + // Update the completion status of this batch job + RseapiJobStatus status = RseapiJobStatus.getJobStatusFromString(this.statusString); + this.jobComplete = status.isComplete(); + + if (status == RseapiJobStatus.NOTFOUND) { + logger.trace("JOBID=" + this.jobid + " JOBNAME=" + this.jobname.getName() + " NOT FOUND"); this.jobNotFound = true; this.status = JobStatus.NOTFOUND; - this.jobComplete = true; } setStatus(this.statusString); + String retcodeProperty = jsonNull(responseBody, PROP_RETCODE); if (retcodeProperty != null) { this.retcode = retcodeProperty; diff --git a/release.yaml b/release.yaml index 5b1033a65..bf9f9db22 100644 --- a/release.yaml +++ b/release.yaml @@ -357,7 +357,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosbatch.rseapi.manager - version: 0.31.0 + version: 0.33.0 obr: true bom: true mvp: true From d5d11665b1f71dcb6ce9413e278c7b7e975e64ba Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Fri, 3 May 2024 10:08:51 +0100 Subject: [PATCH 184/263] bumped version to 0.34.0 Signed-off-by: Savvas Kyriacou --- galasa-managers-parent/build.gradle | 4 ++-- .../buildSrc/src/main/groovy/galasa.manager.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index a01ddf214..389fa9a7c 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -9,7 +9,7 @@ plugins { // It is used as the version number of the managers bundle, which contains a yaml // file which is in a release.yaml, but published to maven, so that the OBR build // can pick it up later. -version = "0.33.0" +version = "0.34.0" // A configuration to publish the merge exec into configurations { @@ -192,7 +192,7 @@ publishing { name = "Manifest for managers bundle versions" artifactId = "dev.galasa.managers.manifest" groupId = 'dev.galasa' - version = "0.33.0" + version = "0.34.0" description = "Conveys bundle version information to OBR builds." licenses { license { diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle index c4c80e397..215f2ce75 100644 --- a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle +++ b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle @@ -6,7 +6,7 @@ plugins { dependencies { api 'dev.galasa:dev.galasa:0.21.0' - implementation 'dev.galasa:dev.galasa.framework:0.33.0' + implementation 'dev.galasa:dev.galasa.framework:0.34.0' implementation 'commons-logging:commons-logging:1.2' implementation 'org.osgi:org.osgi.core:6.0.0' implementation 'org.osgi:org.osgi.service.component.annotations:1.3.0' From 931a37eb72cc6376422f9484628d0fb2e1e25cff Mon Sep 17 00:00:00 2001 From: Tom Slattery Date: Wed, 13 Mar 2024 14:35:00 +0000 Subject: [PATCH 185/263] consolidated jvmserverimpl constructor Signed-off-by: Tom Slattery --- .../resource/internal/JvmserverImpl.java | 135 +++++++++--------- 1 file changed, 67 insertions(+), 68 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmserverImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmserverImpl.java index 8b5e9ce34..f384ec614 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmserverImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmserverImpl.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.resource.internal; import java.io.ByteArrayOutputStream; @@ -49,13 +49,13 @@ import dev.galasa.zosliberty.ZosLibertyServerException; public class JvmserverImpl implements IJvmserver { - + private static final Log logger = LogFactory.getLog(JvmserverImpl.class); private CicsResourceManagerImpl cicsResourceManager; private IZosFileHandler zosFileHandler; private IZosLiberty zosLiberty; - + private boolean shouldArchive = true; private boolean shouldCleanup = true; @@ -72,7 +72,7 @@ public class JvmserverImpl implements IJvmserver { private String cicsRegionHomeDirectory; private String cicsRegionJobname; private String cicsRegionUserid; - + private String resourceDefinitionName; private String resourceDefinitionGroup; private String resourceDefinitionDescription; @@ -81,7 +81,7 @@ public class JvmserverImpl implements IJvmserver { private JvmserverType jvmserverType = JvmserverType.UNKNOWN; private String resourceDefinitionLerunopts; private int resourceDefinitionThreadlimit = 15; - + private IJvmprofile jvmprofile; private String defaultWorkingDirectoryValue; @@ -94,20 +94,20 @@ public class JvmserverImpl implements IJvmserver { private IZosUNIXFile workingDirectory; private IZosUNIXFile diagnosticsDirectory; private IZosUNIXFile javaHome; - private IZosUNIXFile logsDirectory; - private IJvmserverLog jvmLogLog; - private IJvmserverLog stdOutLog; - private IJvmserverLog stdErrLog; + private IZosUNIXFile logsDirectory; + private IJvmserverLog jvmLogLog; + private IJvmserverLog stdOutLog; + private IJvmserverLog stdErrLog; private IJvmserverLog jvmTraceLog; - + private IZosLibertyServer zosLibertyServer; private String wlpInstallDir; private String wlpUserDir; private String wlpOutputDir; - + private int defaultTimeout = -1; - private static final String SLASH_SYBMOL = "/"; + private static final String SLASH_SYBMOL = "/"; private static final String SYMBOL_APPLID = "&APPLID;"; private static final String SYMBOL_CONFIGROOT = "&CONFIGROOT;"; private static final String SYMBOL_JVMSERVER = "&JVMSERVER;"; @@ -117,9 +117,9 @@ public class JvmserverImpl implements IJvmserver { private static final String OPTION_JAVA_HOME = "JAVA_HOME"; private static final String OPTION_WORK_DIR = "WORK_DIR"; - + private static final String RESOURCE_TYPE_JVMSERVER = "JVMSERVER"; - + private static final String LOG_CEMT_PARAMETER = "Log"; private static final String LOG_PROFILE_OPTION = "JVMLOG"; private static final String LOG_FILE_SUFFIX = "dfhjvmlog"; @@ -133,29 +133,38 @@ public class JvmserverImpl implements IJvmserver { private static final String TRACE_PROFILE_OPTION = "JVMTRACE"; private static final String TRACE_FILE_SUFFIX = "dfhjvmtrc"; - public JvmserverImpl(CicsResourceManagerImpl cicsResourceManager, ICicsRegion cicsRegion, ICicsTerminal cicsTerminal, String name, String group, String jvmprofileName, JvmserverType jvmserverType) throws CicsJvmserverResourceException { - this.cicsResourceManager = cicsResourceManager; + public JvmserverImpl(CicsResourceManagerImpl cicsResourceManagerImpl, ICicsRegion cicsRegion, ICicsTerminal cicsTerminal, String name, String group) throws CicsJvmserverResourceException { + this.cicsResourceManager = cicsResourceManagerImpl; this.cicsResourceManager.registerJvmserver(this); + this.cicsRegion = cicsRegion; + this.cicsZosImage = cicsRegion.getZosImage(); + try { this.zosFileHandler = this.cicsResourceManager.getZosFileHandler(); } catch (CicsResourceManagerException e) { throw new CicsJvmserverResourceException("Unable to get zOS File Handler", e); } - this.cicsRegion = cicsRegion; - this.cicsZosImage = cicsRegion.getZosImage(); + setRunTemporaryUNIXPath(); this.cicsTerminal = cicsTerminal; this.resourceDefinitionName = name; this.resourceDefinitionGroup = group; + } + + public JvmserverImpl(CicsResourceManagerImpl cicsResourceManagerImpl, ICicsRegion cicsRegion, ICicsTerminal cicsTerminal, String name, String group, String jvmprofileName, JvmserverType jvmserverType) throws CicsJvmserverResourceException { + this(cicsResourceManagerImpl, cicsRegion, cicsTerminal, name, group); this.resourceDefinitionJvmprofile = jvmprofileName; this.jvmserverType = jvmserverType; this.jvmprofile = newJvmprofileFromCicsSuppliedProfile(jvmprofileName); + try { this.javaHome = this.zosFileHandler.newUNIXFile(getDefaultJavaHomeValue(), cicsZosImage); } catch (ZosUNIXFileException e) { throw new CicsJvmserverResourceException("Unable to set JAVA_HOME", e); } + this.jvmprofile.setProfileValue(OPTION_JAVA_HOME, this.javaHome.getUnixPath()); + try { this.workingDirectory = this.zosFileHandler.newUNIXFile(getDefaultWorkingDirectoryValue(), cicsZosImage); } catch (ZosUNIXFileException e) { @@ -176,28 +185,18 @@ public JvmserverImpl(CicsResourceManagerImpl cicsResourceManager, ICicsRegion ci } } + + public JvmserverImpl(CicsResourceManagerImpl cicsResourceManagerImpl, ICicsRegion cicsRegion, ICicsTerminal cicsTerminal, String name, String group, IJvmprofile jvmprofile) throws CicsJvmserverResourceException { - this.cicsResourceManager = cicsResourceManagerImpl; - this.cicsResourceManager.registerJvmserver(this); - this.cicsRegion = cicsRegion; - this.cicsZosImage = cicsRegion.getZosImage(); - setRunTemporaryUNIXPath(); - this.cicsTerminal = cicsTerminal; - this.resourceDefinitionName = name; - this.resourceDefinitionGroup = group; + this(cicsResourceManagerImpl, cicsRegion, cicsTerminal, name, group); + this.jvmprofile = jvmprofile; this.resourceDefinitionJvmprofile = jvmprofile.getProfileName(); this.jvmserverType = determineJvmserverType(); } public JvmserverImpl(CicsResourceManagerImpl cicsResourceManagerImpl, ICicsRegion cicsRegion, ICicsTerminal cicsTerminal, String name, String group, IJvmprofile jvmprofile, IZosLibertyServer libertyServer) throws CicsJvmserverResourceException { - this.cicsResourceManager = cicsResourceManagerImpl; - this.cicsResourceManager.registerJvmserver(this); - this.cicsRegion = cicsRegion; - this.cicsZosImage = cicsRegion.getZosImage(); - setRunTemporaryUNIXPath(); - this.cicsTerminal = cicsTerminal; - this.resourceDefinitionName = name; - this.resourceDefinitionGroup = group; + this(cicsResourceManagerImpl, cicsRegion, cicsTerminal, name, group); + this.jvmprofile = jvmprofile; this.resourceDefinitionJvmprofile = jvmprofile.getProfileName(); this.jvmserverType = JvmserverType.LIBERTY; this.zosLibertyServer = libertyServer; @@ -252,7 +251,7 @@ protected IZosLibertyServer newZosLibertyServerFromCicsSuppliedServerXml() throw } protected IZosLiberty getLiberty() throws CicsJvmserverResourceException { - if (this.zosLiberty == null) { + if (this.zosLiberty == null) { try { this.zosLiberty = cicsResourceManager.getZosLiberty(); } catch (CicsResourceManagerException e) { @@ -294,7 +293,7 @@ protected NavigableMap decendingDirectoryList(IZosUNIXFile SortedMap directoryList = new TreeMap<>(); try { if (directory.exists()) { - + } directoryList = directory.directoryList(); } catch (ZosUNIXFileException e) { @@ -469,7 +468,7 @@ public void buildResourceDefinition() throws CicsJvmserverResourceException { //TODO: Messages??? if (!resourceDefined()) { throw new CicsJvmserverResourceException("Failed to define " + RESOURCE_TYPE_JVMSERVER + " resource definition"); - } + } } catch (CicstsManagerException e) { throw new CicsJvmserverResourceException("Unable to build " + RESOURCE_TYPE_JVMSERVER + " resource definition", e); } @@ -532,10 +531,10 @@ private void resetSavedValues() { this.workingDirectory = null; this.diagnosticsDirectory = null; this.javaHome = null; - this.logsDirectory = null; - this.jvmLogLog = null; - this.stdOutLog = null; - this.stdErrLog = null; + this.logsDirectory = null; + this.jvmLogLog = null; + this.stdOutLog = null; + this.stdErrLog = null; this.jvmTraceLog = null; this.wlpInstallDir = null; this.wlpUserDir = null; @@ -621,7 +620,7 @@ public PurgeType disableWithEscalate(int steptimeout) throws CicsJvmserverResour } } } - + return purgeType; } @@ -819,7 +818,7 @@ public IZosUNIXFile getJavaHome() throws CicsJvmserverResourceException { String javaHomeValue = this.jvmprofile.getProfileValue(OPTION_JAVA_HOME); if (javaHomeValue == null) { javaHomeValue = getDefaultJavaHomeValue(); - this.jvmprofile.setProfileValue(OPTION_JAVA_HOME, javaHomeValue); + this.jvmprofile.setProfileValue(OPTION_JAVA_HOME, javaHomeValue); } try { this.javaHome = this.zosFileHandler.newUNIXFile(javaHomeValue, this.cicsZosImage); @@ -836,7 +835,7 @@ public IZosUNIXFile getWorkingDirectory() throws CicsJvmserverResourceException String workDirValue = this.jvmprofile.getProfileValue(OPTION_WORK_DIR); if (workDirValue == null) { workDirValue = getDefaultWorkingDirectoryValue(); - this.jvmprofile.setProfileValue(OPTION_WORK_DIR, workDirValue); + this.jvmprofile.setProfileValue(OPTION_WORK_DIR, workDirValue); } if (!workDirValue.startsWith(SLASH_SYBMOL)) { workDirValue = getHomeDirectory() + workDirValue; @@ -883,7 +882,7 @@ public IJvmserverLog getJvmTrace() throws CicsJvmserverResourceException { } @Override - public void checkpointLogs() throws CicsJvmserverResourceException { + public void checkpointLogs() throws CicsJvmserverResourceException { getJvmLog().checkpoint(); getStdOut().checkpoint(); getStdErr().checkpoint(); @@ -897,7 +896,7 @@ public List getJavaLogs() throws CicsJvmserverResourceException { if (getWorkingDirectory().exists()) { SortedMap directoryList = getWorkingDirectory().directoryList(); for (Entry entry : directoryList.entrySet()) { - if (entry.getKey().matches(".*/Snap.*\\.trc$") || + if (entry.getKey().matches(".*/Snap.*\\.trc$") || entry.getKey().matches(".*/javacore.*\\.txt$")) { javaLogs.add(entry.getValue()); } else if(entry.getKey().matches(".*/jitdump.*\\.dmp$")) { @@ -918,10 +917,10 @@ public void saveToResultsArchive() throws CicsJvmserverResourceException { } @Override - public void saveToResultsArchive(String rasPath) throws CicsJvmserverResourceException { + public void saveToResultsArchive(String rasPath) throws CicsJvmserverResourceException { if (this.jvmprofile != null) { this.jvmprofile.saveToResultsArchive(rasPath); - } + } if (this.jvmLogLog != null) { this.jvmLogLog.saveToResultsArchive(rasPath); } @@ -946,7 +945,7 @@ public void saveToResultsArchive(String rasPath) throws CicsJvmserverResourceExc } @Override - public void clearJvmLogs() throws CicsJvmserverResourceException { + public void clearJvmLogs() throws CicsJvmserverResourceException { if (this.jvmLogLog != null) { this.jvmLogLog.delete(); } @@ -969,7 +968,7 @@ public void clearJvmLogs() throws CicsJvmserverResourceException { } } } - + @Override public String toString() { return "[JVM server] " + getName(); @@ -1001,7 +1000,7 @@ protected IJvmserverLog getLog(String cemtParameter, String jvmprofileOption, St } catch (ZosBatchException | ZosUNIXFileException | CicstsManagerException e) { throw new CicsJvmserverResourceException("Problem creating IJvmserverLog object for " + cemtParameter, e); } - + } protected String getDdname(String logName) { @@ -1016,7 +1015,7 @@ protected String getLogName(String cemtParameter, String jvmprofileOption, Strin return cemtMap.get(cemtParameter); } } - + // Try jvmprofile if (this.jvmprofile.containsOption(jvmprofileOption)) { String value = this.jvmprofile.getProfileValue(jvmprofileOption); @@ -1027,18 +1026,18 @@ protected String getLogName(String cemtParameter, String jvmprofileOption, Strin } } } - + // Look on the file system for(Map.Entry entry : decendingDirectoryList(getDefaultLogsDiretory()).entrySet()) { if (entry.getKey().endsWith("." + fileSuffix)) { return entry.getValue().getUnixPath(); } } - + throw new CicsJvmserverResourceException("Unable to establish JVM server " + cemtParameter + " log file"); - + } - + protected boolean isDdname(String logName) { return logName.startsWith("//DD:"); } @@ -1101,7 +1100,7 @@ protected CicstsHashMap cemtInquire() throws CicsJvmserverResourceException { } return cemtMap; } - + protected String parseJvmprofileSymbols(String value) throws CicsJvmserverResourceException { if (value.contains(SYMBOL_DATE) || value.contains(SYMBOL_TIME)) { throw new CicsJvmserverResourceException("JVM profile options \"" + SYMBOL_DATE + "\" and \"" + SYMBOL_TIME + "\" not supported by JVM server Manager"); @@ -1111,10 +1110,10 @@ protected String parseJvmprofileSymbols(String value) throws CicsJvmserverResour parsedValue = StringUtils.replace(parsedValue, SYMBOL_CONFIGROOT, getUsshome()); parsedValue = StringUtils.replace(parsedValue, SYMBOL_JVMSERVER, getName()); parsedValue = StringUtils.replace(parsedValue, SYMBOL_USSHOME, getUsshome()); - + return parsedValue; } - + protected String getUsshome() throws CicsJvmserverResourceException { if (this.cicsUsshome == null) { try { @@ -1125,14 +1124,14 @@ protected String getUsshome() throws CicsJvmserverResourceException { } return this.cicsUsshome; } - + protected String getApplid() { if (this.cicsApplid == null) { this.cicsApplid = this.cicsRegion.getApplid(); } return this.cicsApplid; } - + protected String getJvmProfileDir() throws CicsJvmserverResourceException { if (this.cicsJvmprofileDir == null) { try { @@ -1143,7 +1142,7 @@ protected String getJvmProfileDir() throws CicsJvmserverResourceException { } return this.cicsJvmprofileDir; } - + protected String getConfigRoot() throws CicsJvmserverResourceException { if (this.cicsConfigroot == null) { //TOODO: get CONFIGROOT @@ -1151,7 +1150,7 @@ protected String getConfigRoot() throws CicsJvmserverResourceException { } return this.cicsConfigroot; } - + protected IZosUNIXFile getDiagnosticsDirectory() throws CicsJvmserverResourceException { if (this.diagnosticsDirectory == null) { try { @@ -1204,7 +1203,7 @@ protected void deleteJavaLogs() throws CicsJvmserverResourceException { } } } - + protected void cleanup() { if (shouldArchive()) { try { From 2f1667b5a1d311f2c498e3aa571a9b1e320a7b7b Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Thu, 9 May 2024 16:36:11 +0100 Subject: [PATCH 186/263] upgraded manager dependencies to use the packages needed for commons-compresss Signed-off-by: Savvas Kyriacou --- .../build.gradle | 6 +-- .../dev.galasa.docker.manager/build.gradle | 4 +- .../dev.galasa.kubernetes.manager/bnd.bnd | 2 +- .../build.gradle | 6 +-- .../dev.galasa.http.manager/build.gradle | 4 +- .../dev.galasa.artifact.manager/build.gradle | 4 +- .../dev.galasa.textscan.manager/build.gradle | 4 +- .../build.gradle | 4 +- .../dev.galasa.selenium.manager/build.gradle | 4 +- .../dev.galasa.zos.manager/build.gradle | 4 +- .../dev.galasa.zos3270.manager/build.gradle | 4 +- .../build.gradle | 4 +- .../build.gradle | 4 +- .../build.gradle | 8 ++-- .../build.gradle | 6 +-- .../build.gradle | 4 +- .../build.gradle | 6 +-- .../dev.galasa.zosmf.manager/build.gradle | 6 +-- .../dev.galasa.zosrseapi.manager/build.gradle | 4 +- .../build.gradle | 4 +- release.yaml | 38 +++++++++---------- 21 files changed, 65 insertions(+), 65 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle index d53d1a3b3..55fb8043b 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa CICS/TS Resource Manager' -version = '0.25.0' +version = '0.34.0' dependencies { api project (':galasa-managers-cicsts-parent:dev.galasa.cicsts.manager') @@ -12,8 +12,8 @@ dependencies { implementation project (':galasa-managers-core-parent:dev.galasa.textscan.manager') implementation project (':galasa-managers-core-parent:dev.galasa.artifact.manager') implementation project (':galasa-managers-zos-parent:dev.galasa.zos3270.manager') - implementation 'org.apache.commons:commons-lang3:3.8.1' - implementation 'commons-io:commons-io:2.9.0' + implementation 'org.apache.commons:commons-lang3:3.14.0' + implementation 'commons-io:commons-io:2.16.1' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle index 7cde16592..4d618fa2a 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/build.gradle @@ -4,13 +4,13 @@ plugins { description = 'Galasa Docker Manager' -version = '0.33.0' +version = '0.34.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') implementation 'com.google.code.gson:gson:2.10.1' - implementation 'commons-io:commons-io:2.9.0' + implementation 'commons-io:commons-io:2.16.1' implementation 'org.apache.commons:commons-compress:1.26.0' } diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd index 4f65d266a..8cdd99309 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/bnd.bnd @@ -30,7 +30,7 @@ Embed-Dependency: *;scope=compile client-java-proto-17.0.0.jar; lib:=true,\ commons-codec-1.15.jar; lib:=true,\ commons-collections4-4.4.jar; lib:=true,\ - commons-lang3-3.12.0.jar; lib:=true,\ + commons-lang3-3.14.0.jar; lib:=true,\ commons-compress-1.26.0.jar; lib:=true,\ gson-2.10.jar; lib:=true,\ gson-fire-1.8.5.jar; lib:=true,\ diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle index 1ea3a957e..58723d23e 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Kubernetes Manager' -version = '0.33.0' +version = '0.34.0' dependencies { api project(':galasa-managers-cloud-parent:dev.galasa.cloud.manager') @@ -27,7 +27,7 @@ dependencies { } implementation ('org.apache.commons:commons-lang3'){ version { - strictly '3.12.0' + strictly '3.14.0' } } implementation ('commons-codec:commons-codec'){ @@ -51,7 +51,7 @@ dependencies { implementation 'com.squareup.okio:okio-jvm:3.0.0' implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle:1.7.22' implementation 'io.kubernetes:client-java:17.0.0' - implementation 'commons-io:commons-io:2.11.0' + implementation 'commons-io:commons-io:2.16.1' } diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle index e17d2592c..e667531c2 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle @@ -4,13 +4,13 @@ plugins { description = 'HTTP Manager' -version = '0.32.0' +version = '0.34.0' dependencies { api 'org.apache.httpcomponents:httpclient-osgi:4.5.13' implementation 'org.apache.httpcomponents:httpcore-osgi:4.4.14' implementation 'org.apache.httpcomponents:httpmime:4.5.8' - implementation 'commons-io:commons-io:2.9.0' + implementation 'commons-io:commons-io:2.16.1' implementation 'com.google.code.gson:gson:2.10.1' implementation 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.0' implementation (group: 'commons-codec', name: 'commons-codec'){ diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/build.gradle index 404054486..9e9f0d4ec 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/build.gradle @@ -6,11 +6,11 @@ plugins { description = 'Handles the retrieval of artifacts from the OSGi bundles' -version = '0.25.0' +version = '0.34.0' dependencies { implementation 'org.apache.velocity:velocity-engine-core:2.3' - implementation 'commons-io:commons-io:2.9.0' + implementation 'commons-io:commons-io:2.16.1' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/build.gradle b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/build.gradle index c59558e89..52e6c8ad5 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/build.gradle @@ -4,10 +4,10 @@ plugins { description = 'Galasa Text Scan Manager' -version = '0.21.0' +version = '0.34.0' dependencies { - implementation 'commons-io:commons-io:2.9.0' + implementation 'commons-io:commons-io:2.16.1' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle index 88613037a..f42d259c9 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle @@ -4,10 +4,10 @@ plugins { description = 'Galasa Ecosystem Manager' -version = '0.32.0' +version = '0.34.0' dependencies { - implementation 'commons-io:commons-io:2.9.0' + implementation 'commons-io:commons-io:2.16.1' implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') implementation project(':galasa-managers-cloud-parent:dev.galasa.kubernetes.manager') diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle index 1a3600cc1..46c07ab01 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Selenium Manager' -version = '0.31.0' +version = '0.34.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') @@ -27,7 +27,7 @@ dependencies { implementation 'org.jetbrains.kotlin:kotlin-osgi-bundle:1.7.22' implementation 'net.bytebuddy:byte-buddy:1.8.15' implementation 'org.apache.commons:commons-exec:1.3' - implementation 'commons-io:commons-io:2.6' + implementation 'commons-io:commons-io:2.16.1' implementation 'com.google.code.gson:gson:2.10.1' } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle index 855769912..37eddc1d6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/build.gradle @@ -4,12 +4,12 @@ plugins { description = 'Galasa zOS Manager' -version = '0.31.0' +version = '0.34.0' dependencies { api project (':galasa-managers-comms-parent:dev.galasa.ipnetwork.manager') implementation 'io.prometheus:simpleclient:0.6.0' - implementation 'org.apache.commons:commons-lang3:3.8.1' + implementation 'org.apache.commons:commons-lang3:3.14.0' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle index bac5ea090..d600bcbb2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS 3270 Terminal Manager' -version = '0.32.0' +version = '0.34.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zos3270.common') @@ -12,7 +12,7 @@ dependencies { api project(':galasa-managers-core-parent:dev.galasa.textscan.manager') implementation 'com.google.code.gson:gson:2.10.1' implementation 'commons-codec:commons-codec:1.15' - implementation 'commons-io:commons-io:2.9.0' + implementation 'commons-io:commons-io:2.16.1' implementation project (':galasa-managers-common-parent:dev.galasa.common') } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle index 7c2ee4f60..115888375 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.rseapi.manager/build.gradle @@ -4,11 +4,11 @@ plugins { description = 'Galasa zOS Batch Manager - RSE API Implementation' -version = '0.33.0' +version = '0.34.0' dependencies { implementation project(':galasa-managers-zos-parent:dev.galasa.zosrseapi.manager') - implementation 'org.apache.commons:commons-lang3:3.8.1' + implementation 'org.apache.commons:commons-lang3:3.14.0' implementation 'com.google.code.gson:gson:2.10.1' } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle index 0fb0ffd15..f303d92f2 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosbatch.zosmf.manager/build.gradle @@ -4,12 +4,12 @@ plugins { description = 'Galasa zOS Batch Manager - zOS/MF Implementation' -version = '0.31.0' +version = '0.34.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zosmf.manager') implementation 'com.google.code.gson:gson:2.10.1' - implementation 'org.apache.commons:commons-lang3:3.8.1' + implementation 'org.apache.commons:commons-lang3:3.14.0' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle index 273e5c729..2c0329dab 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle @@ -4,16 +4,16 @@ plugins { description = 'Galasa zOS File Manager - RSE API Implementation' -version = '0.31.0' +version = '0.34.0' dependencies { implementation project(':galasa-managers-zos-parent:dev.galasa.zosrseapi.manager') - implementation 'org.apache.commons:commons-lang3:3.8.1' + implementation 'org.apache.commons:commons-lang3:3.14.0' implementation 'com.google.code.gson:gson:2.10.1' implementation 'org.apache.commons:commons-collections4:4.4' - implementation 'org.apache.commons:commons-lang3:3.8.1' + implementation 'org.apache.commons:commons-lang3:3.14.0' implementation 'org.apache.commons:commons-collections4:4.4' - implementation 'commons-io:commons-io:2.9.0' + implementation 'commons-io:commons-io:2.16.1' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/build.gradle index 0dc3e8878..34246f61e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/build.gradle @@ -4,13 +4,13 @@ plugins { description = 'Galasa zOS File Manager - zOS/MF Implementation' -version = '0.31.0' +version = '0.34.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zosmf.manager') implementation 'com.google.code.gson:gson:2.10.1' - implementation 'org.apache.commons:commons-lang3:3.8.1' - implementation 'commons-io:commons-io:2.9.0' + implementation 'org.apache.commons:commons-lang3:3.14.0' + implementation 'commons-io:commons-io:2.16.1' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/build.gradle index 9062f04f8..206e779f3 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.angel.manager/build.gradle @@ -4,11 +4,11 @@ plugins { description = 'Galasa zOS Liberty Angel Manager' -version = '0.21.0' +version = '0.34.0' dependencies { implementation project(':galasa-managers-zos-parent:dev.galasa.zos.manager') - implementation 'org.apache.commons:commons-lang3:3.8.1' + implementation 'org.apache.commons:commons-lang3:3.14.0' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/build.gradle index 217da785c..d6c356537 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS Liberty Manager' -version = '0.21.0' +version = '0.34.0' dependencies { implementation project(':galasa-managers-zos-parent:dev.galasa.zos.manager') @@ -12,9 +12,9 @@ dependencies { implementation project(':galasa-managers-cloud-parent:dev.galasa.liberty.manager') implementation project(':galasa-managers-core-parent:dev.galasa.textscan.manager') implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') - implementation 'org.apache.commons:commons-lang3:3.8.1' + implementation 'org.apache.commons:commons-lang3:3.14.0' implementation 'org.apache.commons:commons-collections4:4.4' - implementation 'commons-io:commons-io:2.9.0' + implementation 'commons-io:commons-io:2.16.1' } // Note: These values are consumed by the parent build process diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle index ab2eea2b1..d8773eb6b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/build.gradle @@ -4,13 +4,13 @@ plugins { description = 'Galasa zOS/MF Manager' -version = '0.31.0' +version = '0.34.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zos.manager') api project(':galasa-managers-comms-parent:dev.galasa.http.manager') - implementation 'commons-io:commons-io:2.8.0' - implementation 'org.apache.commons:commons-lang3:3.8.1' + implementation 'commons-io:commons-io:2.16.1' + implementation 'org.apache.commons:commons-lang3:3.14.0' implementation 'com.google.code.gson:gson:2.10.1' } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle index 6b0f08b45..16e55e776 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/build.gradle @@ -4,12 +4,12 @@ plugins { description = 'Galasa RSE API Manager' -version = '0.31.0' +version = '0.34.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zos.manager') api project(':galasa-managers-comms-parent:dev.galasa.http.manager') - implementation 'commons-io:commons-io:2.9.0' + implementation 'commons-io:commons-io:2.16.1' implementation 'com.google.code.gson:gson:2.10.1' } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle index 18fd53524..1280a8978 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/build.gradle @@ -4,14 +4,14 @@ plugins { description = 'Galasa zOS Security Manager' -version = '0.31.0' +version = '0.34.0' dependencies { implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') implementation project(':galasa-managers-zos-parent:dev.galasa.zos.manager') implementation 'com.google.code.gson:gson:2.10.1' implementation 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.0' - implementation 'org.apache.commons:commons-lang3:3.8.1' + implementation 'org.apache.commons:commons-lang3:3.14.0' implementation ('org.bouncycastle:bcpkix-jdk18on') { version { diff --git a/release.yaml b/release.yaml index c3f5eb758..e7ef18f7b 100644 --- a/release.yaml +++ b/release.yaml @@ -17,7 +17,7 @@ managers: # - artifact: dev.galasa.artifact.manager - version: 0.25.0 + version: 0.34.0 obr: true javadoc: true bom: true @@ -94,7 +94,7 @@ managers: isolated: true - artifact: dev.galasa.cicsts.resource.manager - version: 0.25.0 + version: 0.34.0 obr: true javadoc: true bom: true @@ -148,7 +148,7 @@ managers: isolated: true - artifact: dev.galasa.docker.manager - version: 0.33.0 + version: 0.34.0 obr: true javadoc: true bom: true @@ -175,7 +175,7 @@ managers: isolated: true - artifact: dev.galasa.galasaecosystem.manager - version: 0.32.0 + version: 0.34.0 obr: true bom: true isolated: true @@ -194,7 +194,7 @@ managers: isolated: false - artifact: dev.galasa.http.manager - version: 0.32.0 + version: 0.34.0 obr: true javadoc: true bom: true @@ -255,7 +255,7 @@ managers: isolated: true - artifact: dev.galasa.kubernetes.manager - version: 0.33.0 + version: 0.34.0 obr: true javadoc: true bom: true @@ -319,7 +319,7 @@ managers: isolated: true - artifact: dev.galasa.selenium.manager - version: 0.31.0 + version: 0.34.0 obr: true javadoc: true bom: true @@ -340,7 +340,7 @@ managers: isolated: true - artifact: dev.galasa.textscan.manager - version: 0.21.0 + version: 0.34.0 obr: true mvp: true javadoc: true @@ -357,7 +357,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosbatch.rseapi.manager - version: 0.33.0 + version: 0.34.0 obr: true bom: true mvp: true @@ -365,7 +365,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosbatch.zosmf.manager - version: 0.31.0 + version: 0.34.0 obr: true bom: true mvp: true @@ -389,7 +389,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosfile.rseapi.manager - version: 0.31.0 + version: 0.34.0 obr: true bom: true mvp: true @@ -397,7 +397,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosfile.zosmf.manager - version: 0.31.0 + version: 0.34.0 obr: true bom: true mvp: true @@ -405,7 +405,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosliberty.manager - version: 0.21.0 + version: 0.34.0 obr: true mvp: true javadoc: true @@ -414,7 +414,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosliberty.angel.manager - version: 0.21.0 + version: 0.34.0 obr: true javadoc: true bom: true @@ -422,7 +422,7 @@ managers: codecoverage: true - artifact: dev.galasa.zos.manager - version: 0.31.0 + version: 0.34.0 obr: true javadoc: true bom: true @@ -446,7 +446,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosmf.manager - version: 0.31.0 + version: 0.34.0 obr: true javadoc: true bom: true @@ -455,7 +455,7 @@ managers: codecoverage: true - artifact: dev.galasa.zosrseapi.manager - version: 0.31.0 + version: 0.34.0 obr: true javadoc: true bom: true @@ -464,7 +464,7 @@ managers: codecoverage: true - artifact: dev.galasa.zossecurity.manager - version: 0.31.0 + version: 0.34.0 obr: true javadoc: true bom: true @@ -497,7 +497,7 @@ managers: codecoverage: true - artifact: dev.galasa.zos3270.manager - version: 0.32.0 + version: 0.34.0 obr: true javadoc: true bom: true From b4551511d193e832cdcfa0a26ce72273966ac364 Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Fri, 10 May 2024 10:55:17 +0100 Subject: [PATCH 187/263] removed duplicate dependency implementations Signed-off-by: Savvas Kyriacou --- .../dev.galasa.zosfile.rseapi.manager/build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle index 2c0329dab..a9340ba66 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/build.gradle @@ -11,8 +11,6 @@ dependencies { implementation 'org.apache.commons:commons-lang3:3.14.0' implementation 'com.google.code.gson:gson:2.10.1' implementation 'org.apache.commons:commons-collections4:4.4' - implementation 'org.apache.commons:commons-lang3:3.14.0' - implementation 'org.apache.commons:commons-collections4:4.4' implementation 'commons-io:commons-io:2.16.1' } From 72c51b3b86be966a33add68bd6a66a22fb13e589 Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Mon, 13 May 2024 16:20:58 +0100 Subject: [PATCH 188/263] updated version of dev.galasa package to 0.34.0 Signed-off-by: Savvas Kyriacou --- .../buildSrc/src/main/groovy/galasa.manager.gradle | 2 +- .../buildSrc/src/main/groovy/galasa.manager.ivt.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle index 215f2ce75..438a1bc38 100644 --- a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle +++ b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle @@ -5,7 +5,7 @@ plugins { } dependencies { - api 'dev.galasa:dev.galasa:0.21.0' + api 'dev.galasa:dev.galasa:0.34.0' implementation 'dev.galasa:dev.galasa.framework:0.34.0' implementation 'commons-logging:commons-logging:1.2' implementation 'org.osgi:org.osgi.core:6.0.0' diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.ivt.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.ivt.gradle index 02fd96028..ec2915763 100644 --- a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.ivt.gradle +++ b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.ivt.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - implementation 'dev.galasa:dev.galasa:0.21.0' + implementation 'dev.galasa:dev.galasa:0.34.0' implementation 'commons-logging:commons-logging:1.2' From d1b7995e65602c693cc8aa35b7cd2254d42e1dab Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Mon, 13 May 2024 17:08:34 +0100 Subject: [PATCH 189/263] Empty Commit to trigger build. Signed-off-by: Savvas Kyriacou From f716f561822dcba7d894299e7bf757815fb437da Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Wed, 22 May 2024 10:28:10 +0100 Subject: [PATCH 190/263] added com.ibm.dataacess to the bundle package imports Signed-off-by: Savvas Kyriacou --- .../dev.galasa.db2.manager.ivt/bnd.bnd | 2 +- .../dev.galasa.db2.manager.ivt/build.gradle | 2 +- .../dev.galasa.db2.manager/bnd.bnd | 2 +- .../dev.galasa.db2.manager/build.gradle | 2 +- release.yaml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/bnd.bnd b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/bnd.bnd index 10ec210d6..7f45249f1 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/bnd.bnd @@ -1,5 +1,5 @@ -snapshot: ${tstamp} Bundle-Name: Galasa Db2 Manager IVT Export-Package: dev.galasa.db2.manager.ivt -Import-Package: !javax.validation.constraints, \ +Import-Package: javax.validation.constraints, \ * diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/build.gradle index c6a3f65df..5a7ca8919 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Db2 Manager IVTs' -version = '0.25.0' +version = '0.34.0' dependencies { implementation project(':galasa-managers-database-parent:dev.galasa.db2.manager') diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/bnd.bnd index ab89ca8e6..80beccf94 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/bnd.bnd @@ -5,7 +5,7 @@ Export-Package: dev.galasa.db2,\ Import-Package: !javax.validation.constraints, \ !com.ibm.bidiTools.bdlayout, \ !com.ibm.cics.server, \ - !com.ibm.dataaccess, \ + com.ibm.dataaccess, \ !COM.ibm.db2os390.sqlj.runtime, \ !com.ibm.jvm, \ !com.ibm.net, \ diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle index 2d8770ddc..357db1e8b 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Db2 Manager' -version = '0.25.0' +version = '0.34.0' dependencies { // implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') diff --git a/release.yaml b/release.yaml index e7ef18f7b..ef41acd0f 100644 --- a/release.yaml +++ b/release.yaml @@ -134,7 +134,7 @@ managers: isolated: true - artifact: dev.galasa.db2.manager - version: 0.25.0 + version: 0.34.0 obr: true bom: true javadoc: true @@ -142,7 +142,7 @@ managers: isolated: true - artifact: dev.galasa.db2.manager.ivt - version: 0.21.0 + version: 0.34.0 obr: true mvp: true isolated: true From 477740ff84729fceaf5b1ab30d5afb4b96588a8b Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Wed, 22 May 2024 10:39:59 +0100 Subject: [PATCH 191/263] corrected db2.manager.ivt bundle file Signed-off-by: Savvas Kyriacou --- .../dev.galasa.db2.manager.ivt/bnd.bnd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/bnd.bnd b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/bnd.bnd index 7f45249f1..10ec210d6 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/bnd.bnd @@ -1,5 +1,5 @@ -snapshot: ${tstamp} Bundle-Name: Galasa Db2 Manager IVT Export-Package: dev.galasa.db2.manager.ivt -Import-Package: javax.validation.constraints, \ +Import-Package: !javax.validation.constraints, \ * From 84decdf394b0d0c0e84c5d6144abc12b8230619c Mon Sep 17 00:00:00 2001 From: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> Date: Wed, 22 May 2024 16:02:04 +0100 Subject: [PATCH 192/263] sdv manager delivery Signed-off-by: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> --- .../dev.galasa.sdv.manager.ivt/build.gradle | 30 + .../settings.gradle | 1 + .../galasa/sdv/manager/ivt/SdvManagerIVT.java | 56 + .../dev.galasa.sdv.manager/bnd.bnd | 7 + .../dev.galasa.sdv.manager/build.gradle | 97 + .../config/checkstyle/checkstyle.xml | 377 ++ .../config/pmd/sdvrules.xml | 317 ++ .../config/spotbugs/excludes.xml | 50 + .../dev.galasa.sdv.manager/settings.gradle | 1 + .../main/java/dev/galasa/sdv/ISdvUser.java | 38 + .../dev/galasa/sdv/SdvManagerException.java | 32 + .../java/dev/galasa/sdv/SdvManagerField.java | 23 + .../src/main/java/dev/galasa/sdv/SdvUser.java | 41 + .../galasa/sdv/internal/RecordingRegion.java | 59 + .../sdv/internal/SdvHttpRecorderImpl.java | 415 ++ .../galasa/sdv/internal/SdvManagerImpl.java | 448 ++ .../internal/SdvManagersResourceMonitor.java | 151 + .../galasa/sdv/internal/SdvRecorderImpl.java | 554 +++ .../sdv/internal/SdvResourceManagement.java | 83 + .../dev/galasa/sdv/internal/SdvUserImpl.java | 154 + .../dev/galasa/sdv/internal/SdvUserPool.java | 140 + .../sdv/internal/SdvUserResourceMonitor.java | 122 + .../sdv/internal/properties/SdvHlq.java | 45 + .../sdv/internal/properties/SdvPoolUsers.java | 48 + .../sdv/internal/properties/SdvPort.java | 45 + .../properties/SdvPropertiesSingleton.java | 58 + .../sdv/internal/properties/SdvRole.java | 45 + .../internal/properties/SdvSdcActivation.java | 55 + .../properties/SdvSrrLogstreamRemoval.java | 57 + .../main/resources/jcl/definelogstream.jcl | 12 + .../main/resources/jcl/deletelogstreams.jcl | 19 + .../src/main/resources/jcl/getYaml.jcl | 7 + .../sdv/internal/TestRecordingRegion.java | 71 + .../sdv/internal/TestSdvHttpRecorderImpl.java | 4157 +++++++++++++++++ .../sdv/internal/TestSdvManagerImpl.java | 1928 ++++++++ .../TestSdvManagersResourceMonitor.java | 460 ++ .../internal/TestSdvResourceManagement.java | 135 + .../galasa/sdv/internal/TestSdvUserImpl.java | 71 + .../galasa/sdv/internal/TestSdvUserPool.java | 328 ++ .../internal/TestSdvUserResourceMonitor.java | 440 ++ .../src/test/resources/getYaml.jcl | 7 + .../src/test/resources/getYamlRegionA.jcl | 13 + .../src/test/resources/getYamlRegionB.jcl | 11 + .../src/test/resources/yamlRegionA.yaml | 1 + .../src/test/resources/yamlRegionB.yaml | 1 + galasa-managers-parent/gradle.properties | 2 +- galasa-managers-parent/settings.gradle | 2 + release.yaml | 15 + 48 files changed, 11228 insertions(+), 1 deletion(-) create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/build.gradle create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/settings.gradle create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/src/main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/bnd.bnd create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/build.gradle create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/config/checkstyle/checkstyle.xml create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/config/pmd/sdvrules.xml create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/config/spotbugs/excludes.xml create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/settings.gradle create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/ISdvUser.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/SdvManagerException.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/SdvManagerField.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/SdvUser.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/RecordingRegion.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvHttpRecorderImpl.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvManagerImpl.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvManagersResourceMonitor.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvRecorderImpl.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvResourceManagement.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvUserImpl.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvUserPool.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvUserResourceMonitor.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvHlq.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvPoolUsers.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvPort.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvPropertiesSingleton.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvRole.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvSdcActivation.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvSrrLogstreamRemoval.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/resources/jcl/definelogstream.jcl create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/resources/jcl/deletelogstreams.jcl create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/resources/jcl/getYaml.jcl create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestRecordingRegion.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvHttpRecorderImpl.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvManagerImpl.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvManagersResourceMonitor.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvResourceManagement.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvUserImpl.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvUserPool.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvUserResourceMonitor.java create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/resources/getYaml.jcl create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/resources/getYamlRegionA.jcl create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/resources/getYamlRegionB.jcl create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/resources/yamlRegionA.yaml create mode 100644 galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/resources/yamlRegionB.yaml diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/build.gradle new file mode 100644 index 000000000..431a18aca --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/build.gradle @@ -0,0 +1,30 @@ +plugins { + id 'galasa.manager.ivt' +} + +description = 'Galasa SDV Manager IVT' + +version = '0.34.0' + +dependencies { + implementation project (':galasa-managers-cicsts-parent:dev.galasa.cicsts.ceci.manager') + implementation project (':galasa-managers-core-parent:dev.galasa.core.manager') + implementation project (':galasa-managers-cicsts-parent:dev.galasa.cicsts.manager') + implementation project (':galasa-managers-zos-parent:dev.galasa.zos3270.manager') + implementation project (':galasa-managers-zos-parent:dev.galasa.zos.manager') + implementation project (':galasa-managers-core-parent:dev.galasa.artifact.manager') + implementation project (':galasa-managers-testingtools-parent:dev.galasa.sdv.manager') +} + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.projectName=project.name +ext.includeInOBR = false +ext.includeInMVP = false +ext.includeInBOM = false +ext.includeInIsolated = false +ext.includeInCodeCoverage = false +ext.includeInJavadoc = false diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/settings.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/settings.gradle new file mode 100644 index 000000000..96a5356df --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'dev.galasa.sdv.manager.ivt' \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/src/main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/src/main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java new file mode 100644 index 000000000..0e285ecb9 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/src/main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java @@ -0,0 +1,56 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ +package dev.galasa.sdv.manager.ivt; + +import org.apache.commons.logging.Log; + +import static org.assertj.core.api.Assertions.assertThat; + +import dev.galasa.BeforeClass; +import dev.galasa.Test; +import dev.galasa.cicsts.CicsRegion; +import dev.galasa.cicsts.CicsTerminal; +import dev.galasa.cicsts.ICicsRegion; +import dev.galasa.cicsts.ICicsTerminal; +import dev.galasa.core.manager.Logger; +import dev.galasa.sdv.ISdvUser; +import dev.galasa.sdv.SdvManagerException; +import dev.galasa.sdv.SdvUser; + + @Test + public class SdvManagerIVT { + + @Logger + public Log logger; + + @CicsRegion + public ICicsRegion cics; + + @CicsTerminal + public ICicsTerminal terminal; + + @SdvUser(roleTag = "role1") + public ISdvUser user1; + + private static final String SDV_TCPIPSERVICE_NAME = "SDVXSDT"; + + @BeforeClass + public void logIntoTerminals() throws SdvManagerException { + user1.logIntoTerminal(terminal); + } + + @Test + public void userUsesCeda() throws Exception { + + terminal.type("CEDA DI G(SDVGRP)").enter().waitForTextInField(SDV_TCPIPSERVICE_NAME); + + assertThat(terminal.searchText(SDV_TCPIPSERVICE_NAME)) + .as("Expectation to see " + SDV_TCPIPSERVICE_NAME + " in terminal").isTrue(); + terminal.pf3(); + } + + } + \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/bnd.bnd new file mode 100644 index 000000000..2c28add93 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/bnd.bnd @@ -0,0 +1,7 @@ +-snapshot: ${tstamp} +Bundle-Name: Galasa SDV Manager +Export-Package: dev.galasa.sdv +Import-Package: !javax.validation.constraints,\ + * + + diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/build.gradle new file mode 100644 index 000000000..11be80ff0 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/build.gradle @@ -0,0 +1,97 @@ +plugins { + id 'galasa.manager' + id 'checkstyle' + id 'pmd' + id("com.github.spotbugs") version "4.7.0" +} + +description = 'Galasa SDV Manager' + +version = '0.34.0' + +checkstyle { + configFile = file("config/checkstyle/checkstyle.xml") + toolVersion = "10.14.2" +} +configurations.all { + attributes { + attribute(Attribute.of('org.gradle.jvm.environment', String), 'standard-jvm') + } +} + +jacoco { + toolVersion = "0.8.7" +} + +pmd { + consoleOutput = true + toolVersion = "6.50.0" + ruleSetFiles = files("config/pmd/sdvrules.xml") + ruleSets = [] +} + +dependencies { + + implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') + implementation project(':galasa-managers-zos-parent:dev.galasa.zos3270.manager') + implementation project(':galasa-managers-cicsts-parent:dev.galasa.cicsts.manager') + implementation project(':galasa-managers-comms-parent:dev.galasa.http.manager') + implementation 'com.google.code.gson:gson:2.10.1' + + // Unit testing + testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2' + testImplementation 'org.mockito:mockito-core:5.3.1' + testImplementation 'org.mockito:mockito-junit-jupiter:5.3.1' + testImplementation 'commons-io:commons-io:2.16.1' +} + +test { + useJUnitPlatform() + maxHeapSize = '1G' + finalizedBy jacocoTestReport // report is always generated after tests run + enabled true +} + +tasks.withType(com.github.spotbugs.snom.SpotBugsTask) { + excludeFilter = file("config/spotbugs/excludes.xml") + reports { + xml { + enabled = true + } + html { + enabled = true + } + } +} + +jacocoTestReport { + enabled true + dependsOn test // tests are required to run before generating the report +} + +jacocoTestCoverageVerification { + violationRules { + rule { + limit { + counter = 'LINE' + value = 'COVEREDRATIO' + minimum = 0.84 + } + } + } +} + +check.dependsOn jacocoTestCoverageVerification + +// Note: These values are consumed by the parent build process +// They indicate which packages of functionality this OSGi bundle should be delivered inside, +// or referenced from. +// The settings here are gathered together by the build process to create a release.yaml file +// which gathers-up all the packaging metadata about all the OSGi bundles in this component. +ext.projectName=project.name +ext.includeInOBR = true +ext.includeInMVP = true +ext.includeInBOM = true +ext.includeInIsolated = true +ext.includeInCodeCoverage = true +ext.includeInJavadoc = true \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/config/checkstyle/checkstyle.xml b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/config/checkstyle/checkstyle.xml new file mode 100644 index 000000000..f795191a7 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/config/checkstyle/checkstyle.xml @@ -0,0 +1,377 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/config/pmd/sdvrules.xml b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/config/pmd/sdvrules.xml new file mode 100644 index 000000000..dcc694c47 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/config/pmd/sdvrules.xml @@ -0,0 +1,317 @@ + + + SDV configuration of PMD. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/config/spotbugs/excludes.xml b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/config/spotbugs/excludes.xml new file mode 100644 index 000000000..423a426f9 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/config/spotbugs/excludes.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/settings.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/settings.gradle new file mode 100644 index 000000000..fa2508d23 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'dev.galasa.sdv.manager' diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/ISdvUser.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/ISdvUser.java new file mode 100644 index 000000000..e94d9c3ca --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/ISdvUser.java @@ -0,0 +1,38 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv; + +import dev.galasa.cicsts.ICicsTerminal; + +/** + * This class provides the interface for + * SDVUserImpl. + * + */ +public interface ISdvUser { + + String getCredentialsTag(); + + String getUsername(); + + String getPassword(); + + String getRole(); + + String getCicsTag(); + + String getSrrId(); + + Boolean isRecording(); + + void setSrrId(String srrId); + + void setNotRecording(); + + void logIntoTerminal(ICicsTerminal terminal) throws SdvManagerException; + +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/SdvManagerException.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/SdvManagerException.java new file mode 100644 index 000000000..9d8d0fd06 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/SdvManagerException.java @@ -0,0 +1,32 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv; + +import dev.galasa.ManagerException; + +/** + * This class provides a generic Exception which can be thrown + * throughout the SDV Manager. + * + */ +public class SdvManagerException extends ManagerException { + + private static final long serialVersionUID = 1L; + + public SdvManagerException() { + // This constructor is intentionally empty. Nothing special is needed here. + } + + public SdvManagerException(String message) { + super(message); + } + + public SdvManagerException(String message, Throwable cause) { + super(message, cause); + } + +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/SdvManagerField.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/SdvManagerField.java new file mode 100644 index 000000000..165fadb03 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/SdvManagerField.java @@ -0,0 +1,23 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Used to annotate annotations that are to be used for Test Class fields. To be populated by the + * Manager. + * + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +public @interface SdvManagerField { + +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/SdvUser.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/SdvUser.java new file mode 100644 index 000000000..a7f8fdd72 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/SdvUser.java @@ -0,0 +1,41 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv; + +import dev.galasa.framework.spi.ValidAnnotatedFields; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + + +/** + * A zOS User that will have SDV recording switched on, on a specified CICS TS Region. + * + *

      + * Used to populate a {@link ISdvUser} field + *

      + * + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +@SdvManagerField +@ValidAnnotatedFields({ISdvUser.class}) +public @interface SdvUser { + + /** + * The tag of the CICS region the User is to be associated with. SDV Recording will take place + * for this user on this CICS Region. + */ + String cicsTag() default "PRIMARY"; + + /** + * The SDV manager will select a user from the zOS image pool user matching this roleTag. + */ + String roleTag(); + +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/RecordingRegion.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/RecordingRegion.java new file mode 100644 index 000000000..3f95e389d --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/RecordingRegion.java @@ -0,0 +1,59 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal; + +import dev.galasa.cicsts.ICicsTerminal; +import dev.galasa.sdv.ISdvUser; +import dev.galasa.sdv.SdvManagerException; +import java.util.ArrayList; +import java.util.List; + +/** + * This class contains all required information to run SDV + * for a single CICS Region under test. + * + *

      Each region has it own maintenance terminal to allow the + * creation, and tear down of required resources, and contains a + * list of all SDV Users being recorded on that region. + * + */ +class RecordingRegion { + + private ICicsTerminal maintenanceTerminal; + private List recordingUsers = new ArrayList<>(); + + public RecordingRegion(ICicsTerminal maintenanceTerminal) { + this.maintenanceTerminal = maintenanceTerminal; + } + + public ICicsTerminal getMaintenanceTerminal() { + return this.maintenanceTerminal; + } + + public Boolean addUserToRecord(ISdvUser user) throws SdvManagerException { + + // Check if user already exists in the list. This would mean + // the user had incorrectly been provisioned to a CICS region + // more than one by the pool code. In which case, this would + // be a bug + for (ISdvUser ru : recordingUsers) { + if (user.getUsername().equals(ru.getUsername())) { + throw new SdvManagerException("User '" + user.getUsername() + + "' has been allocated to more than one region in the test." + + " Please report this to the Galasa project."); + } + } + + recordingUsers.add(user); + return true; + } + + public List getRecordingUsers() { + return this.recordingUsers; + } + +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvHttpRecorderImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvHttpRecorderImpl.java new file mode 100644 index 000000000..7e95e2246 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvHttpRecorderImpl.java @@ -0,0 +1,415 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal; + +import com.google.gson.JsonObject; +import dev.galasa.artifact.IArtifactManager; +import dev.galasa.cicsts.CicstsManagerException; +import dev.galasa.cicsts.ICicsRegion; +import dev.galasa.cicsts.ICicsTerminal; +import dev.galasa.framework.spi.IDynamicStatusStoreService; +import dev.galasa.framework.spi.IFramework; +import dev.galasa.http.HttpClientException; +import dev.galasa.http.HttpClientResponse; +import dev.galasa.http.IHttpClient; +import dev.galasa.http.spi.IHttpManagerSpi; +import dev.galasa.sdv.ISdvUser; +import dev.galasa.sdv.SdvManagerException; +import dev.galasa.sdv.internal.properties.SdvPort; +import dev.galasa.zosbatch.spi.IZosBatchSpi; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.file.Path; +import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * This class contains HTTP specific implementations of the SdvRecorderImpl abstract class. + * + *

      A number of functions from SdvRecorderImpl are overridden to provide HTTP recorder-only + * functionality. In particular, the creation and teardown of HTTP specific resources, and the + * start/end of SDC recording via HTTP endpoints. + * + */ +public class SdvHttpRecorderImpl extends SdvRecorderImpl { + + private static final String TCPIPSERVICE_TEXT = "TCPIPSERVICE"; + private static final String SDV_TCPIPSERVICE_RESOURCE_NAME = "SDVXSDT"; + private static final String URIMAP_TEXT = "URIMAP"; + private static final String SDV_URIMAP_RESOURCE_NAME = "SDVXSDU"; + private static final String SDV_HTTP_ENDPOINT_PATH = "/DFHSDC"; + private static final String ON_CICS_REGION_MSG = "', on CICS Region "; + private static final String STATUS_CODE_MSG = ". Status code: "; + + private static final Log LOG = LogFactory.getLog(SdvHttpRecorderImpl.class); + + private IHttpManagerSpi httpManager; + + /** + * The HTTP recorder constructor, which instantiates super class SdvRecorderImpl, then + * additionally takes an http manager. + * + * @param framework - Galasa framework + * @param recordingRegions - A unique Map of CICS regions under test. + * @param artifactManager - Galasa Artifact Manager. + * @param batchManager - Galasa Batch Manager. + * @param storedArtifactRoot - The path where files should be stored to be included as test + * artifacts. + * @param dss - Galasa DSS. + * @param httpManager - Galasa HTTP Manager. + */ + public SdvHttpRecorderImpl(IFramework framework, Map recordingRegions, IArtifactManager artifactManager, + IZosBatchSpi batchManager, Path storedArtifactRoot, + IDynamicStatusStoreService dss, IHttpManagerSpi httpManager) { + super(framework, recordingRegions, artifactManager, batchManager, storedArtifactRoot, dss); + + this.httpManager = httpManager; + } + + @Override + protected void createCicsResources(ICicsRegion region, ICicsTerminal terminal) + throws SdvManagerException { + + // Deleting possible remains of a previous run + if (LOG.isInfoEnabled()) { + LOG.info("Deleting any existing resources on " + region.getApplid()); + } + try { + if (region.ceda().resourceExists(terminal, TCPIPSERVICE_TEXT, + SDV_TCPIPSERVICE_RESOURCE_NAME, CICS_RESOURCES_GROUP_NAME)) { + region.cemt().setResource(terminal, TCPIPSERVICE_TEXT, + SDV_TCPIPSERVICE_RESOURCE_NAME, "CLOSED"); + } + if (region.ceda().resourceExists(terminal, URIMAP_TEXT, SDV_URIMAP_RESOURCE_NAME, + CICS_RESOURCES_GROUP_NAME)) { + region.cemt().setResource(terminal, URIMAP_TEXT, SDV_URIMAP_RESOURCE_NAME, + "DISABLED"); + } + region.ceda().deleteGroup(terminal, CICS_RESOURCES_GROUP_NAME); + } catch (CicstsManagerException e) { + if (LOG.isDebugEnabled()) { + LOG.debug("CICS resource disabling expectedly failed on " + region.getApplid()); + } + } + + // Run common SDC pre-reqs + super.createCicsResources(region, terminal); + + // Run HTTP specific pre-reqs + // TCPIPSERVICE + if (LOG.isInfoEnabled()) { + LOG.info("Creating TCPIPSERVICE on " + region.getApplid()); + } + + String port = SdvPort.get(region.getTag()); + if (port == null) { + throw new SdvManagerException( + "Could not find SDC port in CPS properties for CICS tag: " + region.getTag() + ); + } + + try { + region.ceda().createResource(terminal, TCPIPSERVICE_TEXT, + SDV_TCPIPSERVICE_RESOURCE_NAME, CICS_RESOURCES_GROUP_NAME, + "TRANSACTION(CWXN) PORTNUMBER(" + port + ") AUTHENTICATE(BASIC)" + + "PROTOCOL(HTTP)"); + } catch (CicstsManagerException e) { + throw new SdvManagerException( + "Could not create TCPIPSERVICE on CICS Region " + region.getApplid(), e + ); + } + + // URIMAP + if (LOG.isInfoEnabled()) { + LOG.info("Creating URIMAP on " + region.getApplid()); + } + try { + region.ceda().createResource(terminal, URIMAP_TEXT, SDV_URIMAP_RESOURCE_NAME, + CICS_RESOURCES_GROUP_NAME, + "USAGE(SERVER) SCHEME(HTTP) PATH(" + SDV_HTTP_ENDPOINT_PATH + "*) TCPIPSERVICE(" + + SDV_TCPIPSERVICE_RESOURCE_NAME + ") " + + "PROGRAM(DFHXSJH) HOST(*) TRANSACTION(CXSD)"); + } catch (CicstsManagerException e) { + throw new SdvManagerException( + "Could not create URIMAP on CICS region " + region.getApplid(), e + ); + } + + try { + region.ceda().installGroup(terminal, CICS_RESOURCES_GROUP_NAME); + } catch (CicstsManagerException e) { + throw new SdvManagerException( + "Could not install SDV resource group on CICS region " + region.getApplid(), e + ); + } + } + + @Override + protected void deleteCicsResources(ICicsRegion region, ICicsTerminal terminal) { + + // URIMAP + if (LOG.isInfoEnabled()) { + LOG.info("Disabling URIMAP on " + region.getApplid()); + } + try { + region.cemt().setResource(terminal, URIMAP_TEXT, SDV_URIMAP_RESOURCE_NAME, "DISABLED"); + } catch (CicstsManagerException e) { + if (LOG.isErrorEnabled()) { + LOG.error("Could not create URIMAP on CICS Region " + region.getApplid()); + } + } + + // TCPIPSERVICE + if (LOG.isInfoEnabled()) { + LOG.info("Disabling TCPIPSERVICE on " + region.getApplid()); + } + try { + region.cemt().setResource(terminal, TCPIPSERVICE_TEXT, SDV_TCPIPSERVICE_RESOURCE_NAME, + "CLOSED"); + } catch (CicstsManagerException e) { + if (LOG.isErrorEnabled()) { + LOG.error("Could not create TCPIPSERVICE on CICS Region " + region.getApplid()); + } + } + + // Delete common SDC resources + super.deleteCicsResources(region, terminal); + } + + @Override + void startRecording() throws SdvManagerException { + for (Map.Entry entry : recordingRegions.entrySet()) { + for (ISdvUser recordingUser : entry.getValue().getRecordingUsers()) { + + if (LOG.isInfoEnabled()) { + LOG.info("Starting SDV Recording for CICS region: " + entry.getKey().getApplid() + + ", User: " + recordingUser.getUsername()); + } + try { + startRecordingUsingHttp(entry.getKey(), recordingUser); + + if (LOG.isInfoEnabled()) { + LOG.info("Recording CICS region: " + entry.getKey().getApplid() + ", User: " + + recordingUser.getUsername() + ", SRR ID: " + + recordingUser.getSrrId()); + } + } catch (SdvManagerException e) { + throw new SdvManagerException( + "Was unable to start recording for user '" + + recordingUser.getUsername() + + ON_CICS_REGION_MSG + + entry.getKey().getApplid(), e); + } + } + } + } + + private void startRecordingUsingHttp(ICicsRegion cicsRegion, ISdvUser recordingUser) + throws SdvManagerException { + + IHttpClient httpClient = this.httpManager.newHttpClient(); + + try { + httpClient.setURI(new URI("http://" + cicsRegion.getZosImage().getIpHost().getHostname() + + ":" + SdvPort.get(cicsRegion.getTag()))); + } catch (URISyntaxException e) { + throw new SdvManagerException( + "Badly formed URI for SDC service for CICS Region " + cicsRegion.getApplid(), e + ); + } + + HttpClientResponse response; + httpClient.setAuthorisation(recordingUser.getUsername(), recordingUser.getPassword()); + + // Check that an SDC isn't already running + Boolean sdcAlreadyRunning = false; + try { + response = httpClient.getJson(SDV_HTTP_ENDPOINT_PATH); + + if (response.getStatusCode() == 200) { + sdcAlreadyRunning = true; + } else if (response.getStatusCode() == 404) { + sdcAlreadyRunning = false; + } else { + JsonObject payload = response.getContent(); + String payloadStr = ""; + if (payload != null) { + payloadStr = payload.toString(); + } + + throw new SdvManagerException( + "Error whilst obtaining current SDC status for user '" + + recordingUser.getUsername() + + ON_CICS_REGION_MSG + + cicsRegion.getApplid() + + STATUS_CODE_MSG + + response.getStatusCode() + "\n" + response.getStatusMessage() + + "\n" + payloadStr); + } + } catch (HttpClientException e) { + throw new SdvManagerException( + "Could not check status SDC recording status for user '" + + recordingUser.getUsername() + + ON_CICS_REGION_MSG + + cicsRegion.getApplid() + + ". Is SDC activated?", e); + } + + // If an SDC is already running, stop it + if (sdcAlreadyRunning) { + try { + JsonObject body = new JsonObject(); + body.addProperty("submit", false); + response = httpClient.deleteJson(SDV_HTTP_ENDPOINT_PATH, body); + + if (response.getStatusCode() != 200) { + JsonObject payload = response.getContent(); + String payloadStr = ""; + if (payload != null) { + payloadStr = payload.toString(); + } + throw new SdvManagerException( + "Could not stop SDC recording for user '" + + recordingUser.getUsername() + + ON_CICS_REGION_MSG + + cicsRegion.getApplid() + + STATUS_CODE_MSG + + response.getStatusCode() + + "\n" + response.getStatusMessage() + + "\n" + payloadStr); + } + } catch (HttpClientException e) { + throw new SdvManagerException("Could not stop existing SDC recording for user '" + + recordingUser.getUsername() + + ON_CICS_REGION_MSG + + cicsRegion.getApplid() + ".", e); + } + } + + try { + JsonObject body = new JsonObject(); + response = httpClient.postJson(SDV_HTTP_ENDPOINT_PATH, body); + + if (response.getStatusCode() == 201) { + if (response.getContent().has("srr_id") + && !response.getContent().get("srr_id").getAsString().isBlank()) { + recordingUser.setSrrId(response.getContent().get("srr_id").getAsString()); + } else { + throw new SdvManagerException( + "SDC recording did not return an SRR ID for user '" + + recordingUser.getUsername() + + ON_CICS_REGION_MSG + + cicsRegion.getApplid() + ); + } + } else { + JsonObject payload = response.getContent(); + String payloadStr = ""; + if (payload != null) { + payloadStr = payload.toString(); + } + throw new SdvManagerException( + "Could not start SDC recording for user '" + + recordingUser.getUsername() + + ON_CICS_REGION_MSG + + cicsRegion.getApplid() + + STATUS_CODE_MSG + + response.getStatusCode() + + "\n" + response.getStatusMessage() + "\n" + payloadStr + ); + } + } catch (HttpClientException e) { + throw new SdvManagerException( + "Could not start SDC recording for user '" + + recordingUser.getUsername() + + ON_CICS_REGION_MSG + + cicsRegion.getApplid(), e + ); + } + } + + @Override + void endRecording() throws SdvManagerException { + for (Map.Entry entry : recordingRegions.entrySet()) { + for (ISdvUser recordingUser : entry.getValue().getRecordingUsers()) { + if (recordingUser.isRecording()) { + if (LOG.isInfoEnabled()) { + LOG.info("Ending SDV Recording for region: " + entry.getKey().getApplid() + + ", User: " + recordingUser.getUsername() + ", SRR ID: " + + recordingUser.getSrrId()); + } + try { + stopRecordingUsingHttp(entry.getKey(), recordingUser); + } catch (SdvManagerException e) { + throw new SdvManagerException( + "Unable to stop SRR recording " + + recordingUser.getSrrId() + + ", for user '" + + recordingUser.getUsername() + + ON_CICS_REGION_MSG + + entry.getKey().getApplid(), e + ); + } + } + } + } + } + + private void stopRecordingUsingHttp(ICicsRegion cicsRegion, ISdvUser recordingUser) + throws SdvManagerException { + + IHttpClient httpClient = this.httpManager.newHttpClient(); + + try { + httpClient.setURI(new URI("http://" + cicsRegion.getZosImage().getIpHost().getHostname() + + ":" + SdvPort.get(cicsRegion.getTag()))); + } catch (URISyntaxException e) { + throw new SdvManagerException( + "Badly formed URI for SDC service for CICS Region " + cicsRegion.getApplid(), e + ); + } + + HttpClientResponse response; + httpClient.setAuthorisation(recordingUser.getUsername(), recordingUser.getPassword()); + + try { + JsonObject body = new JsonObject(); + body.addProperty("submit", false); + response = httpClient.deleteJson(SDV_HTTP_ENDPOINT_PATH, body); + + if (response.getStatusCode() != 200) { + JsonObject payload = response.getContent(); + String payloadStr = ""; + if (payload != null) { + payloadStr = payload.toString(); + } + throw new SdvManagerException( + "Could not stop SDC recording for user '" + + recordingUser.getUsername() + + ON_CICS_REGION_MSG + + cicsRegion.getApplid() + + STATUS_CODE_MSG + + response.getStatusCode() + + "\n" + response.getStatusMessage() + + "\n" + payloadStr + ); + } + + recordingUser.setNotRecording(); + } catch (HttpClientException e) { + throw new SdvManagerException( + "Could not stop existing SDC recording for user '" + + recordingUser.getUsername() + + ON_CICS_REGION_MSG + + cicsRegion.getApplid(), e + ); + } + } + +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvManagerImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvManagerImpl.java new file mode 100644 index 000000000..361173f9b --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvManagerImpl.java @@ -0,0 +1,448 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal; + +import dev.galasa.ICredentialsUsernamePassword; +import dev.galasa.ManagerException; +import dev.galasa.ProductVersion; +import dev.galasa.artifact.IArtifactManager; +import dev.galasa.cicsts.CicstsManagerException; +import dev.galasa.cicsts.ICicsRegion; +import dev.galasa.cicsts.ICicsTerminal; +import dev.galasa.cicsts.spi.ICicsRegionProvisioned; +import dev.galasa.cicsts.spi.ICicstsManagerSpi; +import dev.galasa.framework.spi.AbstractManager; +import dev.galasa.framework.spi.AnnotatedField; +import dev.galasa.framework.spi.ConfigurationPropertyStoreException; +import dev.galasa.framework.spi.DynamicStatusStoreException; +import dev.galasa.framework.spi.GenerateAnnotatedField; +import dev.galasa.framework.spi.IConfidentialTextService; +import dev.galasa.framework.spi.IConfigurationPropertyStoreService; +import dev.galasa.framework.spi.IDynamicStatusStoreService; +import dev.galasa.framework.spi.IFramework; +import dev.galasa.framework.spi.IManager; +import dev.galasa.framework.spi.ResourceUnavailableException; +import dev.galasa.framework.spi.Result; +import dev.galasa.framework.spi.creds.CredentialsException; +import dev.galasa.framework.spi.language.GalasaTest; +import dev.galasa.http.spi.IHttpManagerSpi; +import dev.galasa.sdv.ISdvUser; +import dev.galasa.sdv.SdvManagerException; +import dev.galasa.sdv.SdvManagerField; +import dev.galasa.sdv.SdvUser; +import dev.galasa.sdv.internal.properties.SdvHlq; +import dev.galasa.sdv.internal.properties.SdvPort; +import dev.galasa.sdv.internal.properties.SdvPropertiesSingleton; +import dev.galasa.sdv.internal.properties.SdvRole; +import dev.galasa.zosbatch.spi.IZosBatchSpi; +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.stream.Collectors; +import javax.validation.constraints.NotNull; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.osgi.service.component.annotations.Component; + +/** + * This class acts as the entry points to the SDV manager + * by the Galasa framework, and implements various functions + * at various points throughout the test framework lifecycle. + * + *

      It initialises the SDV manager, gathers all required + * config, assess which regions to record and what users, and + * intercepts and implements behaviour for test creation & + * teardown. + * + */ +@Component(service = {IManager.class}) +public class SdvManagerImpl extends AbstractManager { + + public static final String NAMESPACE = "sdv"; + + private static final Log LOG = LogFactory.getLog(SdvManagerImpl.class); + + // Dependencies on other managers + private ICicstsManagerSpi cicsManager; + private IZosBatchSpi batchManager; + private IHttpManagerSpi httpManager; + private IArtifactManager artifactManager; + private IDynamicStatusStoreService dss; + + private IConfidentialTextService cts; + + // User Pool management + private SdvUserPool sdvUserPool; + + // Local store of tested CICS regions, linked to their users and associated roles, each + // of which being recorded independently + private Map recordingRegions = new HashMap<>(); + + private Path storedArtifactRoot; + private SdvRecorderImpl sdvRecorder; + private List sdvUsersToRecordList = new ArrayList<>(); + + /** Define CF structure to be used when creating logstreams. */ + private static final String CFstructure = "LOG_GENERAL_001"; + + @Override + public void initialise(@NotNull IFramework framework, @NotNull List allManagers, + @NotNull List activeManagers, @NotNull GalasaTest galasaTest) + throws ManagerException { + super.initialise(framework, allManagers, activeManagers, galasaTest); + + // If this is not a java galasa test then exit + if (!galasaTest.isJava()) { + LOG.info("SDV recording is requested but is not eligible as this is not a Java test"); + return; + } + + // Check if SDV specific annotations exist. + // If not, don't use this manager. + List ourFields = findAnnotatedFields(SdvManagerField.class); + if (ourFields.isEmpty()) { + return; + } + + // Get access to the CPS so we can configure ourself + IConfigurationPropertyStoreService cps; + try { + cps = getFramework().getConfigurationPropertyService(NAMESPACE); + SdvPropertiesSingleton.setCps(cps); + } catch (ConfigurationPropertyStoreException e1) { + throw new SdvManagerException( + "Unable to access 'sdv' CPS namespace from framework services", + e1 + ); + } + + try { + this.dss = this.getFramework().getDynamicStatusStoreService(NAMESPACE); + } catch (DynamicStatusStoreException e) { + throw new SdvManagerException( + "Unable to access 'sdv' DSS namespace from framework services", + e + ); + } + + this.cts = framework.getConfidentialTextService(); + + // Initialise the SDV User pool manager + this.sdvUserPool = new SdvUserPool(this.getFramework(), dss, + this.getFramework().getResourcePoolingService()); + + this.storedArtifactRoot = getFramework().getResultArchiveStore().getStoredArtifactsRoot() + .resolve(NAMESPACE); + + // if we get here then we are required so add ourself to the list of active + // managers + youAreRequired(allManagers, activeManagers, galasaTest); + } + + @Override + public void youAreRequired(@NotNull List allManagers, + @NotNull List activeManagers, @NotNull GalasaTest galasaTest) + throws ManagerException { + + if (activeManagers.contains(this)) { + return; + } + + activeManagers.add(this); + + cicsManager = addDependentManager(allManagers, activeManagers, galasaTest, + ICicstsManagerSpi.class); + + if (cicsManager == null) { + throw new SdvManagerException("The CICS Manager is not available"); + } + + batchManager = + addDependentManager(allManagers, activeManagers, galasaTest, IZosBatchSpi.class); + if (batchManager == null) { + throw new SdvManagerException("The z/OS Batch Manager is not available"); + } + + artifactManager = addDependentManager(allManagers, activeManagers, galasaTest, + IArtifactManager.class); + if (artifactManager == null) { + throw new SdvManagerException("The Artifact Manager is not available"); + } + + httpManager = + addDependentManager(allManagers, activeManagers, galasaTest, IHttpManagerSpi.class); + if (httpManager == null) { + throw new SdvManagerException("The HTTP Manager is not available"); + } + } + + @Override + public boolean areYouProvisionalDependentOn(@NotNull IManager otherManager) { + if (otherManager instanceof ICicstsManagerSpi || otherManager instanceof IArtifactManager + || otherManager instanceof IHttpManagerSpi) { + return true; + } + + return super.areYouProvisionalDependentOn(otherManager); + } + + /** + * Provides what is returned by the SdvUser annotation. + * + *

      It will obtain an available zOS user from a pool users, which + * matches the specified role. If no users are availble, this + * function will throw an ResourceUnavailableException exception + * which will result in the Galasa framework cancelling the test run, and + * requeuing it to reattempt the test again after a period of time. + * + *

      The user will be added to the list of SDV Users within the + * RecordingRegion object. + * + * @param field - + * @param annotations - + * @return - ISdvUser + * @throws SdvManagerException generic errors encountered. + * @throws ResourceUnavailableException no available users in the pool. Galasa framework + * will handle. + */ + @GenerateAnnotatedField(annotation = SdvUser.class) + public ISdvUser getSdvUser(Field field, List annotations) + throws SdvManagerException, ResourceUnavailableException { + SdvUser annotation = field.getAnnotation(SdvUser.class); + + String cicsTag = defaultString(annotation.cicsTag(), "PRIMARY").toUpperCase(Locale.ROOT); + String roleTag = annotation.roleTag().toUpperCase(Locale.ROOT); + + if (roleTag.isBlank()) { + throw new SdvManagerException( + "SdvUser " + field.getName() + " cannot have a blank RoleTag."); + } + + String role = SdvRole.get(roleTag); + if (role == null) { + throw new SdvManagerException( + "Cannot find role. Please create or update CPS Property 'sdv.roleTag." + + roleTag + ".role'."); + } + + ICicsRegionProvisioned region = this.cicsManager.getTaggedCicsRegions().get(cicsTag); + if (region == null) { + throw new SdvManagerException( + "Unable to setup SDV User '" + field.getName() + "', for region with tag '" + + cicsTag + "' as a region with a matching 'cicsTag' tag was not found" + + ", or the region was not provisioned."); + } + + // Check a port has been given for the CICS region under test. + String port = SdvPort.get(region.getTag()); + if (port == null) { + throw new SdvManagerException( + "Could not find port. Please create or update CPS property 'sdv.cicsTag." + + region.getTag() + ".port'."); + } + + // Check an HLQ has been given for the CICS region under test. + String hlq = SdvHlq.get(region.getTag()); + if (hlq == null) { + throw new SdvManagerException( + "Could not find HLQ. Please create or update CPS property 'sdv.cicsTag." + + region.getTag() + ".hlq'."); + } + + // This can throw a ResourceUnavailableException, do not capture this + // let the framework handle it as it will re-queue the test for re-run + // later + String credentialTag = ""; + credentialTag = this.sdvUserPool.allocateUser(role, region); + + ICredentialsUsernamePassword credsObj = null; + try { + credsObj = (ICredentialsUsernamePassword) getFramework().getCredentialsService() + .getCredentials(credentialTag); + + cts.registerText(credsObj.getPassword(), + "Password for credential tag: " + credentialTag); + + } catch (CredentialsException e) { + throw new SdvManagerException( + "No credentials were found with the tag: " + credentialTag, e); + } + + SdvUserImpl newSdvUser = new SdvUserImpl(credentialTag, credsObj, cicsTag, role); + sdvUsersToRecordList.add(newSdvUser); + + return newSdvUser; + + } + + private void releaseUsers() throws CicstsManagerException { + // Release the users back to the pool + for (ISdvUser sdvUser : sdvUsersToRecordList) { + try { + SdvUserPool.deleteDss( + sdvUser.getCredentialsTag(), + cicsManager.locateCicsRegion(sdvUser.getCicsTag()).getApplid(), + getFramework().getTestRunName(), + this.dss + ); + } catch (DynamicStatusStoreException | CicstsManagerException e) { + if (LOG.isErrorEnabled()) { + LOG.error("Could not release SDV User: " + sdvUser.getCredentialsTag() + + ", on CICS region " + + cicsManager.locateCicsRegion(sdvUser.getCicsTag()).getApplid() + + ", for test run " + getFramework().getTestRunName(), e); + } + } + } + } + + @Override + public void provisionGenerate() throws ManagerException, ResourceUnavailableException { + + // *** Auto generate the fields + generateAnnotatedFields(SdvManagerField.class); + + // Create a list of regions, and their associated recordings + // per user + LOG.info("Populating list of CICS regions under test and recordings " + + "required for each user."); + + try { + for (Map.Entry entry : + cicsManager.getTaggedCicsRegions() + .entrySet()) { + + // Check CICS region is running version 750 or greater + if (entry.getValue().getVersion().isEarlierThan(ProductVersion.v(750))) { + if (LOG.isWarnEnabled()) { + LOG.warn("SDV recording will not take place on CICS region '" + + entry.getValue().getApplid() + + "'. Running version earlier than 750."); + } + continue; + } + + // Check CICS region has SEC=YES set + if (entry.getValue().getRegionJob().retrieveOutputAsString() + .contains("DFHXS1102I")) { + if (LOG.isWarnEnabled()) { + LOG.warn("SDV recording will not take place on CICS region '" + + entry.getValue().getApplid() + "'. Security is not active."); + } + continue; + } + + // Get list of users for this CICS region + List listOfUsersForRegion = + sdvUsersToRecordList.stream() + .filter(u -> entry.getKey().equals(u.getCicsTag())) + .collect(Collectors.toList()); + + if (!listOfUsersForRegion.isEmpty()) { + // Create maintenance terminal for CICS region as + // we know we definitely plan to record something there + // and will need this to create resources + ICicsTerminal terminal; + terminal = cicsManager.generateCicsTerminal(entry.getKey()); + RecordingRegion rr = new RecordingRegion(terminal); + recordingRegions.put(entry.getValue(), rr); + + // Add each SdvUser associated to the region to the + // list of recording Users on that region + for (ISdvUser sdvUser : listOfUsersForRegion) { + if (recordingRegions.get(entry.getValue()).addUserToRecord(sdvUser)) { + if (LOG.isInfoEnabled()) { + LOG.info("Will record - CICS Region: " + + entry.getValue().getApplid() + + ", User: " + sdvUser.getUsername() + ", Role: " + + sdvUser.getRole()); + } + } + } + } else { + if (LOG.isWarnEnabled()) { + LOG.warn( + "No users have been listed for recording via the " + + "SdvUser annotation for cicsTag '" + + entry.getValue().getTag() + + "'."); + } + } + } + LOG.info("Finished populating list of tested CICS regions and recordings " + + "required for each user/role."); + + // Create instance of the HTTP SDV recording tool + this.sdvRecorder = new SdvHttpRecorderImpl(getFramework(), recordingRegions, + artifactManager, batchManager, storedArtifactRoot, dss, httpManager); + } catch (ManagerException e) { + // If anything fails in here, we've already allocated the users, in + // which case, release them. + releaseUsers(); + throw e; + } + + } + + @Override + public void provisionStart() throws SdvManagerException { + // Create necessary resources to run SDV + sdvRecorder.prepareEnvironments(CFstructure); + } + + @Override + public void provisionStop() { + // SDV is ending, possibly via an exception + // so stop any known recordings & remove + // all resources + try { + sdvRecorder.endRecording(); + } catch (SdvManagerException e) { + LOG.error("Could not stop known SDC recordings in provisionStop.", e); + } + + try { + releaseUsers(); + } catch (CicstsManagerException e) { + LOG.error("Could not release SDV SdvUsers in provisionStop.", e); + } + + try { + sdvRecorder.cleanUpEnvironments(); + } catch (SdvManagerException e) { + LOG.error("Could not cleanup SDV environments in provisionStop.", e); + } + + } + + @Override + public void startOfTestClass() throws SdvManagerException { + // Start recording before test run + sdvRecorder.startRecording(); + } + + @Override + public Result endOfTestClass(@NotNull Result currentResult, Throwable currentException) + throws ManagerException { + + // Stop recording after test run + sdvRecorder.endRecording(); + + if (currentResult.isPassed()) { + sdvRecorder.exportRecordings(getFramework().getTestRun().getTestBundleName(), + getFramework().getTestRun().getTestClassName()); + } + + // We are not going to change the result + return super.endOfTestClass(currentResult, currentException); + } +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvManagersResourceMonitor.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvManagersResourceMonitor.java new file mode 100644 index 000000000..1e70189af --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvManagersResourceMonitor.java @@ -0,0 +1,151 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal; + +import dev.galasa.framework.spi.DssDelete; +import dev.galasa.framework.spi.DynamicStatusStoreException; +import dev.galasa.framework.spi.DynamicStatusStoreMatchException; +import dev.galasa.framework.spi.FrameworkException; +import dev.galasa.framework.spi.IDynamicStatusStoreService; +import dev.galasa.framework.spi.IFramework; +import dev.galasa.framework.spi.IResourceManagement; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * This class provides specific implementation to monitor the number of running SDV managers. + * + */ +public class SdvManagersResourceMonitor implements Runnable { + + private static final Log LOG = LogFactory.getLog(SdvManagersResourceMonitor.class); + + private final IFramework framework; + private final IResourceManagement resourceManagement; + private final IDynamicStatusStoreService dss; + + private static final String PERIOD_REGEX = "\\."; + + /** + * SdvManagersResourceMonitor constructor. + * + * @param framework - Galasa framework. + * @param resourceManagement - Galasa Resource Management. + * @param dss - Galasa DSS. + */ + public SdvManagersResourceMonitor(IFramework framework, IResourceManagement resourceManagement, + IDynamicStatusStoreService dss) { + this.framework = framework; + this.resourceManagement = resourceManagement; + this.dss = dss; + LOG.info("SDV Managers resource monitor initialised"); + } + + @Override + public void run() { + LOG.info("Monitoring for SDV managers held up in active status"); + + try { + // Get the list of SDV manager props in the DSS + Map sdvManagersInDss = dss.getPrefix("manager.runningManagers"); + + Set allActiveRuns = this.framework.getFrameworkRuns().getActiveRunNames(); + + // Iterate through all SDV managers stored in the DSS + for (Map.Entry entry : sdvManagersInDss.entrySet()) { + // Split list of managers into array + Set initialRunList = + new HashSet(Arrays.asList(entry.getValue().split(","))); + + for (String runName : initialRunList) { + if (!allActiveRuns.contains(runName)) { + String removeRun = runName; + String removeCicsApplId = entry.getKey().split(PERIOD_REGEX)[2]; + + deleteDss(removeCicsApplId, removeRun); + } + } + } + } catch (FrameworkException e) { + LOG.error("Failure during scanning DSS for SDV Managers"); + } + + this.resourceManagement.resourceManagementRunSuccessful(); + LOG.info("Finished cleaning up SDV Manager activity"); + } + + /** + * Called when a Galasa test run ends or is removed. + * + * @param runName - Galasa test run name. + */ + public void runFinishedOrDeleted(String runName) { + + try { + // Get list of SDV Managers listed as active in the DSS + Map sdvManagersInDss = dss.getPrefix("manager.runningManagers"); + + for (Map.Entry entry : sdvManagersInDss.entrySet()) { + // Split list of managers into array + Set initialRunList = + new HashSet(Arrays.asList(entry.getValue().split(","))); + + // This SDV Manager belongs to the run + if (initialRunList.contains(runName)) { + String removeCicsApplId = entry.getKey().split(PERIOD_REGEX)[2]; + deleteDss(removeCicsApplId, runName); + } + } + } catch (FrameworkException e) { + if (LOG.isErrorEnabled()) { + LOG.error("Failure cleaning up SDV Managers for finished run " + runName); + } + } + } + + private void deleteDss(String cicsApplid, String run) + throws DynamicStatusStoreMatchException, DynamicStatusStoreException { + + Set currentRunList = + new HashSet(Arrays.asList( + dss.get("manager.runningManagers." + cicsApplid).split(",") + )); + + if (currentRunList.size() == 1) { + // This is the last manager against the region + // and is stale, so delete all manager entries for + // this region + if (LOG.isInfoEnabled()) { + LOG.info("Removing SDV Manager props for CICS region " + cicsApplid + + ", assigned to inactive run " + run); + } + + dss.performActions( + new DssDelete("manager.runningManagers." + cicsApplid, null), + new DssDelete("manager." + cicsApplid + ".sdcLive", null) + ); + + } else { + // There are other managers, which may be live, or not. + // leave it to the last manager standing to tidy up. + // Just remove this run from the list + if (LOG.isInfoEnabled()) { + LOG.info("Removing SDV Manager from list on CICS region " + cicsApplid + + ", assigned to inactive run " + run); + } + + currentRunList.remove(run); + + dss.put("manager.runningManagers." + cicsApplid, String.join(",", currentRunList)); + } + + } +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvRecorderImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvRecorderImpl.java new file mode 100644 index 000000000..1c17c07fb --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvRecorderImpl.java @@ -0,0 +1,554 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal; + +import dev.galasa.artifact.IArtifactManager; +import dev.galasa.artifact.TestBundleResourceException; +import dev.galasa.cicsts.CicstsManagerException; +import dev.galasa.cicsts.ICicsRegion; +import dev.galasa.cicsts.ICicsTerminal; +import dev.galasa.framework.spi.DynamicStatusStoreException; +import dev.galasa.framework.spi.IDynamicStatusStoreService; +import dev.galasa.framework.spi.IFramework; +import dev.galasa.sdv.ISdvUser; +import dev.galasa.sdv.SdvManagerException; +import dev.galasa.sdv.internal.properties.SdvHlq; +import dev.galasa.sdv.internal.properties.SdvSdcActivation; +import dev.galasa.sdv.internal.properties.SdvSrrLogstreamRemoval; +import dev.galasa.zosbatch.IZosBatchJob; +import dev.galasa.zosbatch.IZosBatchJobOutputSpoolFile; +import dev.galasa.zosbatch.ZosBatchException; +import dev.galasa.zosbatch.spi.IZosBatchSpi; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardOpenOption; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + + +/** + * This is the abstract base class for all SDV recorders. + * + *

      It contains all common implementations for any SDV records. + * + *

      It expects start/end recording functions to be overridden and implemented by specific child + * classes, but provides common resource creation/teardown, and YAML job generation. + * + */ +public abstract class SdvRecorderImpl { + + private static final Log LOG = LogFactory.getLog(SdvRecorderImpl.class); + + protected Map recordingRegions; + + private Path storedArtifactRoot; + private IArtifactManager artifactManager; + private IZosBatchSpi batchManager; + private IDynamicStatusStoreService dss; + private IFramework framework; + + protected static final String CICS_RESOURCES_GROUP_NAME = "SDVGRP"; + + private static final String DSS_MANAGER_PREFIX = "manager."; + private static final String DSS_RUNNING_MANAGERS_TAG = "runningManagers."; + private static final String DSS_SDC_LIVE_TAG = ".sdcLive"; + + /** + * SdvRecorderImpl constructor. + * + * @param framework - Galasa framework + * @param recordingRegions - A unique Map of CICS regions under test. + * @param artifactManager - Galasa Artifact Manager. + * @param batchManager - Galasa Batch Manager. + * @param storedArtifactRoot - The path where files should be stored to be included as test + * artifacts. + * @param dss - Galasa DSS. + */ + public SdvRecorderImpl(IFramework framework, Map recordingRegions, + IArtifactManager artifactManager, IZosBatchSpi batchManager, Path storedArtifactRoot, + IDynamicStatusStoreService dss) { + this.framework = framework; + this.recordingRegions = recordingRegions; + this.artifactManager = artifactManager; + this.batchManager = batchManager; + this.storedArtifactRoot = storedArtifactRoot; + this.dss = dss; + } + + abstract void startRecording() throws SdvManagerException; + + abstract void endRecording() throws SdvManagerException; + + /** + * Implements the full configuration of SDC on CICS regions under test. + * + *

      It firstly consults the DSS to see if any other managers are running on a + * given CICS region, which will have already configured SDC. If no regions are found, and + * the SDV config states SDC should be configured, this manager adds an entry to the DSS to + * claim it will configure SDC. A list of running managers in the DSS is then created and + * updated. If another manager is found, this manager will only add to the list of running + * managers on the region and will skip SDC configuration. + * + *

      See cleanUpEnvironments to see how the running manager list is used. + * + * @param cfStructure - Coupling Facility structure name to use when creating logstream. + * @throws SdvManagerException general error encountered. + */ + public void prepareEnvironments(String cfStructure) throws SdvManagerException { + for (Map.Entry entry : recordingRegions.entrySet()) { + try { + // Attempt to see if we are the first SDV manager working on the region, then + // create the runningManagers prop. Then configure SDC, if necessary. + if (LOG.isInfoEnabled()) { + LOG.info("Attempting to find other SDV managers running on " + + entry.getKey().getApplid()); + } + + if (dss.putSwap( + DSS_MANAGER_PREFIX + DSS_RUNNING_MANAGERS_TAG + entry.getKey().getApplid(), + null, framework.getTestRunName())) { + dss.put(DSS_MANAGER_PREFIX + entry.getKey().getApplid() + DSS_SDC_LIVE_TAG, + "false"); + + if (LOG.isInfoEnabled()) { + LOG.info("No other SDV managers found running on " + + entry.getKey().getApplid() + ". Created runningManagers list."); + } + + if (SdvSdcActivation.get(entry.getKey().getTag())) { + if (LOG.isInfoEnabled()) { + LOG.info( + "Activating SDC on CICS region: " + entry.getKey().getApplid()); + } + + createSrrLogstream(entry.getKey(), cfStructure); + createCicsResources(entry.getKey(), + entry.getValue().getMaintenanceTerminal()); + } + + dss.put(DSS_MANAGER_PREFIX + entry.getKey().getApplid() + DSS_SDC_LIVE_TAG, + "true"); + } else { + // We are not the first SDV manager running on the region, therefore + // SDC will already be set up (or is currently in the process of being set up), + // if necessary. + // Add to the running manager list only, and wait for SDC to be reported as live + // before continuing. + Set runningManagers = new HashSet( + Arrays.asList(dss.get(DSS_MANAGER_PREFIX + + DSS_RUNNING_MANAGERS_TAG + entry.getKey().getApplid()).split(","))); + + if (LOG.isInfoEnabled()) { + LOG.info(runningManagers.size() + " other SDV managers found running on " + + entry.getKey().getApplid() + ". Adding new manager to list."); + } + + runningManagers.add(framework.getTestRunName()); + dss.put( + DSS_MANAGER_PREFIX + DSS_RUNNING_MANAGERS_TAG + entry.getKey().getApplid(), + String.join(",", runningManagers)); + + // Wait for sdcLive to become True before continuing + if (LOG.isInfoEnabled()) { + LOG.info("Will wait for SDC to become live on " + + entry.getKey().getApplid()); + } + + int i = 0; + while (!"true".equals(dss.get( + DSS_MANAGER_PREFIX + entry.getKey().getApplid() + DSS_SDC_LIVE_TAG)) + && i++ < 20) { + if (LOG.isInfoEnabled()) { + LOG.info("SDC not live, reattempting on " + entry.getKey().getApplid() + + "..."); + } + Thread.sleep(1000); + } + + if (LOG.isInfoEnabled()) { + LOG.info( + "SDC made live by another SDV manager, continuing on " + + entry.getKey().getApplid() + ); + } + } + } catch (DynamicStatusStoreException | InterruptedException e) { + throw new SdvManagerException("Unable interact with DSS for SDV.", e); + } + } + } + + /** + * Implements the teardown of SDC on CICS regions under test. + * + *

      It firstly consults the DSS to see if it is the last manager running on the given CICS + * region. If it is, and the SDV config states SDC should be configured, this manager will + * deconfigure SDC on the region and remove all resources. It will then remove entries from the + * DSS related to this. If more than one manager is found, this manager will only decrement the + * count of running managers on the region. + * + *

      SRR Logstream removal is not done by default but can be configured to do so via the CPS + * properties. It would be essential to do this if provisioning a CICS region for the lifespan + * of the test run, to ensure no artifacts are left behind. + * + * @throws SdvManagerException general error encountered. + */ + public void cleanUpEnvironments() throws SdvManagerException { + for (Map.Entry entry : recordingRegions.entrySet()) { + + try { + if (LOG.isInfoEnabled()) { + LOG.info("Attempting to find other SDV managers running on " + + entry.getKey().getApplid()); + } + + // Get number of running SDV managers. + Set runningManagers = new HashSet( + Arrays.asList(dss.get(DSS_MANAGER_PREFIX + + DSS_RUNNING_MANAGERS_TAG + entry.getKey().getApplid()).split(","))); + + if (LOG.isInfoEnabled()) { + LOG.info(runningManagers + " SDV managers found running on " + + entry.getKey().getApplid() + "."); + } + + // If we are the last running for a + // region, clean up the resources on your way out, if necessary. + if (runningManagers.size() == 1) { + // Remove entry from DSS + if (LOG.isInfoEnabled()) { + LOG.info("Removing DSS entry, as this is the final SDV manager on " + + entry.getKey().getApplid() + "."); + } + + dss.delete( + DSS_MANAGER_PREFIX + DSS_RUNNING_MANAGERS_TAG + entry.getKey().getApplid() + ); + + if (SdvSdcActivation.get(entry.getKey().getTag())) { + if (LOG.isInfoEnabled()) { + LOG.info("Cleaning up CICS region after SDV recording: " + + entry.getKey().getApplid()); + } + + deleteCicsResources(entry.getKey(), + entry.getValue().getMaintenanceTerminal()); + } + + if (SdvSrrLogstreamRemoval.get(entry.getKey().getTag())) { + deleteSrrLogstream(entry.getKey()); + } + + dss.delete(DSS_MANAGER_PREFIX + entry.getKey().getApplid() + DSS_SDC_LIVE_TAG); + } else { + // We are not the SDV manager running, so just remove yourself + // from the equation & leave the last manager to do the tidying up + if (runningManagers != null) { + if (LOG.isInfoEnabled()) { + LOG.info( + "Removing " + framework.getTestRunName() + + " from running SDV manager list on " + entry.getKey().getApplid() + ); + } + + runningManagers.remove(framework.getTestRunName()); + + dss.put( + DSS_MANAGER_PREFIX + + DSS_RUNNING_MANAGERS_TAG + entry.getKey().getApplid(), + String.join(",", runningManagers) + ); + } + } + } catch (DynamicStatusStoreException e) { + throw new SdvManagerException("Unable interact with DSS for SDV.", e); + } + } + } + + /** + * Orchestrates the generation and storage of the Security YAML for each CICS region under test. + * + *

      It loops through each CICS region under test, obtains the combined YAML + * for all users under test, then stores it as part of the test runs stored artifacts. + * + */ + public void exportRecordings(String testBundleName, String testClassName) + throws SdvManagerException { + for (Map.Entry entry : recordingRegions.entrySet()) { + if (LOG.isInfoEnabled()) { + LOG.info("Exporting SDV Security YAML for CICS region: " + + entry.getKey().getApplid()); + } + + String regionYaml = getRegionSecurityYaml(entry.getKey(), entry.getValue()); + storeYaml(entry.getKey(), regionYaml, testBundleName, testClassName); + } + } + + private void createSrrLogstream(ICicsRegion region, String cfStructure) + throws SdvManagerException { + + if (LOG.isInfoEnabled()) { + LOG.info("Attepmting to create LOGSTREAM on " + region.getApplid()); + } + + try { + Map attrs = new HashMap(); + attrs.put("OWNER", region.getRegionJob().getOwner()); + attrs.put("APPLID", region.getApplid()); + attrs.put("CFSTRUCT", cfStructure); + + String jcl = artifactManager.getBundleResources(this.getClass()) + .retrieveSkeletonFileAsString("/jcl/definelogstream.jcl", attrs).trim(); + + IZosBatchJob job = batchManager.getZosBatch(region.getZosImage()).submitJob(jcl, null); + int rc = job.waitForJob(); + if (rc == 12) { + if (LOG.isInfoEnabled()) { + LOG.info( + "Logstream not created, using existing, on CICS Region " + + region.getApplid() + + "." + ); + } + } else if (rc > 4) { + if (LOG.isWarnEnabled()) { + LOG.warn( + "JCL to define logstreams fail for CICS Region " + + region.getApplid() + + ", check artifacts for more details" + ); + } + } + } catch (ZosBatchException | TestBundleResourceException | IOException + | CicstsManagerException e) { + throw new SdvManagerException( + "Unable to run JCL to define logstreams for CICS Region " + + region.getApplid(), + e + ); + } + } + + private void deleteSrrLogstream(ICicsRegion region) throws SdvManagerException { + + if (LOG.isInfoEnabled()) { + LOG.info("Deleting LOGSTREAM on " + region.getApplid()); + } + + try { + Map attrs = new HashMap(); + attrs.put("OWNER", region.getRegionJob().getOwner()); + attrs.put("APPLID", region.getApplid()); + + String jcl = artifactManager.getBundleResources(this.getClass()) + .retrieveSkeletonFileAsString("/jcl/deletelogstreams.jcl", attrs).trim(); + + IZosBatchJob job = batchManager.getZosBatch(region.getZosImage()).submitJob(jcl, null); + int rc = job.waitForJob(); + if (rc > 4) { + throw new SdvManagerException( + "JCL to delete logstreams fail on CICS Region " + + region.getApplid() + + ", check artifacts for more details." + ); + } + } catch (ZosBatchException | TestBundleResourceException | IOException + | CicstsManagerException e) { + throw new SdvManagerException( + "Unable to run JCL to delete logstreams for CICS Region " + + region.getApplid(), + e + ); + } + + } + + protected void createCicsResources(ICicsRegion region, ICicsTerminal terminal) + throws SdvManagerException { + + // JOURNALMODEL + if (LOG.isInfoEnabled()) { + LOG.info("Creating JOURNALMODEL on " + region.getApplid()); + } + try { + region.ceda().createResource(terminal, "JOURNALMODEL", "SRR", CICS_RESOURCES_GROUP_NAME, + "JOURNALNAME(DFHSECR) DESCRIPTION(SRR JOURNAL) TYPE(MVS) STREAMNAME(" + + region.getRegionJob().getOwner() + "." + region.getApplid() + + ".DFHSECR)"); + } catch (CicstsManagerException e) { + throw new SdvManagerException( + "Could not create SRR JOURNALMODEL definition on CICS Region " + + region.getApplid() + + ".", + e + ); + } + + try { + region.ceda().installGroup(terminal, "DFHXSD"); + } catch (CicstsManagerException e) { + if (LOG.isInfoEnabled()) { + LOG.info( + "Couldn't install DFHXSD, already installed on CICS Region " + + region.getApplid() + ); + } + } + } + + protected void deleteCicsResources(ICicsRegion region, ICicsTerminal terminal) { + + if (LOG.isInfoEnabled()) { + LOG.info("Deleting the " + CICS_RESOURCES_GROUP_NAME + " group on " + + region.getApplid()); + } + try { + region.ceda().deleteGroup(terminal, CICS_RESOURCES_GROUP_NAME); + } catch (CicstsManagerException e) { + if (LOG.isErrorEnabled()) { + LOG.error( + "Could not delete the " + + CICS_RESOURCES_GROUP_NAME + + " on CICS Region " + + region.getApplid(), + e + ); + } + } + } + + private String getRegionSecurityYaml(ICicsRegion region, RecordingRegion recordingRegionData) + throws SdvManagerException { + + String yaml = ""; + try { + if (LOG.isInfoEnabled()) { + LOG.info("Building Security metadata job JCL for " + region.getApplid()); + } + Map attrs = new HashMap(); + attrs.put("OWNER", region.getRegionJob().getOwner()); + attrs.put("APPLID", region.getApplid()); + attrs.put("CICSHLQ", SdvHlq.get(region.getTag())); + + String jcl = artifactManager.getBundleResources(this.getClass()) + .retrieveSkeletonFileAsString("/jcl/getYaml.jcl", attrs).trim(); + + // Append to the JCL user and their role recorded on the region + // for the test + Boolean srrFound = false; + List srrIds = new ArrayList<>(); + for (ISdvUser recordingUser : recordingRegionData.getRecordingUsers()) { + if (recordingUser.getSrrId() != null) { + srrFound = true; + srrIds.add(recordingUser.getSrrId()); + jcl = jcl + "\nMATCHID=" + recordingUser.getSrrId() + "\nUSERID=" + + recordingUser.getUsername() + ",ROLE=" + recordingUser.getRole(); + } else { + if (LOG.isWarnEnabled()) { + LOG.warn("No SDC registered for user " + recordingUser.getUsername() + + " on region " + region.getApplid() + + ", skipping YAML generation."); + } + } + } + + if (!srrFound) { + return null; + } + + // Add final line indicating the end of the DDIN + jcl = jcl + "\n/*\n//"; + + if (LOG.isInfoEnabled()) { + LOG.info("Submitting Security metadata job JCL for " + region.getApplid()); + } + IZosBatchJob job = batchManager.getZosBatch(region.getZosImage()).submitJob(jcl, null); + int rc = job.waitForJob(); + + if (rc > 4) { + if (LOG.isErrorEnabled()) { + LOG.error( + "JCL to get Security metadata fail on CICS Region " + + region.getApplid() + + ", check artifacts for more details" + ); + } + } + + if (LOG.isInfoEnabled()) { + LOG.info( + "Grabbing Security metadata job output on CICS Region " + + region.getApplid() + ); + } + List spoolFiles; + spoolFiles = job.retrieveOutput().getSpoolFiles(); + + IZosBatchJobOutputSpoolFile yamlFile = spoolFiles.stream() + .filter(file -> "YAML".equals(file.getDdname())).findAny().orElse(null); + + if (yamlFile != null) { + if (LOG.isInfoEnabled()) { + LOG.info("YAML output obtained on " + region.getApplid()); + } + yaml = yamlFile.getRecords(); + } else { + throw new SdvManagerException( + "Security metadata job did not return any YAML for CICS Region " + + region.getApplid() + + ", containing SRR IDs: " + + String.join(",", srrIds) + ); + } + + } catch (ZosBatchException | TestBundleResourceException | IOException + | CicstsManagerException e) { + throw new SdvManagerException( + "Unable to run JCL to get Security metadata on CICS Region " + + region.getApplid(), + e + ); + } + + return yaml; + + } + + private void storeYaml(ICicsRegion region, String regionYaml, String testBundleName, + String testClassName) throws SdvManagerException { + + if (regionYaml != null) { + if (LOG.isInfoEnabled()) { + LOG.info("Storing YAML as test artifact for " + region.getApplid()); + } + + // Add to Galasa run + Path f = storedArtifactRoot.resolve(testBundleName + "/" + testClassName + "." + + region.getTag() + ".cics-security.yaml"); + try { + Files.write(f, regionYaml.getBytes("utf8"), StandardOpenOption.CREATE); + } catch (Exception e) { + throw new SdvManagerException( + "Unable to add YAML to Galasa run for CICS Region " + + region.getApplid() + + ". Attempting to save to path: " + f.toString(), + e + ); + } + } + } +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvResourceManagement.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvResourceManagement.java new file mode 100644 index 000000000..0b79f970b --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvResourceManagement.java @@ -0,0 +1,83 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal; + +import dev.galasa.framework.spi.IDynamicStatusStoreService; +import dev.galasa.framework.spi.IFramework; +import dev.galasa.framework.spi.IResourceManagement; +import dev.galasa.framework.spi.IResourceManagementProvider; +import dev.galasa.framework.spi.ResourceManagerException; +import java.util.concurrent.TimeUnit; +import org.osgi.service.component.annotations.Component; + +/** + * This class acts as the high-level resource management deamon for + * SDV manager. + * + *

      It will ensure sdv entries in the DSS are kept in-sync, + * up-to-date, and will tidy up any stale information. + * + */ +@Component(service = {IResourceManagementProvider.class}) +public class SdvResourceManagement implements IResourceManagementProvider { + + private IFramework framework; + private IResourceManagement resourceManagement; + + private SdvUserResourceMonitor sdvUserResourceMonitor; + private SdvManagersResourceMonitor sdvManagersResourceMonitor; + + @Override + public boolean initialise(IFramework framework, IResourceManagement resourceManagement) + throws ResourceManagerException { + this.framework = framework; + this.resourceManagement = resourceManagement; + + IDynamicStatusStoreService dss; + try { + dss = this.framework.getDynamicStatusStoreService("sdv"); + } catch (Exception e) { + throw new ResourceManagerException("Unable to initialise 'sdv' namespace from DSS.", e); + } + + sdvUserResourceMonitor = new SdvUserResourceMonitor( + framework, + resourceManagement, + dss + ); + sdvManagersResourceMonitor = new SdvManagersResourceMonitor( + framework, + resourceManagement, + dss + ); + + return true; + } + + @Override + public void start() { + + this.resourceManagement.getScheduledExecutorService().scheduleWithFixedDelay( + sdvUserResourceMonitor, this.framework.getRandom().nextInt(20), 20, + TimeUnit.SECONDS); + + this.resourceManagement.getScheduledExecutorService().scheduleWithFixedDelay( + sdvManagersResourceMonitor, this.framework.getRandom().nextInt(20), 20, + TimeUnit.SECONDS); + } + + @Override + public void shutdown() { + // Not required + } + + @Override + public void runFinishedOrDeleted(String runName) { + this.sdvUserResourceMonitor.runFinishedOrDeleted(runName); + this.sdvManagersResourceMonitor.runFinishedOrDeleted(runName); + } +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvUserImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvUserImpl.java new file mode 100644 index 000000000..be5e6435f --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvUserImpl.java @@ -0,0 +1,154 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal; + +import dev.galasa.ICredentialsUsernamePassword; +import dev.galasa.cicsts.CicstsManagerException; +import dev.galasa.cicsts.ICicsTerminal; +import dev.galasa.sdv.ISdvUser; +import dev.galasa.sdv.SdvManagerException; +import dev.galasa.zos3270.Zos3270Exception; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * This class implements the ISdvUser interface. + * + *

      It provides all implementation for methods called on the + * ISdvUser interface. + * + */ +public class SdvUserImpl implements ISdvUser { + + private static final Log LOG = LogFactory.getLog(SdvUserImpl.class); + + private String credentialsTag; + private String role; + private String cicsTag; + private ICredentialsUsernamePassword credentials; + private String srrId; // When null, no recording is taking place + private Boolean recording; + + /** + * The SdvUserImpl constructor. + * + * @param credentialsTag - The string tag for the credential in the secure Galasa properties. + * @param credentials - ICredentialsUsernamePassword object containing the actual credentials. + * @param cicsTag - The string tag for the CICS region the user will run on. + * @param role - The role name the user belongs to. + */ + public SdvUserImpl(String credentialsTag, ICredentialsUsernamePassword credentials, + String cicsTag, String role) { + + this.credentialsTag = credentialsTag; + this.credentials = credentials; + this.cicsTag = cicsTag; + this.srrId = null; + this.recording = false; + this.role = role; + } + + @Override + public String getCredentialsTag() { + return this.credentialsTag; + } + + @Override + public String getUsername() { + return this.credentials.getUsername(); + } + + @Override + public String getPassword() { + return this.credentials.getPassword(); + } + + @Override + public String getRole() { + return this.role; + } + + @Override + public String getCicsTag() { + return this.cicsTag; + } + + @Override + public void logIntoTerminal(ICicsTerminal terminal) throws SdvManagerException { + try { + // Are we already on CESL/N? If not go to it + long timeout = 0; + if (!terminal.searchText("Signon to CICS", timeout)) { + terminal.clear().wfk(); + + terminal.type("CESL").enter().wfk(); + } + + terminal.waitForTextInField(new String[] {"Userid"}, + new String[] {"Security is not active"}); + terminal.type(this.credentials.getUsername()); + terminal.positionCursorToFieldContaining("Password"); + terminal.tab(); + terminal.type(this.credentials.getPassword()); + terminal.enter().wfk(); + + waitForLoggedOnText(terminal); + if (LOG.isDebugEnabled()) { + LOG.debug("Logged into CICS TS as user: " + this.credentials.getUsername()); + } + + terminal.clear().wfk(); + } catch (CicstsManagerException | Zos3270Exception e) { + throw new SdvManagerException( + "Could not log in via CESL on CICS region " + + terminal.getCicsRegion().getApplid(), + e + ); + } + + } + + @Override + public String getSrrId() { + return this.srrId; + } + + @Override + public Boolean isRecording() { + return this.recording; + } + + @Override + public void setSrrId(String srrId) { + this.srrId = srrId; + this.recording = true; + } + + @Override + public void setNotRecording() { + this.recording = false; + } + + private void waitForLoggedOnText(ICicsTerminal cicsTerminal) throws CicstsManagerException { + + String[] pass = {"Sign-on is complete"}; + String[] fail = {"Your password has expired. Please type your new password.", + "Invalid credentials entered", "userid has been revoked"}; + + try { + cicsTerminal.waitForTextInField(pass, fail); + } catch (Exception e) { + throw new CicstsManagerException( + "Unable to wait for the initial CICS screen, looking for '" + + String.join("', '", pass) + + "' on CICS Region " + + cicsTerminal.getCicsRegion().getApplid(), + e); + } + } + +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvUserPool.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvUserPool.java new file mode 100644 index 000000000..66bcaa593 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvUserPool.java @@ -0,0 +1,140 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal; + +import dev.galasa.cicsts.ICicsRegion; +import dev.galasa.framework.spi.DssDelete; +import dev.galasa.framework.spi.DssUpdate; +import dev.galasa.framework.spi.DynamicStatusStoreException; +import dev.galasa.framework.spi.DynamicStatusStoreMatchException; +import dev.galasa.framework.spi.IDynamicStatusStoreService; +import dev.galasa.framework.spi.IFramework; +import dev.galasa.framework.spi.IResourcePoolingService; +import dev.galasa.framework.spi.InsufficientResourcesAvailableException; +import dev.galasa.framework.spi.ResourceUnavailableException; +import dev.galasa.sdv.SdvManagerException; +import dev.galasa.sdv.internal.properties.SdvPoolUsers; +import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * This class provides the implementation for querying available + * users in a pool matching a role, and then picks one, and marks + * it as being in use. + * + *

      It additonally implements the ability to release users back to + * the pool. + */ +public class SdvUserPool { + + private static final Log LOG = LogFactory.getLog(SdvUserPool.class); + + private final IDynamicStatusStoreService dss; + private final IResourcePoolingService rps; + private final IFramework framework; + + /** + * SdvUserPool contructor. + * + * @param framework - Galasa framework object. + * @param dss - Galasa DSS. + * @param rps - Galasa Resource Pooling Service. + * @throws SdvManagerException general error encountered. + */ + public SdvUserPool(IFramework framework, IDynamicStatusStoreService dss, + IResourcePoolingService rps) throws SdvManagerException { + + this.framework = framework; + this.dss = dss; + this.rps = rps; + } + + /** + * Will return an available user for a given role, if one is + * available. The user will then be marked as unavailable. + * + *

      If a user is not available, an exception will be thrown. + * + * @param role - The role name the returned user must belong to. + * @param cicsRegion - The CICS Region which the user will interact with. + * @return - The Galasa credentials tag string for the allocated user. + * @throws SdvManagerException general error encountered. + * @throws ResourceUnavailableException no available users for that role currently. + */ + public String allocateUser(String role, ICicsRegion cicsRegion) + throws SdvManagerException, ResourceUnavailableException { + + List availableSdvUsers = null; + String theSdvUser = null; + + // Get the full pool of user credential tags for the + // specified zOS image and role + List fullZosImageUserListForRole = + SdvPoolUsers.get(cicsRegion.getZosImage().getImageID(), role); + + if (fullZosImageUserListForRole.isEmpty()) { + throw new SdvManagerException( + "No user credential tags provided for role '" + role + + "' on z/OS image '" + + cicsRegion.getZosImage().getImageID() + + "'. Please create or update CPS property 'sdv.zosImage." + + cicsRegion.getZosImage().getImageID() + + ".role." + + role + + ".credTags'." + ); + } + + // Retrieve available users from the pool, not being used by the region + try { + availableSdvUsers = this.rps.obtainResources(fullZosImageUserListForRole, null, 1, 1, + dss, "sdvuser." + cicsRegion.getApplid() + "."); + } catch (InsufficientResourcesAvailableException e) { + // There are no users available, inform the framework that we should go into wait state + // and try again later + // All resources (from other managers) will be discarded by using this + throw new ResourceUnavailableException( + "Could not obtain a user from the SDV user pool for image " + + cicsRegion.getZosImage().getImageID() + ", and role " + role, + e); + } + + // Allocate the user retrieved from the pool + try { + // There should only be a single user in the list allocated + theSdvUser = availableSdvUsers.get(0); + + // Allocate the user in the DSS + this.dss.performActions( + new DssUpdate("sdvuser." + cicsRegion.getApplid() + "." + theSdvUser, + this.framework.getTestRunName()), + new DssUpdate("run." + this.framework.getTestRunName() + ".sdvuser." + + cicsRegion.getApplid() + "." + theSdvUser, "active")); + + if (LOG.isTraceEnabled()) { + LOG.trace("Allocated SDV User " + theSdvUser + " on image " + + cicsRegion.getZosImage().getImageID() + " for CICS Applid " + + cicsRegion.getApplid() + " from SDV User pool allocation"); + } + + } catch (DynamicStatusStoreException e) { + throw new SdvManagerException( + "Could not update the DSS for user allocation of SDV User " + theSdvUser + + " on image " + cicsRegion.getZosImage().getImageID(), + e); + } + return theSdvUser; + } + + public static void deleteDss(String user, String cicsApplid, String run, + IDynamicStatusStoreService dss) + throws DynamicStatusStoreMatchException, DynamicStatusStoreException { + dss.performActions(new DssDelete("sdvuser." + cicsApplid + "." + user, run), + new DssDelete("run." + run + ".sdvuser." + cicsApplid + "." + user, "active")); + } +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvUserResourceMonitor.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvUserResourceMonitor.java new file mode 100644 index 000000000..c06820f6b --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvUserResourceMonitor.java @@ -0,0 +1,122 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal; + +import dev.galasa.framework.spi.IDynamicStatusStoreService; +import dev.galasa.framework.spi.IFramework; +import dev.galasa.framework.spi.IResourceManagement; +import java.util.Map; +import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * This class provides specific implementation to monitor SdvUser usage. + * + */ +public class SdvUserResourceMonitor implements Runnable { + + private static final Log LOG = LogFactory.getLog(SdvUserResourceMonitor.class); + + private final IFramework framework; + private final IResourceManagement resourceManagement; + private final IDynamicStatusStoreService dss; + + private static final String PERIOD_REGEX = "\\."; + + /** + * SdvUserResourceMonitor constructor. + * + * @param framework - Galasa framework. + * @param resourceManagement - Galasa Resource Management. + * @param dss - Galasa DSS. + */ + public SdvUserResourceMonitor(IFramework framework, IResourceManagement resourceManagement, + IDynamicStatusStoreService dss) { + this.framework = framework; + this.resourceManagement = resourceManagement; + this.dss = dss; + LOG.info("SDV User provisioning resource monitor initialised"); + } + + @Override + public void run() { + LOG.info("Monitoring for SDV Users held up in allocated status"); + + try { + + // Get the list of SDV Users allocated in the DSS + Map sdvUsersInDss = dss.getPrefix("sdvuser"); + + Set allActiveRuns = this.framework.getFrameworkRuns().getActiveRunNames(); + + // Iterate through all SDV Users stored in the DSS + for (Map.Entry entry : sdvUsersInDss.entrySet()) { + // Delete DSS SDV User allocation to run not active + if (!allActiveRuns.contains(entry.getValue())) { + String removeRun = entry.getValue(); + String removeCicsApplId = entry.getKey().split(PERIOD_REGEX)[1]; + String removeUser = entry.getKey().split(PERIOD_REGEX)[2]; + + if (LOG.isInfoEnabled()) { + LOG.info("Freeing allocated user " + removeUser + + " assigned to inactive run " + removeRun); + } + + deleteDss(removeUser, removeCicsApplId, removeRun); + } + } + } catch (Exception e) { + LOG.error("Failure during scanning DSS for SDV Users"); + } + + this.resourceManagement.resourceManagementRunSuccessful(); + LOG.info("Finished cleaning up SDV User allocation"); + } + + /** + * Called when a Galasa test run ends or is removed. + * + * @param runName - Galasa test run name. + */ + public void runFinishedOrDeleted(String runName) { + + try { + // Get list of SDV Users allocated in the DSS + Map sdvUsersInDss = dss.getPrefix("sdvuser"); + + for (Map.Entry entry : sdvUsersInDss.entrySet()) { + + // This SDV User allocation belongs to the run + if (entry.getValue().equals(runName)) { + deleteDss(entry.getKey().split(PERIOD_REGEX)[2], + entry.getKey().split(PERIOD_REGEX)[1], entry.getValue()); + } + } + } catch (Exception e) { + if (LOG.isErrorEnabled()) { + LOG.error("Failure cleaning up SDV Users for finished run " + runName); + } + } + } + + private void deleteDss(String user, String cicsApplid, String run) { + if (LOG.isInfoEnabled()) { + LOG.info("Freeing user " + user + " on CICS Applid " + cicsApplid + " allocated to run " + + run + " which has finished"); + } + + try { + SdvUserPool.deleteDss(user, cicsApplid, run, dss); + } catch (Exception e) { + if (LOG.isErrorEnabled()) { + LOG.error("Failure in discarding SDV User " + user + " on CICS Applid " + cicsApplid + + " allocated to run " + run); + } + } + } +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvHlq.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvHlq.java new file mode 100644 index 000000000..4d1e6c8e0 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvHlq.java @@ -0,0 +1,45 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal.properties; + +import dev.galasa.framework.spi.ConfigurationPropertyStoreException; +import dev.galasa.framework.spi.cps.CpsProperties; +import dev.galasa.sdv.SdvManagerException; +import javax.validation.constraints.NotNull; + +/** + * The HLQ of the CICS region install. + * + * @galasa.cps.property + * + * @galasa.name sdv.cicsTag.[cicsTag].hlq + * + * @galasa.description The HLQ of the CICS region install + * + * @galasa.required Yes + * + * @galasa.default None + * + * @galasa.valid_values String + * + * @galasa.examples sdv.cicsTag.A.hlq=CICS.INSTALL
      + * + */ +public class SdvHlq extends CpsProperties { + + /** + * Returns the HLQ for a given cicsTag. + */ + public static String get(@NotNull String cicsTag) throws SdvManagerException { + try { + return getStringNulled(SdvPropertiesSingleton.cps(), "cicsTag", "hlq", cicsTag); + } catch (ConfigurationPropertyStoreException e) { + throw new SdvManagerException("Problem asking CPS for the HLQ for CICS tag: " + cicsTag, + e); + } + } +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvPoolUsers.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvPoolUsers.java new file mode 100644 index 000000000..224188dc5 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvPoolUsers.java @@ -0,0 +1,48 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal.properties; + +import dev.galasa.framework.spi.ConfigurationPropertyStoreException; +import dev.galasa.framework.spi.cps.CpsProperties; +import dev.galasa.sdv.SdvManagerException; +import java.util.List; +import javax.validation.constraints.NotNull; + +/** + * The list of credentials that belong to a given role on a zOS image. + * + * @galasa.cps.property + * + * @galasa.name sdv.zosImage.[imageID].role.[Role].credTags + * + * @galasa.description The list of credentials that belong to a given role on a zOS image + * + * @galasa.required Yes + * + * @galasa.default [] + * + * @galasa.valid_values String[] + * + * @galasa.examples sdv.zosImage.ABC.role.TELLER.credTags=USER1,USER2
      + * + */ +public class SdvPoolUsers extends CpsProperties { + + /** + * Returns a List of users from the pool that belong to the provided role. + */ + public static @NotNull @NotNull List get(String image, String role) + throws SdvManagerException { + try { + return getStringList(SdvPropertiesSingleton.cps(), "zosImage", "credTags", image, + "role", role); + } catch (ConfigurationPropertyStoreException e) { + throw new SdvManagerException("Problem asking CPS for the User pool for zOS image: " + + image + ", and role: " + role, e); + } + } +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvPort.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvPort.java new file mode 100644 index 000000000..90cf9802a --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvPort.java @@ -0,0 +1,45 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal.properties; + +import dev.galasa.framework.spi.ConfigurationPropertyStoreException; +import dev.galasa.framework.spi.cps.CpsProperties; +import dev.galasa.sdv.SdvManagerException; +import javax.validation.constraints.NotNull; + +/** + * The port the SDC TCPIPSERVICE should serve from on a CICS region. + * + * @galasa.cps.property + * + * @galasa.name sdv.cicsTag.[cicsTag].port + * + * @galasa.description The port the SDC TCPIPSERVICE should serve from on a CICS region + * + * @galasa.required Yes + * + * @galasa.default None + * + * @galasa.valid_values String + * + * @galasa.examples sdv.cicsTag.A.port=32000
      + * + */ +public class SdvPort extends CpsProperties { + + /** + * Returns the port number for a given cicsTag a TCPIPSERVICE should serve from. + */ + public static String get(@NotNull String cicsTag) throws SdvManagerException { + try { + return getStringNulled(SdvPropertiesSingleton.cps(), "cicsTag", "port", cicsTag); + } catch (ConfigurationPropertyStoreException e) { + throw new SdvManagerException( + "Problem asking CPS for the SDV port for CICS tag: " + cicsTag, e); + } + } +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvPropertiesSingleton.java new file mode 100644 index 000000000..27575a9d0 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvPropertiesSingleton.java @@ -0,0 +1,58 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal.properties; + +import dev.galasa.framework.spi.IConfigurationPropertyStoreService; +import dev.galasa.sdv.SdvManagerException; +import org.osgi.service.component.annotations.Activate; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Deactivate; + +/** + * CPS Properties singleton class. + */ +@Component(service = SdvPropertiesSingleton.class, immediate = true) +public class SdvPropertiesSingleton { + + private static SdvPropertiesSingleton instance; + + private IConfigurationPropertyStoreService cps; + + @Activate + public void activate() { + instance = this; // NOSONAR + } + + @Deactivate + public void deactivate() { + instance = null; // NOSONAR + } + + /** + * Returns instance of CPS Properties class. + */ + public static IConfigurationPropertyStoreService cps() throws SdvManagerException { + if (instance != null) { + return instance.cps; + } + + throw new SdvManagerException( + "Attempt to access manager CPS before it has been initialised"); + } + + /** + * Sets instance of CPS Properties class. + */ + public static void setCps(IConfigurationPropertyStoreService cps) throws SdvManagerException { + if (instance != null) { + instance.cps = cps; + return; + } + + throw new SdvManagerException("Attempt to set manager CPS before instance created"); + } +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvRole.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvRole.java new file mode 100644 index 000000000..0dfe3d7be --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvRole.java @@ -0,0 +1,45 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal.properties; + +import dev.galasa.framework.spi.ConfigurationPropertyStoreException; +import dev.galasa.framework.spi.cps.CpsProperties; +import dev.galasa.sdv.SdvManagerException; +import javax.validation.constraints.NotNull; + +/** + * The role associated with a role tag. + * + * @galasa.cps.property + * + * @galasa.name sdv.roleTag.[roleTag].role + * + * @galasa.description The role associated with a role tag. + * + * @galasa.required Yes + * + * @galasa.default None + * + * @galasa.valid_values String + * + * @galasa.examples sdv.roleTag.A.role=TELLER
      + * + */ +public class SdvRole extends CpsProperties { + + /** + * Returns the Role name associated with a provided RoleTag. + */ + public static String get(@NotNull String roleTag) throws SdvManagerException { + try { + return getStringNulled(SdvPropertiesSingleton.cps(), "roleTag", "role", roleTag); + } catch (ConfigurationPropertyStoreException e) { + throw new SdvManagerException( + "Problem asking CPS for the Role for Role tag: " + roleTag, e); + } + } +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvSdcActivation.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvSdcActivation.java new file mode 100644 index 000000000..c4486f2ac --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvSdcActivation.java @@ -0,0 +1,55 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal.properties; + +import dev.galasa.framework.spi.ConfigurationPropertyStoreException; +import dev.galasa.framework.spi.cps.CpsProperties; +import dev.galasa.sdv.SdvManagerException; +import javax.validation.constraints.NotNull; + +/** + * Should the SDV manager configure and make SDC active on the CICS region?. + * + * @galasa.cps.property + * + * @galasa.name sdv.cicsTag.[cicsTag].SdcActivation + * + * @galasa.description Should the SDV manager configure all pre-reqs and make SDC active on the CICS + * region? + * + * Typically should be enabled for CICS regions that will be created as part of + * test, and then discarded. + * + * @galasa.required No + * + * @galasa.default false + * + * @galasa.valid_values true, false + * + * @galasa.examples sdv.cicsTag.A.SdcActivation=true
      + * + */ +public class SdvSdcActivation extends CpsProperties { + + /** + * Returns a boolean indicating if the manager should activate SDC as part of its set up. + */ + public static boolean get(@NotNull String cicsTag) throws SdvManagerException { + try { + String sdvSdcActivation = getStringNulled(SdvPropertiesSingleton.cps(), "cicsTag", + "SdcActivation", cicsTag); + + if (sdvSdcActivation == null) { + return false; + } + return Boolean.parseBoolean(sdvSdcActivation); + } catch (ConfigurationPropertyStoreException e) { + throw new SdvManagerException( + "Problem asking CPS for SDC activation config for CICS tag: " + cicsTag, e); + } + } +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvSrrLogstreamRemoval.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvSrrLogstreamRemoval.java new file mode 100644 index 000000000..13d12a234 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/properties/SdvSrrLogstreamRemoval.java @@ -0,0 +1,57 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal.properties; + +import dev.galasa.framework.spi.ConfigurationPropertyStoreException; +import dev.galasa.framework.spi.cps.CpsProperties; +import dev.galasa.sdv.SdvManagerException; +import javax.validation.constraints.NotNull; + +/** + * Should the SDV manager remove the SRR Journal and logstream on the CICS region?. + * + * @galasa.cps.property + * + * @galasa.name sdv.cicsTag.[cicsTag].SrrLogstreamRemoval + * + * @galasa.description Should the SDV manager remove the SRR Journal and logstream on the CICS + * region? + * + * Typically should be enabled for CICS regions that will be shutdown as part of + * test, and then discarded. + * + * @galasa.required No + * + * @galasa.default false + * + * @galasa.valid_values true, false + * + * @galasa.examples sdv.cicsTag.A.SrrLogstreamRemoval=true
      + * + */ +public class SdvSrrLogstreamRemoval extends CpsProperties { + + /** + * Returns a boolean indicating if the manager should delete the SRR logstream as part + * of its cleanup. + */ + public static boolean get(@NotNull String cicsTag) throws SdvManagerException { + try { + String sdvSrrLogstreamRemoval = getStringNulled(SdvPropertiesSingleton.cps(), "cicsTag", + "SrrLogstreamRemoval", cicsTag); + + if (sdvSrrLogstreamRemoval == null) { + return false; + } + return Boolean.parseBoolean(sdvSrrLogstreamRemoval); + } catch (ConfigurationPropertyStoreException e) { + throw new SdvManagerException( + "Problem asking CPS for SRR Logstream removal config for CICS tag: " + cicsTag, + e); + } + } +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/resources/jcl/definelogstream.jcl b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/resources/jcl/definelogstream.jcl new file mode 100644 index 000000000..4efa39e0f --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/resources/jcl/definelogstream.jcl @@ -0,0 +1,12 @@ +//****************************************************** +//* DEFINE a new logstream model for DFHSECR journal +//* Note: Log data will be autodeleted after 1 day +//****************************************************** +//DEFMODEL EXEC PGM=IXCMIAPU +//SYSPRINT DD SYSOUT=A,DCB=RECFM=FBA +//SYSIN DD * + DATA TYPE(LOGR) REPORT(NO) + DEFINE LOGSTREAM NAME(++OWNER++.++APPLID++.MODEL) + STRUCTNAME(++CFSTRUCT++) MODEL(YES) + AUTODELETE(YES) RETPD(0001) +/* \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/resources/jcl/deletelogstreams.jcl b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/resources/jcl/deletelogstreams.jcl new file mode 100644 index 000000000..805cf71b9 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/resources/jcl/deletelogstreams.jcl @@ -0,0 +1,19 @@ +//****************************************************** +//* DELETE logstreams used by any previous instances +//* of this CICS +//****************************************************** +//DELSTR EXEC PGM=IXCMIAPU +//SYSPRINT DD SYSOUT=A,DCB=RECFM=FBA +//SYSIN DD * + DATA TYPE(LOGR) REPORT(NO) + DELETE LOGSTREAM NAME(++OWNER++.++APPLID++.DFHSECR) +/* +//* +//DELMOD EXEC PGM=IXCMIAPU +//SYSPRINT DD SYSOUT=A,DCB=RECFM=FBA +//SYSIN DD * + DATA TYPE(LOGR) REPORT(NO) + DELETE LOGSTREAM NAME(++OWNER++.++APPLID++.MODEL) +/* + SET MAXCC=0 +// \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/resources/jcl/getYaml.jcl b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/resources/jcl/getYaml.jcl new file mode 100644 index 000000000..908cfd8bf --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/resources/jcl/getYaml.jcl @@ -0,0 +1,7 @@ +//MYLIB JCLLIB ORDER=(++CICSHLQ++.SDFHPROC) +//SDVCAPTR EXEC DFHXSDSO, +// HLQ=++CICSHLQ++, +// LOGSTRM=++OWNER++.++APPLID++.DFHSECR, +// CYL=100 +//EXTRACT.SYSIN DD * +HEADER=NO \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestRecordingRegion.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestRecordingRegion.java new file mode 100644 index 000000000..ed6391249 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestRecordingRegion.java @@ -0,0 +1,71 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal; + +import dev.galasa.ICredentialsUsernamePassword; +import dev.galasa.framework.spi.creds.CredentialsException; +import dev.galasa.framework.spi.creds.CredentialsUsernamePassword; +import dev.galasa.sdv.ISdvUser; +import dev.galasa.sdv.SdvManagerException; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + + +class TestRecordingRegion { + + RecordingRegion rr; + ICredentialsUsernamePassword credentials; + + @BeforeEach + void beforeEach() throws CredentialsException { + rr = new RecordingRegion(null); + + credentials = + new CredentialsUsernamePassword(null, "user1", "password1"); + } + + @Test + void testAddingNewUserToRegion() throws SdvManagerException, CredentialsException { + // No users to start + List beforeList = rr.getRecordingUsers(); + Assertions.assertEquals(0, beforeList.size()); + + // Add new user + ISdvUser newUser = new SdvUserImpl("creds1", credentials, "cics1", "TELLER"); + rr.addUserToRecord(newUser); + + // Number of users increment, and user is the one created + List afterList = rr.getRecordingUsers(); + Assertions.assertEquals(1, afterList.size()); + Assertions.assertEquals(newUser, afterList.get(0)); + } + + @Test + void testAddingExistingUserToRegion() throws SdvManagerException, CredentialsException { + // Add existing user + ISdvUser existingUser = new SdvUserImpl("creds1", credentials, "cics1", "TELLER"); + rr.addUserToRecord(existingUser); + List beforeList = rr.getRecordingUsers(); + Assertions.assertEquals(1, beforeList.size()); + Assertions.assertEquals(existingUser, beforeList.get(0)); + + // Create new user with same user name + ISdvUser newUser = new SdvUserImpl("creds2", credentials, "cics1", "ADMIN"); + Throwable exception = Assertions.assertThrows( + SdvManagerException.class, + () -> rr.addUserToRecord(newUser) + ); + + Assertions.assertEquals( + "User 'user1' has been allocated to more than one region in the test." + + " Please report this to the Galasa project.", + exception.getMessage() + ); + } +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvHttpRecorderImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvHttpRecorderImpl.java new file mode 100644 index 000000000..3afa33691 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvHttpRecorderImpl.java @@ -0,0 +1,4157 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal; + +import com.google.gson.JsonObject; +import dev.galasa.ICredentialsUsernamePassword; +import dev.galasa.artifact.IArtifactManager; +import dev.galasa.artifact.IBundleResources; +import dev.galasa.artifact.TestBundleResourceException; +import dev.galasa.cicsts.CedaException; +import dev.galasa.cicsts.CemtException; +import dev.galasa.cicsts.CicstsManagerException; +import dev.galasa.cicsts.ICeda; +import dev.galasa.cicsts.ICemt; +import dev.galasa.cicsts.ICicsRegion; +import dev.galasa.cicsts.ICicsTerminal; +import dev.galasa.cicsts.spi.ICicsRegionProvisioned; +import dev.galasa.framework.spi.DynamicStatusStoreException; +import dev.galasa.framework.spi.IDynamicStatusStoreService; +import dev.galasa.framework.spi.IFramework; +import dev.galasa.framework.spi.ResourceUnavailableException; +import dev.galasa.framework.spi.creds.CredentialsException; +import dev.galasa.framework.spi.creds.CredentialsUsernamePassword; +import dev.galasa.http.HttpClientException; +import dev.galasa.http.HttpClientResponse; +import dev.galasa.http.IHttpClient; +import dev.galasa.http.spi.IHttpManagerSpi; +import dev.galasa.ipnetwork.IIpHost; +import dev.galasa.sdv.ISdvUser; +import dev.galasa.sdv.SdvManagerException; +import dev.galasa.sdv.internal.properties.SdvHlq; +import dev.galasa.sdv.internal.properties.SdvPort; +import dev.galasa.sdv.internal.properties.SdvSdcActivation; +import dev.galasa.sdv.internal.properties.SdvSrrLogstreamRemoval; +import dev.galasa.zos.IZosImage; +import dev.galasa.zosbatch.IZosBatch; +import dev.galasa.zosbatch.IZosBatchJob; +import dev.galasa.zosbatch.IZosBatchJobOutput; +import dev.galasa.zosbatch.IZosBatchJobOutputSpoolFile; +import dev.galasa.zosbatch.ZosBatchException; +import dev.galasa.zosbatch.internal.ZosBatchJobOutputSpoolFileImpl; +import dev.galasa.zosbatch.spi.IZosBatchSpi; +import java.io.IOException; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Modifier; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.file.Files; +import java.nio.file.OpenOption; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.apache.commons.io.IOUtils; +import org.apache.commons.logging.Log; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.MockedStatic; +import org.mockito.Mockito; + + +class TestSdvHttpRecorderImpl { + + private MockedStatic sdvSdcActivation; + private MockedStatic sdvPort; + private MockedStatic sdvSrrLogstreamRemoval; + private MockedStatic sdvHlq; + private MockedStatic files; + + private ICicsRegionProvisioned mockCicsaRegion; + private IZosImage regionaImage; + private ICicsRegionProvisioned mockCicsbRegion; + private IZosImage regionbImage; + + private String regionaTag = "CICSA"; + private String regionaApplid = "APPL1"; + private String passwordString = "password123"; + private String regionbTag = "CICSB"; + private String regionbApplid = "APPL2"; + private String tellerRoleString = "TELLER"; + private String testRunName = "RUN123"; + private String createLogstreamJcl = "jcl_for_defining_logstreams"; + private String deleteLogstreamJcl = "jcl_for_defining_logstreams"; + private String logVariableString = "LOG"; + private String regionAportString = "32000"; + private String regionBportString = "32001"; + private String owner1String = "owner1"; + private String owner2String = "owner2"; + private String user1String = "user1"; + private String user2String = "user2"; + private String user3String = "user3"; + private String creds1String = "CREDS1"; + private String creds2String = "CREDS2"; + private String creds3String = "CREDS3"; + private String adminRoleString = "ADMIN"; + private String sdvHttpRecorderImplClassString = + "dev.galasa.sdv.internal.SdvHttpRecorderImpl"; + private String jclCreateLogstreamPathString = "/jcl/definelogstream.jcl"; + private String jclDeleteLogstreamPathString = "/jcl/deletelogstreams.jcl"; + private String jclGetYamlPathString = "/jcl/getYaml.jcl"; + private String structureString = "A_STRUCTURE"; + private String modifiersString = "modifiers"; + private String managerPrefixString = "manager."; + private String runningManagersString = "runningManagers."; + private String falseString = "false"; + private String sdcLiveString = ".sdcLive"; + private String cicsServerStringA = "cicsServerA"; + private String sdcUrl = "/DFHSDC"; + private String httpString = "http://"; + private String srrIdString = "srr_id"; + private String srrId1 = "_654654"; + private String srrId2 = "_7676575"; + private String srrId3 = "_4543634"; + private static final String uncheckedString = "unchecked"; + private String user1UnableToStartErrorString + = "Was unable to start recording for user 'user1', on CICS Region APPL1"; + private String messagePropString = "message"; + private String errorMessageString = "bad stuff happening"; + private String submitString = "submit"; + private String nullString = "null"; + private String errorOutputBadStuffString = "\nbad stuff happening"; + private String errorOutputPayloadStrng = + "\n{\"srr_id\":\"null\",\"message\":\"somethings gone badly wrong\"}"; + private String serverErrorMessage = "somethings gone badly wrong"; + private String utfString = "utf8"; + private String getYamlString = "/getYaml.jcl"; + private String onCicsRegionMsg = "', on CICS Region "; + + + @SuppressWarnings("PMD") + private static final Log mockLog = Mockito.mock(Log.class); + + @BeforeEach + public void setUp() throws CicstsManagerException { + // Registering static mocks before each test + sdvSdcActivation = Mockito.mockStatic(SdvSdcActivation.class); + sdvPort = Mockito.mockStatic(SdvPort.class); + sdvSrrLogstreamRemoval = Mockito.mockStatic(SdvSrrLogstreamRemoval.class); + sdvHlq = Mockito.mockStatic(SdvHlq.class); + files = Mockito.mockStatic(Files.class); + + sdvHlq.when(() -> SdvHlq.get(regionaTag)).thenReturn("CICS.INSTALL"); + sdvHlq.when(() -> SdvHlq.get(regionbTag)).thenReturn("CICS.INSTALL"); + + // LOG + Mockito.reset(mockLog); + Mockito.when(mockLog.isInfoEnabled()).thenReturn(true); + Mockito.when(mockLog.isWarnEnabled()).thenReturn(true); + Mockito.when(mockLog.isErrorEnabled()).thenReturn(true); + Mockito.when(mockLog.isTraceEnabled()).thenReturn(true); + Mockito.when(mockLog.isDebugEnabled()).thenReturn(true); + + // Region A SdvPort + sdvPort.when(() -> SdvPort.get(regionaTag)).thenReturn(regionAportString); + + sdvSrrLogstreamRemoval.when(() -> SdvSrrLogstreamRemoval.get(regionaTag)).thenReturn(true); + + // Mock RegionA + IIpHost ipHostA = Mockito.mock(IIpHost.class); + Mockito.when(ipHostA.getHostname()).thenReturn(cicsServerStringA); + regionaImage = Mockito.mock(IZosImage.class); + Mockito.when(regionaImage.getIpHost()).thenReturn(ipHostA); + IZosBatchJob mockIzOsBatchJoba = Mockito.mock(IZosBatchJob.class); + Mockito.when(mockIzOsBatchJoba.getOwner()).thenReturn(owner1String); + mockCicsaRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsaRegion.getTag()).thenReturn(regionaTag); + Mockito.when(mockCicsaRegion.getApplid()).thenReturn(regionaApplid); + Mockito.when(mockCicsaRegion.getRegionJob()).thenReturn(mockIzOsBatchJoba); + Mockito.when(mockCicsaRegion.getZosImage()).thenReturn(regionaImage); + + // Region B SdvPort + sdvPort.when(() -> SdvPort.get(regionbTag)).thenReturn(regionBportString); + + sdvSrrLogstreamRemoval.when(() -> SdvSrrLogstreamRemoval.get(regionbTag)).thenReturn(true); + + // Mock RegionB + IIpHost ipHostB = Mockito.mock(IIpHost.class); + Mockito.when(ipHostB.getHostname()).thenReturn("cicsServerB"); + regionbImage = Mockito.mock(IZosImage.class); + Mockito.when(regionbImage.getIpHost()).thenReturn(ipHostB); + IZosBatchJob mockIzOsBatchJobb = Mockito.mock(IZosBatchJob.class); + Mockito.when(mockIzOsBatchJobb.getOwner()).thenReturn(owner2String); + mockCicsbRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsbRegion.getTag()).thenReturn(regionbTag); + Mockito.when(mockCicsbRegion.getApplid()).thenReturn(regionbApplid); + Mockito.when(mockCicsbRegion.getRegionJob()).thenReturn(mockIzOsBatchJobb); + Mockito.when(mockCicsbRegion.getZosImage()).thenReturn(regionbImage); + } + + @AfterEach + public void tearDown() { + // Closing static mocks after each test + sdvSdcActivation.close(); + sdvPort.close(); + sdvSrrLogstreamRemoval.close(); + sdvHlq.close(); + files.close(); + } + + @Test + void testPrepareEnvironmentsAsFirstManagerOnRegionWithSdcActivation() + throws CredentialsException, SdvManagerException, ClassNotFoundException, + NoSuchFieldException, SecurityException, IllegalArgumentException, + IllegalAccessException, InstantiationException, InvocationTargetException, + NoSuchMethodException, ResourceUnavailableException, DynamicStatusStoreException, + CicstsManagerException, TestBundleResourceException, IOException, ZosBatchException { + // Mock Cemt + ICemt cemt = Mockito.mock(ICemt.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(cemt).setResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()); + + // Mock Ceda + ICeda ceda = Mockito.mock(ICeda.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).createResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), + Mockito.any()); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).installGroup(Mockito.any(), Mockito.any()); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).deleteGroup(Mockito.any(), Mockito.any()); + Mockito.when( + ceda.resourceExists(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any())) + .thenReturn(true); + + Mockito.when(mockCicsaRegion.ceda()).thenReturn(ceda); + Mockito.when(mockCicsaRegion.cemt()).thenReturn(cemt); + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + Mockito.when(mockCicsbRegion.ceda()).thenReturn(ceda); + Mockito.when(mockCicsbRegion.cemt()).thenReturn(cemt); + // Mock RegionA Terminal + ICicsTerminal regionbTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrB = new RecordingRegion(regionbTerminal); + // Mock user 1 + ICredentialsUsernamePassword user3Creds = + new CredentialsUsernamePassword(null, user3String, passwordString); + ISdvUser user3 = new SdvUserImpl(creds3String, user3Creds, regionbTag, tellerRoleString); + rrB.addUserToRecord(user3); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + recordingRegions.put(mockCicsbRegion, rrB); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(testRunName); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.putSwap(managerPrefixString + runningManagersString + regionaApplid, + null, testRunName)).thenReturn(true); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).put(managerPrefixString + regionaApplid + sdcLiveString, falseString); + Mockito.when(dssService.putSwap(managerPrefixString + runningManagersString + regionbApplid, + null, testRunName)).thenReturn(true); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).put(managerPrefixString + regionbApplid + sdcLiveString, falseString); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString( + Mockito.eq(jclCreateLogstreamPathString), Mockito.any())) + .thenReturn(createLogstreamJcl); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock batchManager + IZosBatchJob zosJob = Mockito.mock(IZosBatchJob.class); + Mockito.when(zosJob.waitForJob()).thenReturn(0); + IZosBatch zosBatch = Mockito.mock(IZosBatch.class); + Mockito.when(zosBatch.submitJob(createLogstreamJcl, null)).thenReturn(zosJob); + IZosBatchSpi batchManager = Mockito.mock(IZosBatchSpi.class); + Mockito.when(batchManager.getZosBatch(regionaImage)).thenReturn(zosBatch); + Mockito.when(batchManager.getZosBatch(regionbImage)).thenReturn(zosBatch); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(framework, recordingRegions, artifactManager, batchManager, null, + dssService, null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionbTag)).thenReturn(true); + + // Make call to funtion under test + sdvHttpRecorder.prepareEnvironments(structureString); + + // Ensure that we call ceda & cemt to create resources + Mockito.verify(cemt, Mockito.times(4)).setResource(Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any()); + + Mockito.verify(ceda, Mockito.times(6)).createResource(Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any(), Mockito.any()); + + Mockito.verify(ceda, Mockito.times(4)).installGroup(Mockito.any(), Mockito.any()); + } + + @Test + void testPrepareEnvironmentsAsSecondManagerOnRegion() + throws CicstsManagerException, CredentialsException, SdvManagerException, + DynamicStatusStoreException, TestBundleResourceException, IOException, + ZosBatchException, ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException { + // Mock Cemt + ICemt cemt = Mockito.mock(ICemt.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(cemt).setResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()); + + // Mock Ceda + ICeda ceda = Mockito.mock(ICeda.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).createResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), + Mockito.any()); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).installGroup(Mockito.any(), Mockito.any()); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).deleteGroup(Mockito.any(), Mockito.any()); + Mockito.when( + ceda.resourceExists(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any())) + .thenReturn(true); + + Mockito.when(mockCicsaRegion.ceda()).thenReturn(ceda); + Mockito.when(mockCicsaRegion.cemt()).thenReturn(cemt); + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + Mockito.when(mockCicsbRegion.ceda()).thenReturn(ceda); + Mockito.when(mockCicsbRegion.cemt()).thenReturn(cemt); + // Mock RegionA Terminal + ICicsTerminal regionbTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrB = new RecordingRegion(regionbTerminal); + // Mock user 1 + ICredentialsUsernamePassword user3Creds = + new CredentialsUsernamePassword(null, user3String, passwordString); + ISdvUser user3 = new SdvUserImpl(creds3String, user3Creds, regionbTag, tellerRoleString); + rrB.addUserToRecord(user3); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + recordingRegions.put(mockCicsbRegion, rrB); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(testRunName); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.putSwap(managerPrefixString + runningManagersString + regionaApplid, + null, testRunName)).thenReturn(false); + Mockito.when(dssService.get(managerPrefixString + runningManagersString + regionaApplid)) + .thenReturn("L1,L2"); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).put(managerPrefixString + runningManagersString + regionaApplid, + "L1,L2,RUN123"); + Mockito.when(dssService.get(managerPrefixString + regionaApplid + sdcLiveString)) + .thenReturn(falseString, "true"); + Mockito.when(dssService.putSwap(managerPrefixString + runningManagersString + regionbApplid, + null, testRunName)).thenReturn(false); + Mockito.when(dssService.get(managerPrefixString + runningManagersString + regionbApplid)) + .thenReturn("L1,L2"); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).put(managerPrefixString + runningManagersString + regionbApplid, + "L5,L6,RUN123"); + Mockito.when(dssService.get(managerPrefixString + regionbApplid + sdcLiveString)) + .thenReturn(falseString, "true"); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString( + Mockito.eq(jclCreateLogstreamPathString), Mockito.any())) + .thenReturn(createLogstreamJcl); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock batchManager + IZosBatchJob zosJob = Mockito.mock(IZosBatchJob.class); + Mockito.when(zosJob.waitForJob()).thenReturn(0); + IZosBatch zosBatch = Mockito.mock(IZosBatch.class); + Mockito.when(zosBatch.submitJob(createLogstreamJcl, null)).thenReturn(zosJob); + IZosBatchSpi batchManager = Mockito.mock(IZosBatchSpi.class); + Mockito.when(batchManager.getZosBatch(regionaImage)).thenReturn(zosBatch); + Mockito.when(batchManager.getZosBatch(regionaImage)).thenReturn(zosBatch); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(framework, recordingRegions, artifactManager, batchManager, null, + dssService, null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); + + // Make call to funtion under test + sdvHttpRecorder.prepareEnvironments(structureString); + + // Ensure that we DO NOT call ceda & cemt to create resources. + // Another manager will had created the resource, so this manager didn't have to. + Mockito.verify(cemt, Mockito.times(0)).setResource(Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any()); + + Mockito.verify(ceda, Mockito.times(0)).createResource(Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any(), Mockito.any()); + + Mockito.verify(ceda, Mockito.times(0)).installGroup(Mockito.any(), Mockito.any()); + } + + @Test + void testPrepareEnvironmentsLogstreamJobFailsDueToExisting() + throws CicstsManagerException, CredentialsException, SdvManagerException, + DynamicStatusStoreException, TestBundleResourceException, IOException, + ZosBatchException, ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException { + // Mock Cemt + ICemt cemt = Mockito.mock(ICemt.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(cemt).setResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()); + + // Mock Ceda + ICeda ceda = Mockito.mock(ICeda.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).createResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), + Mockito.any()); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).installGroup(Mockito.any(), Mockito.any()); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).deleteGroup(Mockito.any(), Mockito.any()); + Mockito.when( + ceda.resourceExists(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any())) + .thenReturn(true); + + Mockito.when(mockCicsaRegion.ceda()).thenReturn(ceda); + Mockito.when(mockCicsaRegion.cemt()).thenReturn(cemt); + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(testRunName); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.putSwap(managerPrefixString + runningManagersString + regionaApplid, + null, testRunName)).thenReturn(true); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).put(managerPrefixString + regionaApplid + sdcLiveString, falseString); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString( + Mockito.eq(jclCreateLogstreamPathString), Mockito.any())) + .thenReturn(createLogstreamJcl); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock batchManager + IZosBatchJob zosJob = Mockito.mock(IZosBatchJob.class); + Mockito.when(zosJob.waitForJob()).thenReturn(12); // EXISTING RETURN CODE + IZosBatch zosBatch = Mockito.mock(IZosBatch.class); + Mockito.when(zosBatch.submitJob(createLogstreamJcl, null)).thenReturn(zosJob); + IZosBatchSpi batchManager = Mockito.mock(IZosBatchSpi.class); + Mockito.when(batchManager.getZosBatch(regionaImage)).thenReturn(zosBatch); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(framework, recordingRegions, artifactManager, batchManager, null, + dssService, null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); + + // Make call to funtion under test + sdvHttpRecorder.prepareEnvironments(structureString); + + // Ensure that we call ceda & cemt to create resources + Mockito.verify(cemt, Mockito.times(2)).setResource(Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any()); + + Mockito.verify(ceda, Mockito.times(3)).createResource(Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any(), Mockito.any()); + + Mockito.verify(ceda, Mockito.times(2)).installGroup(Mockito.any(), Mockito.any()); + + // Check there is a warning in the log indicating Region A won't record + Mockito.verify(mockLog).info( + "Logstream not created, using existing, on CICS Region " + + regionaApplid + + "." + ); + } + + @Test + void testPrepareEnvironmentsLogstreamJobFailsDueToError() + throws CicstsManagerException, CredentialsException, SdvManagerException, + DynamicStatusStoreException, TestBundleResourceException, IOException, + ZosBatchException, ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException { + // Mock Cemt + ICemt cemt = Mockito.mock(ICemt.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(cemt).setResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()); + + // Mock Ceda + ICeda ceda = Mockito.mock(ICeda.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).createResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), + Mockito.any()); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).installGroup(Mockito.any(), Mockito.any()); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).deleteGroup(Mockito.any(), Mockito.any()); + Mockito.when( + ceda.resourceExists(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any())) + .thenReturn(true); + + Mockito.when(mockCicsaRegion.ceda()).thenReturn(ceda); + Mockito.when(mockCicsaRegion.cemt()).thenReturn(cemt); + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(testRunName); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.putSwap(managerPrefixString + runningManagersString + regionaApplid, + null, testRunName)).thenReturn(true); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).put(managerPrefixString + regionaApplid + sdcLiveString, falseString); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString( + Mockito.eq(jclCreateLogstreamPathString), Mockito.any())) + .thenReturn(createLogstreamJcl); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock batchManager + IZosBatchJob zosJob = Mockito.mock(IZosBatchJob.class); + Mockito.when(zosJob.waitForJob()).thenReturn(16); // EXISTING RETURN CODE + IZosBatch zosBatch = Mockito.mock(IZosBatch.class); + Mockito.when(zosBatch.submitJob(createLogstreamJcl, null)).thenReturn(zosJob); + IZosBatchSpi batchManager = Mockito.mock(IZosBatchSpi.class); + Mockito.when(batchManager.getZosBatch(regionaImage)).thenReturn(zosBatch); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(framework, recordingRegions, artifactManager, batchManager, null, + dssService, null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); + + // Make call to funtion under test + sdvHttpRecorder.prepareEnvironments(structureString); + + // Ensure that we call ceda & cemt to create resources + Mockito.verify(cemt, Mockito.times(2)).setResource(Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any()); + + Mockito.verify(ceda, Mockito.times(3)).createResource(Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any(), Mockito.any()); + + Mockito.verify(ceda, Mockito.times(2)).installGroup(Mockito.any(), Mockito.any()); + + // Check there is a warning in the log indicating Region A won't record + Mockito.verify(mockLog).warn( + "JCL to define logstreams fail for CICS Region " + + regionaApplid + + ", check artifacts for more details" + ); + } + + @Test + void testPrepareEnvironmentsCedaCreateException() + throws CicstsManagerException, CredentialsException, SdvManagerException, + DynamicStatusStoreException, TestBundleResourceException, IOException, + ZosBatchException, ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException { + // Mock Cemt + ICemt cemt = Mockito.mock(ICemt.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(cemt).setResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()); + + // Mock Ceda + ICeda ceda = Mockito.mock(ICeda.class); + Mockito.doThrow(new CedaException("Could not create resource")).when(ceda).createResource( + Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()); + + Mockito.when(mockCicsaRegion.ceda()).thenReturn(ceda); + Mockito.when(mockCicsaRegion.cemt()).thenReturn(cemt); + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(testRunName); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.putSwap(managerPrefixString + runningManagersString + regionaApplid, + null, testRunName)).thenReturn(true); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).put(managerPrefixString + regionaApplid + sdcLiveString, falseString); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString( + Mockito.eq(jclCreateLogstreamPathString), Mockito.any())) + .thenReturn(createLogstreamJcl); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock batchManager + IZosBatchJob zosJob = Mockito.mock(IZosBatchJob.class); + Mockito.when(zosJob.waitForJob()).thenReturn(0); + IZosBatch zosBatch = Mockito.mock(IZosBatch.class); + Mockito.when(zosBatch.submitJob(createLogstreamJcl, null)).thenReturn(zosJob); + IZosBatchSpi batchManager = Mockito.mock(IZosBatchSpi.class); + Mockito.when(batchManager.getZosBatch(regionaImage)).thenReturn(zosBatch); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(framework, recordingRegions, artifactManager, batchManager, null, + dssService, null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.prepareEnvironments(structureString); + }); + + Assertions.assertEquals( + "Could not create SRR JOURNALMODEL definition on CICS Region " + + regionaApplid + + ".", + exception.getMessage() + ); + + } + + @Test + void testPrepareEnvironmentsCedaInstallSdvGrpException() + throws IllegalArgumentException, IllegalAccessException, InstantiationException, + InvocationTargetException, NoSuchMethodException, SecurityException, + NoSuchFieldException, ClassNotFoundException, ZosBatchException, + TestBundleResourceException, IOException, DynamicStatusStoreException, + CicstsManagerException, CredentialsException, SdvManagerException { + // Mock Cemt + ICemt cemt = Mockito.mock(ICemt.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(cemt).setResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()); + + // Mock Ceda + ICeda ceda = Mockito.mock(ICeda.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).createResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), + Mockito.any()); + Mockito.doThrow(new CedaException("could not install")).when(ceda) + .installGroup(Mockito.any(), Mockito.any()); + + Mockito.when(mockCicsaRegion.ceda()).thenReturn(ceda); + Mockito.when(mockCicsaRegion.cemt()).thenReturn(cemt); + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(testRunName); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.putSwap(managerPrefixString + runningManagersString + regionaApplid, + null, testRunName)).thenReturn(true); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).put(managerPrefixString + regionaApplid + sdcLiveString, falseString); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString( + Mockito.eq(jclCreateLogstreamPathString), Mockito.any())) + .thenReturn(createLogstreamJcl); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock batchManager + IZosBatchJob zosJob = Mockito.mock(IZosBatchJob.class); + Mockito.when(zosJob.waitForJob()).thenReturn(0); + IZosBatch zosBatch = Mockito.mock(IZosBatch.class); + Mockito.when(zosBatch.submitJob(createLogstreamJcl, null)).thenReturn(zosJob); + IZosBatchSpi batchManager = Mockito.mock(IZosBatchSpi.class); + Mockito.when(batchManager.getZosBatch(regionaImage)).thenReturn(zosBatch); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(framework, recordingRegions, artifactManager, batchManager, null, + dssService, null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.prepareEnvironments(structureString); + }); + + Assertions.assertEquals( + "Could not install SDV resource group on CICS region " + + regionaApplid, + exception.getMessage() + ); + + } + + @Test + void testPrepareEnvironmentsCedaInstallDfhxsdException() + throws IllegalArgumentException, IllegalAccessException, InstantiationException, + InvocationTargetException, NoSuchMethodException, SecurityException, + NoSuchFieldException, ClassNotFoundException, ZosBatchException, + TestBundleResourceException, IOException, DynamicStatusStoreException, + CicstsManagerException, CredentialsException, SdvManagerException { + // Mock Cemt + ICemt cemt = Mockito.mock(ICemt.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(cemt).setResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()); + + // Mock Ceda + ICeda ceda = Mockito.mock(ICeda.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).createResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), + Mockito.any()); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).installGroup(Mockito.any(), Mockito.eq("SDVGRP")); + Mockito.doThrow(new CedaException("could not install")).when(ceda) + .installGroup(Mockito.any(), Mockito.eq("DFHXSD")); + + Mockito.when(mockCicsaRegion.ceda()).thenReturn(ceda); + Mockito.when(mockCicsaRegion.cemt()).thenReturn(cemt); + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(testRunName); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.putSwap(managerPrefixString + runningManagersString + regionaApplid, + null, testRunName)).thenReturn(true); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).put(managerPrefixString + regionaApplid + sdcLiveString, falseString); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString( + Mockito.eq(jclCreateLogstreamPathString), Mockito.any())) + .thenReturn(createLogstreamJcl); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock batchManager + IZosBatchJob zosJob = Mockito.mock(IZosBatchJob.class); + Mockito.when(zosJob.waitForJob()).thenReturn(0); + IZosBatch zosBatch = Mockito.mock(IZosBatch.class); + Mockito.when(zosBatch.submitJob(createLogstreamJcl, null)).thenReturn(zosJob); + IZosBatchSpi batchManager = Mockito.mock(IZosBatchSpi.class); + Mockito.when(batchManager.getZosBatch(regionaImage)).thenReturn(zosBatch); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(framework, recordingRegions, artifactManager, batchManager, null, + dssService, null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); + + // Make call to funtion under test + sdvHttpRecorder.prepareEnvironments(structureString); + + // Ensure that we call ceda & cemt to create resources + Mockito.verify(cemt, Mockito.times(0)).setResource(Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any()); + + Mockito.verify(ceda, Mockito.times(3)).createResource(Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any(), Mockito.any()); + + Mockito.verify(ceda, Mockito.times(2)).installGroup(Mockito.any(), Mockito.any()); + + // Check there is a warning in the log indicating Region A won't record + Mockito.verify(mockLog, Mockito.times(1)).info( + "Couldn't install DFHXSD, already installed on CICS Region " + + regionaApplid + ); + + } + + @Test + void testPrepareEnvironmentsBatchJobThrowsException() throws CredentialsException, + SdvManagerException, DynamicStatusStoreException, TestBundleResourceException, + IOException, ZosBatchException, ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException, CicstsManagerException { + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(testRunName); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.putSwap(managerPrefixString + runningManagersString + regionaApplid, + null, testRunName)).thenReturn(true); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).put(managerPrefixString + regionaApplid + sdcLiveString, falseString); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString( + Mockito.eq(jclCreateLogstreamPathString), Mockito.any())) + .thenReturn(createLogstreamJcl); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock batchManager + IZosBatchJob zosJob = Mockito.mock(IZosBatchJob.class); + Mockito.when(zosJob.waitForJob()).thenThrow(new ZosBatchException("bad job run")); + IZosBatch zosBatch = Mockito.mock(IZosBatch.class); + Mockito.when(zosBatch.submitJob(createLogstreamJcl, null)).thenReturn(zosJob); + IZosBatchSpi batchManager = Mockito.mock(IZosBatchSpi.class); + Mockito.when(batchManager.getZosBatch(regionaImage)).thenReturn(zosBatch); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(framework, recordingRegions, artifactManager, batchManager, null, + dssService, null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.prepareEnvironments(structureString); + }); + + Assertions.assertEquals( + "Unable to run JCL to define logstreams for CICS Region " + + regionaApplid, + exception.getMessage() + ); + } + + @Test + void testPrepareEnvironmentsDssThrowsException() + throws DynamicStatusStoreException, NoSuchFieldException, SecurityException, + IllegalArgumentException, IllegalAccessException, InstantiationException, + InvocationTargetException, NoSuchMethodException, CicstsManagerException, + CredentialsException, SdvManagerException, ClassNotFoundException { + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(testRunName); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.putSwap(managerPrefixString + runningManagersString + regionaApplid, + null, testRunName)).thenThrow(new DynamicStatusStoreException("dss issues")); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(framework, recordingRegions, null, null, null, dssService, null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.prepareEnvironments(structureString); + }); + + Assertions.assertEquals("Unable interact with DSS for SDV.", exception.getMessage()); + } + + @Test + void testPrepareEnvironmentsCemtThrowsException() throws DynamicStatusStoreException, + TestBundleResourceException, IOException, CicstsManagerException, CredentialsException, + SdvManagerException, ZosBatchException, ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException { + // Mock Cemt + ICemt cemt = Mockito.mock(ICemt.class); + Mockito.doThrow(new CemtException("bad news")).when(cemt).setResource(Mockito.any(), + Mockito.any(), Mockito.any(), Mockito.any()); + + // Mock Ceda + ICeda ceda = Mockito.mock(ICeda.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).createResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), + Mockito.any()); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).installGroup(Mockito.any(), Mockito.any()); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).deleteGroup(Mockito.any(), Mockito.any()); + Mockito.when( + ceda.resourceExists(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any())) + .thenReturn(true); + + Mockito.when(mockCicsaRegion.ceda()).thenReturn(ceda); + Mockito.when(mockCicsaRegion.cemt()).thenReturn(cemt); + + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(testRunName); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.putSwap(managerPrefixString + runningManagersString + regionaApplid, + null, testRunName)).thenReturn(true); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).put(managerPrefixString + regionaApplid + sdcLiveString, falseString); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString( + Mockito.eq(jclCreateLogstreamPathString), Mockito.any())) + .thenReturn(createLogstreamJcl); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock batchManager + IZosBatchJob zosJob = Mockito.mock(IZosBatchJob.class); + Mockito.when(zosJob.waitForJob()).thenReturn(0); + IZosBatch zosBatch = Mockito.mock(IZosBatch.class); + Mockito.when(zosBatch.submitJob(createLogstreamJcl, null)).thenReturn(zosJob); + IZosBatchSpi batchManager = Mockito.mock(IZosBatchSpi.class); + Mockito.when(batchManager.getZosBatch(regionaImage)).thenReturn(zosBatch); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(framework, recordingRegions, artifactManager, batchManager, null, + dssService, null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); + + // Make call to funtion under test + sdvHttpRecorder.prepareEnvironments(structureString); + + // Ensure that we call ceda & cemt to create resources + Mockito.verify(cemt, Mockito.times(1)).setResource(Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any()); + + Mockito.verify(ceda, Mockito.times(3)).createResource(Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any(), Mockito.any()); + + Mockito.verify(ceda, Mockito.times(2)).installGroup(Mockito.any(), Mockito.any()); + + // Check there is a warning in the log indicating Region A won't record + Mockito.verify(mockLog).debug( + "CICS resource disabling expectedly failed on " + + regionaApplid + ); + } + + @Test + void testPrepareEnvironmentsPortNotFound() throws SdvManagerException, IllegalArgumentException, + IllegalAccessException, NoSuchFieldException, SecurityException, InstantiationException, + InvocationTargetException, NoSuchMethodException, ZosBatchException, + TestBundleResourceException, IOException, DynamicStatusStoreException, + CredentialsException, CicstsManagerException, ClassNotFoundException { + // Mock Cemt + ICemt cemt = Mockito.mock(ICemt.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(cemt).setResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()); + + // Mock Ceda + ICeda ceda = Mockito.mock(ICeda.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).createResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), + Mockito.any()); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).installGroup(Mockito.any(), Mockito.any()); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).deleteGroup(Mockito.any(), Mockito.any()); + Mockito.when( + ceda.resourceExists(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any())) + .thenReturn(true); + + // Mock SDVPort + sdvPort.when(() -> SdvPort.get(regionaTag)).thenReturn(null); + + Mockito.when(mockCicsaRegion.ceda()).thenReturn(ceda); + Mockito.when(mockCicsaRegion.cemt()).thenReturn(cemt); + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(testRunName); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.putSwap(managerPrefixString + runningManagersString + regionaApplid, + null, testRunName)).thenReturn(true); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).put(managerPrefixString + regionaApplid + sdcLiveString, falseString); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString( + Mockito.eq(jclCreateLogstreamPathString), Mockito.any())) + .thenReturn(createLogstreamJcl); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock batchManager + IZosBatchJob zosJob = Mockito.mock(IZosBatchJob.class); + Mockito.when(zosJob.waitForJob()).thenReturn(16); // EXISTING RETURN CODE + IZosBatch zosBatch = Mockito.mock(IZosBatch.class); + Mockito.when(zosBatch.submitJob(createLogstreamJcl, null)).thenReturn(zosJob); + IZosBatchSpi batchManager = Mockito.mock(IZosBatchSpi.class); + Mockito.when(batchManager.getZosBatch(regionaImage)).thenReturn(zosBatch); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(framework, recordingRegions, artifactManager, batchManager, null, + dssService, null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.prepareEnvironments(structureString); + }); + + Assertions.assertEquals( + "Could not find SDC port in CPS properties for CICS tag: " + + regionaTag, + exception.getMessage() + ); + + } + + @Test + void testPrepareEnvironmentsHttpResourcesDoNotAlreadyExist() + throws CicstsManagerException, CredentialsException, SdvManagerException, + DynamicStatusStoreException, TestBundleResourceException, IOException, + ZosBatchException, ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException { + // Mock Cemt + ICemt cemt = Mockito.mock(ICemt.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(cemt).setResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()); + + // Mock Ceda + ICeda ceda = Mockito.mock(ICeda.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).createResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), + Mockito.any()); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).installGroup(Mockito.any(), Mockito.any()); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).deleteGroup(Mockito.any(), Mockito.any()); + Mockito.when( + ceda.resourceExists(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any())) + .thenReturn(false); + + Mockito.when(mockCicsaRegion.ceda()).thenReturn(ceda); + Mockito.when(mockCicsaRegion.cemt()).thenReturn(cemt); + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(testRunName); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.putSwap(managerPrefixString + runningManagersString + regionaApplid, + null, testRunName)).thenReturn(true); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).put(managerPrefixString + regionaApplid + sdcLiveString, falseString); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString( + Mockito.eq(jclCreateLogstreamPathString), Mockito.any())) + .thenReturn(createLogstreamJcl); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock batchManager + IZosBatchJob zosJob = Mockito.mock(IZosBatchJob.class); + Mockito.when(zosJob.waitForJob()).thenReturn(16); // EXISTING RETURN CODE + IZosBatch zosBatch = Mockito.mock(IZosBatch.class); + Mockito.when(zosBatch.submitJob(createLogstreamJcl, null)).thenReturn(zosJob); + IZosBatchSpi batchManager = Mockito.mock(IZosBatchSpi.class); + Mockito.when(batchManager.getZosBatch(regionaImage)).thenReturn(zosBatch); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(framework, recordingRegions, artifactManager, batchManager, null, + dssService, null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); + + // Make call to funtion under test + sdvHttpRecorder.prepareEnvironments(structureString); + + // Ensure that we call ceda & cemt was not used to disable resources + Mockito.verify(cemt, Mockito.times(0)).setResource(Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any()); + + Mockito.verify(ceda, Mockito.times(3)).createResource(Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any(), Mockito.any()); + + Mockito.verify(ceda, Mockito.times(2)).installGroup(Mockito.any(), Mockito.any()); + } + + @Test + void testCleanUpEnvironmentsAsLastManagerOnRegionWithSdcActivation() + throws CredentialsException, SdvManagerException, ClassNotFoundException, + NoSuchFieldException, SecurityException, IllegalArgumentException, + IllegalAccessException, InstantiationException, InvocationTargetException, + NoSuchMethodException, ResourceUnavailableException, DynamicStatusStoreException, + CicstsManagerException, TestBundleResourceException, IOException, ZosBatchException { + // Mock Cemt + ICemt cemt = Mockito.mock(ICemt.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(cemt).setResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()); + + // Mock Ceda + ICeda ceda = Mockito.mock(ICeda.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).deleteGroup(Mockito.any(), Mockito.any()); + + Mockito.when(mockCicsaRegion.ceda()).thenReturn(ceda); + Mockito.when(mockCicsaRegion.cemt()).thenReturn(cemt); + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + Mockito.when(mockCicsbRegion.ceda()).thenReturn(ceda); + Mockito.when(mockCicsbRegion.cemt()).thenReturn(cemt); + // Mock RegionA Terminal + ICicsTerminal regionbTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrB = new RecordingRegion(regionbTerminal); + // Mock user 1 + ICredentialsUsernamePassword user3Creds = + new CredentialsUsernamePassword(null, user3String, passwordString); + ISdvUser user3 = new SdvUserImpl(creds3String, user3Creds, regionbTag, tellerRoleString); + rrB.addUserToRecord(user3); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + recordingRegions.put(mockCicsbRegion, rrB); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(testRunName); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.get(managerPrefixString + runningManagersString + regionaApplid)) + .thenReturn(testRunName); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).delete(managerPrefixString + runningManagersString + regionaApplid); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).delete(managerPrefixString + regionaApplid + sdcLiveString); + + Mockito.when(dssService.get(managerPrefixString + runningManagersString + regionbApplid)) + .thenReturn(testRunName); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).delete(managerPrefixString + runningManagersString + regionbApplid); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).delete(managerPrefixString + regionbApplid + sdcLiveString); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString( + Mockito.eq(jclDeleteLogstreamPathString), Mockito.any())) + .thenReturn(deleteLogstreamJcl); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock batchManager + IZosBatchJob zosJob = Mockito.mock(IZosBatchJob.class); + Mockito.when(zosJob.waitForJob()).thenReturn(0); + IZosBatch zosBatch = Mockito.mock(IZosBatch.class); + Mockito.when(zosBatch.submitJob(deleteLogstreamJcl, null)).thenReturn(zosJob); + IZosBatchSpi batchManager = Mockito.mock(IZosBatchSpi.class); + Mockito.when(batchManager.getZosBatch(regionaImage)).thenReturn(zosBatch); + Mockito.when(batchManager.getZosBatch(regionbImage)).thenReturn(zosBatch); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(framework, recordingRegions, artifactManager, batchManager, null, + dssService, null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionbTag)).thenReturn(true); + + // Make call to funtion under test + sdvHttpRecorder.cleanUpEnvironments(); + + // Ensure that we call ceda & cemt to delete resources + Mockito.verify(cemt, Mockito.times(4)).setResource(Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any()); + + Mockito.verify(ceda, Mockito.times(2)).deleteGroup(Mockito.any(), Mockito.any()); + } + + @Test + void testCleanUpEnvironmentsNotAsLastManagerOnRegionWithSdcActivation() + throws CredentialsException, SdvManagerException, ClassNotFoundException, + NoSuchFieldException, SecurityException, IllegalArgumentException, + IllegalAccessException, InstantiationException, InvocationTargetException, + NoSuchMethodException, ResourceUnavailableException, DynamicStatusStoreException, + CicstsManagerException, TestBundleResourceException, IOException, ZosBatchException { + // Mock Cemt + ICemt cemt = Mockito.mock(ICemt.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(cemt).setResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()); + + // Mock Ceda + ICeda ceda = Mockito.mock(ICeda.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).deleteGroup(Mockito.any(), Mockito.any()); + + Mockito.when(mockCicsaRegion.ceda()).thenReturn(ceda); + Mockito.when(mockCicsaRegion.cemt()).thenReturn(cemt); + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + Mockito.when(mockCicsbRegion.ceda()).thenReturn(ceda); + Mockito.when(mockCicsbRegion.cemt()).thenReturn(cemt); + // Mock RegionA Terminal + ICicsTerminal regionbTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrB = new RecordingRegion(regionbTerminal); + // Mock user 1 + ICredentialsUsernamePassword user3Creds = + new CredentialsUsernamePassword(null, user3String, passwordString); + ISdvUser user3 = new SdvUserImpl(creds3String, user3Creds, regionbTag, tellerRoleString); + rrB.addUserToRecord(user3); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + recordingRegions.put(mockCicsbRegion, rrB); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(testRunName); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.get(managerPrefixString + runningManagersString + regionaApplid)) + .thenReturn(testRunName + ",L564,L234"); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).put(managerPrefixString + runningManagersString + regionaApplid, + "L564,L234"); + + Mockito.when(dssService.get(managerPrefixString + runningManagersString + regionbApplid)) + .thenReturn(testRunName + ",L789,L101"); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).put(managerPrefixString + runningManagersString + regionbApplid, + "L789,L101"); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(framework, recordingRegions, null, null, null, dssService, null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionbTag)).thenReturn(true); + + // Make call to funtion under test + sdvHttpRecorder.cleanUpEnvironments(); + + // Ensure that we do not call ceda & cemt to delete resources + Mockito.verify(cemt, Mockito.times(0)).setResource(Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any()); + + Mockito.verify(ceda, Mockito.times(0)).deleteGroup(Mockito.any(), Mockito.any()); + } + + @Test + void testCleanUpEnvironmentsDssException() throws CredentialsException, SdvManagerException, + DynamicStatusStoreException, ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException { + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(testRunName); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.get(managerPrefixString + runningManagersString + regionaApplid)) + .thenThrow(new DynamicStatusStoreException("Unable interact with DSS for SDV.")); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(framework, recordingRegions, null, null, null, dssService, null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.cleanUpEnvironments(); + }); + + Assertions.assertEquals("Unable interact with DSS for SDV.", exception.getMessage()); + } + + @Test + void testCleanUpEnvironmentsCedaDeleteGroupThrowsException() + throws CicstsManagerException, CredentialsException, SdvManagerException, + DynamicStatusStoreException, ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException, + TestBundleResourceException, IOException, ZosBatchException { + // Mock Cemt + ICemt cemt = Mockito.mock(ICemt.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(cemt).setResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()); + + // Mock Ceda + ICeda ceda = Mockito.mock(ICeda.class); + Mockito.doThrow(new CedaException("cannot delete group")).when(ceda) + .deleteGroup(Mockito.any(), Mockito.any()); + + Mockito.when(mockCicsaRegion.ceda()).thenReturn(ceda); + Mockito.when(mockCicsaRegion.cemt()).thenReturn(cemt); + + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(testRunName); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.get(managerPrefixString + runningManagersString + regionaApplid)) + .thenReturn(testRunName); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString( + Mockito.eq(jclDeleteLogstreamPathString), Mockito.any())) + .thenReturn(deleteLogstreamJcl); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock batchManager + IZosBatchJob zosJob = Mockito.mock(IZosBatchJob.class); + Mockito.when(zosJob.waitForJob()).thenReturn(0); + IZosBatch zosBatch = Mockito.mock(IZosBatch.class); + Mockito.when(zosBatch.submitJob(deleteLogstreamJcl, null)).thenReturn(zosJob); + IZosBatchSpi batchManager = Mockito.mock(IZosBatchSpi.class); + Mockito.when(batchManager.getZosBatch(regionaImage)).thenReturn(zosBatch); + Mockito.when(batchManager.getZosBatch(regionbImage)).thenReturn(zosBatch); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(framework, recordingRegions, artifactManager, batchManager, null, + dssService, null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); + + // Make call to funtion under test + sdvHttpRecorder.cleanUpEnvironments(); + + Mockito.verify(cemt, Mockito.times(2)).setResource(Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any()); + + Mockito.verify(ceda, Mockito.times(1)).deleteGroup(Mockito.any(), Mockito.any()); + + // Check there is a warning in the log indicating Region A won't record + Mockito.verify(mockLog).error(Mockito.eq( + "Could not delete the SDVGRP on CICS Region " + + regionaApplid + ), Mockito.any()); + } + + @Test + void testCleanUpEnvironmentsDeleteSrrLogstreamJobError() + throws CicstsManagerException, CredentialsException, SdvManagerException, + DynamicStatusStoreException, TestBundleResourceException, IOException, + ZosBatchException, ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException { + // Mock Cemt + ICemt cemt = Mockito.mock(ICemt.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(cemt).setResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()); + + // Mock Ceda + ICeda ceda = Mockito.mock(ICeda.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).deleteGroup(Mockito.any(), Mockito.any()); + + Mockito.when(mockCicsaRegion.ceda()).thenReturn(ceda); + Mockito.when(mockCicsaRegion.cemt()).thenReturn(cemt); + + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(testRunName); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.get(managerPrefixString + runningManagersString + regionaApplid)) + .thenReturn(testRunName); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString( + Mockito.eq(jclDeleteLogstreamPathString), Mockito.any())) + .thenReturn(deleteLogstreamJcl); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock batchManager + IZosBatchJob zosJob = Mockito.mock(IZosBatchJob.class); + Mockito.when(zosJob.waitForJob()).thenReturn(8); + IZosBatch zosBatch = Mockito.mock(IZosBatch.class); + Mockito.when(zosBatch.submitJob(deleteLogstreamJcl, null)).thenReturn(zosJob); + IZosBatchSpi batchManager = Mockito.mock(IZosBatchSpi.class); + Mockito.when(batchManager.getZosBatch(regionaImage)).thenReturn(zosBatch); + Mockito.when(batchManager.getZosBatch(regionbImage)).thenReturn(zosBatch); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(framework, recordingRegions, artifactManager, batchManager, null, + dssService, null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.cleanUpEnvironments(); + }); + + Assertions.assertEquals( + "JCL to delete logstreams fail on CICS Region " + + regionaApplid + + ", check artifacts for more details.", + exception.getMessage() + ); + } + + @Test + void testCleanUpEnvironmentsArtifactManagerException() throws CicstsManagerException, + CredentialsException, SdvManagerException, DynamicStatusStoreException, + ClassNotFoundException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, NoSuchFieldException, TestBundleResourceException, IOException { + // Mock Cemt + ICemt cemt = Mockito.mock(ICemt.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(cemt).setResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()); + + // Mock Ceda + ICeda ceda = Mockito.mock(ICeda.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).deleteGroup(Mockito.any(), Mockito.any()); + + Mockito.when(mockCicsaRegion.ceda()).thenReturn(ceda); + Mockito.when(mockCicsaRegion.cemt()).thenReturn(cemt); + + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(testRunName); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.get(managerPrefixString + runningManagersString + regionaApplid)) + .thenReturn(testRunName); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString( + Mockito.eq(jclDeleteLogstreamPathString), Mockito.any())) + .thenThrow(new TestBundleResourceException("not found")); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(framework, recordingRegions, artifactManager, null, null, dssService, + null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.cleanUpEnvironments(); + }); + + Assertions.assertEquals( + "Unable to run JCL to delete logstreams for CICS Region " + + regionaApplid, + exception.getMessage() + ); + } + + @Test + void testCleanUpEnvironmentsCemtSetResourceException() + throws CicstsManagerException, CredentialsException, SdvManagerException, + DynamicStatusStoreException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, NoSuchFieldException, ClassNotFoundException, + TestBundleResourceException, IOException, ZosBatchException { + // Mock Cemt + ICemt cemt = Mockito.mock(ICemt.class); + Mockito.doThrow(new CemtException("couldn't set resource")).when(cemt) + .setResource(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()); + + // Mock Ceda + ICeda ceda = Mockito.mock(ICeda.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(ceda).deleteGroup(Mockito.any(), Mockito.any()); + + Mockito.when(mockCicsaRegion.ceda()).thenReturn(ceda); + Mockito.when(mockCicsaRegion.cemt()).thenReturn(cemt); + + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(testRunName); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.get(managerPrefixString + runningManagersString + regionaApplid)) + .thenReturn(testRunName); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString( + Mockito.eq(jclDeleteLogstreamPathString), Mockito.any())) + .thenReturn(deleteLogstreamJcl); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock batchManager + IZosBatchJob zosJob = Mockito.mock(IZosBatchJob.class); + Mockito.when(zosJob.waitForJob()).thenReturn(0); + IZosBatch zosBatch = Mockito.mock(IZosBatch.class); + Mockito.when(zosBatch.submitJob(deleteLogstreamJcl, null)).thenReturn(zosJob); + IZosBatchSpi batchManager = Mockito.mock(IZosBatchSpi.class); + Mockito.when(batchManager.getZosBatch(regionaImage)).thenReturn(zosBatch); + Mockito.when(batchManager.getZosBatch(regionbImage)).thenReturn(zosBatch); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(framework, recordingRegions, artifactManager, batchManager, null, + dssService, null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); + sdvSdcActivation.when(() -> SdvSdcActivation.get(regionbTag)).thenReturn(true); + + // Make call to funtion under test + sdvHttpRecorder.cleanUpEnvironments(); + + // Ensure that we call ceda & cemt to create resources + Mockito.verify(ceda, Mockito.times(1)).deleteGroup(Mockito.any(), Mockito.any()); + Mockito.verify(cemt, Mockito.times(2)).setResource(Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any()); + + // Check there is a warning in the log indicating Region A won't record + Mockito.verify(mockLog, Mockito.times(1)) + .error("Could not create URIMAP on CICS Region " + regionaApplid); + Mockito.verify(mockLog, Mockito.times(1)) + .error("Could not create TCPIPSERVICE on CICS Region " + regionaApplid); + } + + @SuppressWarnings(uncheckedString) + @Test + void testStartRecordingNoExistingSdcForMultipleRegionsAndUsers() + throws SdvManagerException, CicstsManagerException, CredentialsException, + ClassNotFoundException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, NoSuchFieldException, URISyntaxException, HttpClientException { + + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + // Mock RegionB Terminal + ICicsTerminal regionbTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionB + RecordingRegion rrB = new RecordingRegion(regionbTerminal); + // Mock user 3 + ICredentialsUsernamePassword user3Creds = + new CredentialsUsernamePassword(null, user3String, passwordString); + ISdvUser user3 = new SdvUserImpl(creds3String, user3Creds, regionbTag, tellerRoleString); + rrB.addUserToRecord(user3); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + recordingRegions.put(mockCicsbRegion, rrB); + + // Mock HTTP Client - 1st time + IHttpClient httpClient1 = Mockito.mock(IHttpClient.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1) + .setURI(new URI(httpString + cicsServerStringA + ":" + regionAportString)); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1).setAuthorisation(user1String, passwordString); + // Mock GET JSON return from SDC - to find current status + HttpClientResponse mockGetResponse1 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockGetResponse1.getStatusCode()).thenReturn(404); + Mockito.when(httpClient1.getJson(sdcUrl)).thenReturn(mockGetResponse1); + // Mock POST JSON return from SDC - to start recording + HttpClientResponse mockPostResponse1 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockPostResponse1.getStatusCode()).thenReturn(201); + JsonObject postResponseContent1 = new JsonObject(); + postResponseContent1.addProperty(srrIdString, srrId1); + Mockito.when(mockPostResponse1.getContent()).thenReturn(postResponseContent1); + JsonObject postBody = new JsonObject(); + Mockito.when(httpClient1.postJson(sdcUrl, postBody)).thenReturn(mockPostResponse1); + + // Mock HTTP Client - 2nd time + IHttpClient httpClient2 = Mockito.mock(IHttpClient.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient2) + .setURI(new URI(httpString + cicsServerStringA + ":" + regionAportString)); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient2).setAuthorisation(user1String, passwordString); + // Mock GET JSON return from SDC - to find current status + HttpClientResponse mockGetResponse2 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockGetResponse2.getStatusCode()).thenReturn(404); + Mockito.when(httpClient2.getJson(sdcUrl)).thenReturn(mockGetResponse2); + // Mock POST JSON return from SDC - to start recording + HttpClientResponse mockPostResponse2 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockPostResponse2.getStatusCode()).thenReturn(201); + JsonObject postResponseContent2 = new JsonObject(); + postResponseContent2.addProperty(srrIdString, srrId2); + Mockito.when(mockPostResponse2.getContent()).thenReturn(postResponseContent2); + Mockito.when(httpClient2.postJson(sdcUrl, postBody)).thenReturn(mockPostResponse2); + + // Mock HTTP Client - 3rd time + IHttpClient httpClient3 = Mockito.mock(IHttpClient.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient3) + .setURI(new URI(httpString + cicsServerStringA + ":" + regionAportString)); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient3).setAuthorisation(user1String, passwordString); + // Mock GET JSON return from SDC - to find current status + HttpClientResponse mockGetResponse3 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockGetResponse3.getStatusCode()).thenReturn(404); + Mockito.when(httpClient3.getJson(sdcUrl)).thenReturn(mockGetResponse3); + // Mock POST JSON return from SDC - to start recording + HttpClientResponse mockPostResponse3 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockPostResponse3.getStatusCode()).thenReturn(201); + JsonObject postResponseContent3 = new JsonObject(); + postResponseContent3.addProperty(srrIdString, srrId3); + Mockito.when(mockPostResponse3.getContent()).thenReturn(postResponseContent3); + Mockito.when(httpClient3.postJson(sdcUrl, postBody)).thenReturn(mockPostResponse3); + + // Mock HTTP Manager + IHttpManagerSpi httpManager = Mockito.mock(IHttpManagerSpi.class); + Mockito.when(httpManager.newHttpClient()).thenReturn(httpClient1, httpClient2, httpClient3); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(null, recordingRegions, null, null, null, null, httpManager); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + // Make call to funtion under test + sdvHttpRecorder.startRecording(); + + // Assert HTTP endpoints called + Mockito.verify(httpClient1, Mockito.times(1)).getJson(Mockito.any()); + Mockito.verify(httpClient1, Mockito.times(1)).postJson(Mockito.any(), Mockito.any()); + Mockito.verify(httpClient2, Mockito.times(1)).getJson(Mockito.any()); + Mockito.verify(httpClient2, Mockito.times(1)).postJson(Mockito.any(), Mockito.any()); + Mockito.verify(httpClient3, Mockito.times(1)).getJson(Mockito.any()); + Mockito.verify(httpClient3, Mockito.times(1)).postJson(Mockito.any(), Mockito.any()); + + // Assert that all users are set to recording with SRR IDs + List expectedSrrIdsList = new ArrayList<>(); + expectedSrrIdsList.add(srrId1); + expectedSrrIdsList.add(srrId2); + expectedSrrIdsList.add(srrId3); + + Assertions.assertEquals(true, user1.isRecording()); + Assertions.assertTrue(expectedSrrIdsList.contains(user1.getSrrId())); + Assertions.assertEquals(true, user1.isRecording()); + expectedSrrIdsList.remove(user1.getSrrId()); + + Assertions.assertEquals(true, user2.isRecording()); + Assertions.assertTrue(expectedSrrIdsList.contains(user2.getSrrId())); + Assertions.assertEquals(true, user2.isRecording()); + expectedSrrIdsList.remove(user2.getSrrId()); + + Assertions.assertEquals(true, user3.isRecording()); + Assertions.assertTrue(expectedSrrIdsList.contains(user3.getSrrId())); + Assertions.assertEquals(true, user3.isRecording()); + expectedSrrIdsList.remove(user3.getSrrId()); + } + + @SuppressWarnings(uncheckedString) + @Test + void testStartRecordingExistingSdcForMultipleRegionsAndUsers() + throws CicstsManagerException, CredentialsException, SdvManagerException, + URISyntaxException, HttpClientException, ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException { + + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + rrA.addUserToRecord(user2); + + // Mock RegionB Terminal + ICicsTerminal regionbTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionB + RecordingRegion rrB = new RecordingRegion(regionbTerminal); + // Mock user 3 + ICredentialsUsernamePassword user3Creds = + new CredentialsUsernamePassword(null, user3String, passwordString); + ISdvUser user3 = new SdvUserImpl(creds3String, user3Creds, regionbTag, tellerRoleString); + rrB.addUserToRecord(user3); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + recordingRegions.put(mockCicsbRegion, rrB); + + // Mock HTTP Client - 1st time + IHttpClient httpClient1 = Mockito.mock(IHttpClient.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1) + .setURI(new URI(httpString + cicsServerStringA + ":" + regionAportString)); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1).setAuthorisation(user1String, passwordString); + // Mock GET JSON return from SDC - to find current status + HttpClientResponse mockGetResponse1 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockGetResponse1.getStatusCode()).thenReturn(200); + Mockito.when(httpClient1.getJson(sdcUrl)).thenReturn(mockGetResponse1); + // Mock DELETE JSON return from SDC - to stop existing SDC + HttpClientResponse mockDeleteResponse1 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockDeleteResponse1.getStatusCode()).thenReturn(200); + JsonObject deleteBody = new JsonObject(); + deleteBody.addProperty(submitString, false); + Mockito.when(httpClient1.deleteJson(sdcUrl, deleteBody)).thenReturn(mockDeleteResponse1); + // Mock POST JSON return from SDC - to start recording + HttpClientResponse mockPostResponse1 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockPostResponse1.getStatusCode()).thenReturn(201); + JsonObject postResponseContent1 = new JsonObject(); + postResponseContent1.addProperty(srrIdString, srrId1); + Mockito.when(mockPostResponse1.getContent()).thenReturn(postResponseContent1); + JsonObject postBody = new JsonObject(); + Mockito.when(httpClient1.postJson(sdcUrl, postBody)).thenReturn(mockPostResponse1); + + // Mock HTTP Client - 2nd time + IHttpClient httpClient2 = Mockito.mock(IHttpClient.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient2) + .setURI(new URI(httpString + cicsServerStringA + ":" + regionAportString)); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient2).setAuthorisation(user1String, passwordString); + // Mock GET JSON return from SDC - to find current status + HttpClientResponse mockGetResponse2 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockGetResponse2.getStatusCode()).thenReturn(200); + Mockito.when(httpClient2.getJson(sdcUrl)).thenReturn(mockGetResponse2); + // Mock DELETE JSON return from SDC - to stop existing SDC + HttpClientResponse mockDeleteResponse2 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockDeleteResponse2.getStatusCode()).thenReturn(200); + Mockito.when(httpClient2.deleteJson(sdcUrl, deleteBody)).thenReturn(mockDeleteResponse2); + // Mock POST JSON return from SDC - to start recording + HttpClientResponse mockPostResponse2 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockPostResponse2.getStatusCode()).thenReturn(201); + JsonObject postResponseContent2 = new JsonObject(); + postResponseContent2.addProperty(srrIdString, srrId2); + Mockito.when(mockPostResponse2.getContent()).thenReturn(postResponseContent2); + Mockito.when(httpClient2.postJson(sdcUrl, postBody)).thenReturn(mockPostResponse2); + + // Mock HTTP Client - 3rd time + IHttpClient httpClient3 = Mockito.mock(IHttpClient.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient3) + .setURI(new URI(httpString + cicsServerStringA + ":" + regionAportString)); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient3).setAuthorisation(user1String, passwordString); + // Mock GET JSON return from SDC - to find current status + HttpClientResponse mockGetResponse3 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockGetResponse3.getStatusCode()).thenReturn(200); + Mockito.when(httpClient3.getJson(sdcUrl)).thenReturn(mockGetResponse3); + // Mock DELETE JSON return from SDC - to stop existing SDC + HttpClientResponse mockDeleteResponse3 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockDeleteResponse3.getStatusCode()).thenReturn(200); + Mockito.when(httpClient3.deleteJson(sdcUrl, deleteBody)).thenReturn(mockDeleteResponse3); + // Mock POST JSON return from SDC - to start recording + HttpClientResponse mockPostResponse3 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockPostResponse3.getStatusCode()).thenReturn(201); + JsonObject postResponseContent3 = new JsonObject(); + postResponseContent3.addProperty(srrIdString, srrId3); + Mockito.when(mockPostResponse3.getContent()).thenReturn(postResponseContent3); + Mockito.when(httpClient3.postJson(sdcUrl, postBody)).thenReturn(mockPostResponse3); + + // Mock HTTP Manager + IHttpManagerSpi httpManager = Mockito.mock(IHttpManagerSpi.class); + Mockito.when(httpManager.newHttpClient()).thenReturn(httpClient1, httpClient2, httpClient3); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(null, recordingRegions, null, null, null, null, httpManager); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + // Make call to funtion under test + sdvHttpRecorder.startRecording(); + + // Assert HTTP endpoints called + Mockito.verify(httpClient1, Mockito.times(1)).getJson(Mockito.any()); + Mockito.verify(httpClient1, Mockito.times(1)).deleteJson(Mockito.any(), Mockito.any()); + Mockito.verify(httpClient1, Mockito.times(1)).postJson(Mockito.any(), Mockito.any()); + Mockito.verify(httpClient2, Mockito.times(1)).getJson(Mockito.any()); + Mockito.verify(httpClient2, Mockito.times(1)).deleteJson(Mockito.any(), Mockito.any()); + Mockito.verify(httpClient2, Mockito.times(1)).postJson(Mockito.any(), Mockito.any()); + Mockito.verify(httpClient3, Mockito.times(1)).getJson(Mockito.any()); + Mockito.verify(httpClient3, Mockito.times(1)).deleteJson(Mockito.any(), Mockito.any()); + Mockito.verify(httpClient3, Mockito.times(1)).postJson(Mockito.any(), Mockito.any()); + + // Assert that all users are set to recording with SRR IDs + List expectedSrrIdsList = new ArrayList<>(); + expectedSrrIdsList.add(srrId1); + expectedSrrIdsList.add(srrId2); + expectedSrrIdsList.add(srrId3); + + Assertions.assertEquals(true, user1.isRecording()); + Assertions.assertTrue(expectedSrrIdsList.contains(user1.getSrrId())); + Assertions.assertEquals(true, user1.isRecording()); + expectedSrrIdsList.remove(user1.getSrrId()); + + Assertions.assertEquals(true, user2.isRecording()); + Assertions.assertTrue(expectedSrrIdsList.contains(user2.getSrrId())); + Assertions.assertEquals(true, user2.isRecording()); + expectedSrrIdsList.remove(user2.getSrrId()); + + Assertions.assertEquals(true, user3.isRecording()); + Assertions.assertTrue(expectedSrrIdsList.contains(user3.getSrrId())); + Assertions.assertEquals(true, user3.isRecording()); + expectedSrrIdsList.remove(user3.getSrrId()); + + } + + @SuppressWarnings(uncheckedString) + @Test + void testStartRecordingHttpGetSdcServerError() throws CredentialsException, SdvManagerException, + URISyntaxException, HttpClientException, ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException, CicstsManagerException { + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + // Mock HTTP Client - 1st time + IHttpClient httpClient1 = Mockito.mock(IHttpClient.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1) + .setURI(new URI(httpString + cicsServerStringA + ":" + regionAportString)); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1).setAuthorisation(user1String, passwordString); + // Mock GET JSON return from SDC - to find current status + HttpClientResponse mockGetResponse1 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockGetResponse1.getStatusCode()).thenReturn(500); + Mockito.when(mockGetResponse1.getStatusMessage()).thenReturn(errorMessageString); + JsonObject getResponseContent1 = new JsonObject(); + getResponseContent1.addProperty(srrIdString, nullString); + getResponseContent1.addProperty(messagePropString, serverErrorMessage); + Mockito.when(mockGetResponse1.getContent()).thenReturn(getResponseContent1); + Mockito.when(httpClient1.getJson(sdcUrl)).thenReturn(mockGetResponse1); + + // Mock HTTP Manager + IHttpManagerSpi httpManager = Mockito.mock(IHttpManagerSpi.class); + Mockito.when(httpManager.newHttpClient()).thenReturn(httpClient1); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(null, recordingRegions, null, null, null, null, httpManager); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.startRecording(); + }); + + Assertions.assertEquals(user1UnableToStartErrorString, exception.getMessage()); + Assertions.assertEquals( + "Error whilst obtaining current SDC status for user 'user1', " + + "on CICS Region APPL1. Status code: 500" + + errorOutputBadStuffString + errorOutputPayloadStrng, + exception.getCause().getMessage() + ); + } + + @Test + void testStartRecordingGetHttpClientException() + throws CicstsManagerException, CredentialsException, SdvManagerException, + URISyntaxException, HttpClientException, ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException { + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + // Mock HTTP Client - 1st time + IHttpClient httpClient1 = Mockito.mock(IHttpClient.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1) + .setURI(new URI(httpString + cicsServerStringA + ":" + regionAportString)); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1).setAuthorisation(user1String, passwordString); + // Mock GET JSON return from SDC - to find current status + Mockito.when(httpClient1.getJson(sdcUrl)) + .thenThrow(new HttpClientException("Could not get response from SDC")); + + // Mock HTTP Manager + IHttpManagerSpi httpManager = Mockito.mock(IHttpManagerSpi.class); + Mockito.when(httpManager.newHttpClient()).thenReturn(httpClient1); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(null, recordingRegions, null, null, null, null, httpManager); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.startRecording(); + }); + + Assertions.assertEquals(user1UnableToStartErrorString, exception.getMessage()); + Assertions.assertEquals( + "Could not check status SDC recording status for user '" + + user1String + + onCicsRegionMsg + + regionaApplid + + ". Is SDC activated?", + exception.getCause().getMessage() + ); + } + + @SuppressWarnings(uncheckedString) + @Test + void testStartRecordingHttpDeleteSdcServerError() + throws CicstsManagerException, CredentialsException, SdvManagerException, + URISyntaxException, HttpClientException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, ClassNotFoundException, NoSuchFieldException { + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + // Mock HTTP Client - 1st time + IHttpClient httpClient1 = Mockito.mock(IHttpClient.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1) + .setURI(new URI(httpString + cicsServerStringA + ":" + regionAportString)); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1).setAuthorisation(user1String, passwordString); + // Mock GET JSON return from SDC - to find current status + HttpClientResponse mockGetResponse1 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockGetResponse1.getStatusCode()).thenReturn(200); + Mockito.when(httpClient1.getJson(sdcUrl)).thenReturn(mockGetResponse1); + // Mock DELETE JSON return from SDC - to stop existing SDC + HttpClientResponse mockDeleteResponse1 = Mockito.mock(HttpClientResponse.class); + JsonObject deleteResponseContent1 = new JsonObject(); + deleteResponseContent1.addProperty(srrIdString, nullString); + deleteResponseContent1.addProperty(messagePropString, serverErrorMessage); + Mockito.when(mockDeleteResponse1.getStatusCode()).thenReturn(500); + Mockito.when(mockDeleteResponse1.getStatusMessage()).thenReturn(errorMessageString); + Mockito.when(mockDeleteResponse1.getContent()).thenReturn(deleteResponseContent1); + JsonObject deleteBody = new JsonObject(); + deleteBody.addProperty(submitString, false); + Mockito.when(httpClient1.deleteJson(sdcUrl, deleteBody)).thenReturn(mockDeleteResponse1); + + // Mock HTTP Manager + IHttpManagerSpi httpManager = Mockito.mock(IHttpManagerSpi.class); + Mockito.when(httpManager.newHttpClient()).thenReturn(httpClient1); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(null, recordingRegions, null, null, null, null, httpManager); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.startRecording(); + }); + + Assertions.assertEquals(user1UnableToStartErrorString, exception.getMessage()); + Assertions.assertEquals( + "Could not stop SDC recording for user '" + + user1String + + onCicsRegionMsg + + regionaApplid + + ". Status code: 500" + + errorOutputBadStuffString + + errorOutputPayloadStrng, + exception.getCause().getMessage() + ); + } + + @SuppressWarnings(uncheckedString) + @Test + void testStartRecordingDeleteHttpClientException() + throws HttpClientException, CicstsManagerException, CredentialsException, + SdvManagerException, URISyntaxException, ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException { + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + // Mock HTTP Client - 1st time + IHttpClient httpClient1 = Mockito.mock(IHttpClient.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1) + .setURI(new URI(httpString + cicsServerStringA + ":" + regionAportString)); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1).setAuthorisation(user1String, passwordString); + // Mock GET JSON return from SDC - to find current status + HttpClientResponse mockGetResponse1 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockGetResponse1.getStatusCode()).thenReturn(200); + Mockito.when(httpClient1.getJson(sdcUrl)).thenReturn(mockGetResponse1); + // Mock DELETE JSON return from SDC - to stop existing SDC + JsonObject deleteBody = new JsonObject(); + deleteBody.addProperty(submitString, false); + Mockito.when(httpClient1.deleteJson(sdcUrl, deleteBody)) + .thenThrow(new HttpClientException("No response")); + + // Mock HTTP Manager + IHttpManagerSpi httpManager = Mockito.mock(IHttpManagerSpi.class); + Mockito.when(httpManager.newHttpClient()).thenReturn(httpClient1); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(null, recordingRegions, null, null, null, null, httpManager); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.startRecording(); + }); + + Assertions.assertEquals(user1UnableToStartErrorString, exception.getMessage()); + Assertions.assertEquals( + "Could not stop existing SDC recording for user '" + + user1String + + onCicsRegionMsg + + regionaApplid + + ".", + exception.getCause().getMessage() + ); + } + + @SuppressWarnings(uncheckedString) + @Test + void testStartRecordingHttpPostSdcServerError() + throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, + SecurityException, InstantiationException, InvocationTargetException, + NoSuchMethodException, HttpClientException, URISyntaxException, ClassNotFoundException, + SdvManagerException, CredentialsException, CicstsManagerException { + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + // Mock HTTP Client - 1st time + IHttpClient httpClient1 = Mockito.mock(IHttpClient.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1) + .setURI(new URI(httpString + cicsServerStringA + ":" + regionAportString)); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1).setAuthorisation(user1String, passwordString); + // Mock GET JSON return from SDC - to find current status + HttpClientResponse mockGetResponse1 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockGetResponse1.getStatusCode()).thenReturn(404); + Mockito.when(httpClient1.getJson(sdcUrl)).thenReturn(mockGetResponse1); + // Mock POST return from SDC + HttpClientResponse mockPostResponse1 = Mockito.mock(HttpClientResponse.class); + JsonObject postResponseContent1 = new JsonObject(); + postResponseContent1.addProperty(srrIdString, nullString); + postResponseContent1.addProperty(messagePropString, serverErrorMessage); + Mockito.when(mockPostResponse1.getStatusCode()).thenReturn(500); + Mockito.when(mockPostResponse1.getStatusMessage()).thenReturn(errorMessageString); + Mockito.when(mockPostResponse1.getContent()).thenReturn(postResponseContent1); + JsonObject postBody = new JsonObject(); + Mockito.when(httpClient1.postJson(sdcUrl, postBody)).thenReturn(mockPostResponse1); + + // Mock HTTP Manager + IHttpManagerSpi httpManager = Mockito.mock(IHttpManagerSpi.class); + Mockito.when(httpManager.newHttpClient()).thenReturn(httpClient1); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(null, recordingRegions, null, null, null, null, httpManager); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.startRecording(); + }); + + Assertions.assertEquals(user1UnableToStartErrorString, exception.getMessage()); + Assertions.assertEquals( + "Could not start SDC recording for user '" + + user1String + + onCicsRegionMsg + + regionaApplid + + ". Status code: 500" + + errorOutputBadStuffString + + errorOutputPayloadStrng, + exception.getCause().getMessage() + ); + } + + @SuppressWarnings(uncheckedString) + @Test + void testStartRecordingPostHttpClientException() + throws CicstsManagerException, CredentialsException, SdvManagerException, + URISyntaxException, HttpClientException, ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException { + + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + // Mock HTTP Client - 1st time + IHttpClient httpClient1 = Mockito.mock(IHttpClient.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1) + .setURI(new URI(httpString + cicsServerStringA + ":" + regionAportString)); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1).setAuthorisation(user1String, passwordString); + // Mock GET JSON return from SDC - to find current status + HttpClientResponse mockGetResponse1 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockGetResponse1.getStatusCode()).thenReturn(404); + Mockito.when(httpClient1.getJson(sdcUrl)).thenReturn(mockGetResponse1); + // Mock POST return from SDC + JsonObject postBody = new JsonObject(); + Mockito.when(httpClient1.postJson(sdcUrl, postBody)) + .thenThrow(new HttpClientException("no response")); + + // Mock HTTP Manager + IHttpManagerSpi httpManager = Mockito.mock(IHttpManagerSpi.class); + Mockito.when(httpManager.newHttpClient()).thenReturn(httpClient1); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(null, recordingRegions, null, null, null, null, httpManager); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.startRecording(); + }); + + Assertions.assertEquals(user1UnableToStartErrorString, exception.getMessage()); + Assertions.assertEquals( + "Could not start SDC recording for user '" + + user1String + + onCicsRegionMsg + + regionaApplid, + exception.getCause().getMessage() + ); + } + + @SuppressWarnings(uncheckedString) + @Test + void testStartRecordingNoSrrIdInResponse() + throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, + SecurityException, InstantiationException, InvocationTargetException, + NoSuchMethodException, ClassNotFoundException, HttpClientException, + CicstsManagerException, CredentialsException, SdvManagerException, URISyntaxException { + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + // Mock HTTP Client - 1st time + IHttpClient httpClient1 = Mockito.mock(IHttpClient.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1) + .setURI(new URI(httpString + cicsServerStringA + ":" + regionAportString)); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1).setAuthorisation(user1String, passwordString); + // Mock GET JSON return from SDC - to find current status + HttpClientResponse mockGetResponse1 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockGetResponse1.getStatusCode()).thenReturn(404); + Mockito.when(httpClient1.getJson(sdcUrl)).thenReturn(mockGetResponse1); + // Mock POST return from SDC + HttpClientResponse mockPostResponse1 = Mockito.mock(HttpClientResponse.class); + JsonObject postResponseContent1 = new JsonObject(); + postResponseContent1.addProperty(srrIdString, ""); + postResponseContent1.addProperty(messagePropString, "edge case"); + Mockito.when(mockPostResponse1.getStatusCode()).thenReturn(201); + Mockito.when(mockPostResponse1.getStatusMessage()).thenReturn(errorMessageString); + Mockito.when(mockPostResponse1.getContent()).thenReturn(postResponseContent1); + JsonObject postBody = new JsonObject(); + Mockito.when(httpClient1.postJson(sdcUrl, postBody)).thenReturn(mockPostResponse1); + + // Mock HTTP Manager + IHttpManagerSpi httpManager = Mockito.mock(IHttpManagerSpi.class); + Mockito.when(httpManager.newHttpClient()).thenReturn(httpClient1); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(null, recordingRegions, null, null, null, null, httpManager); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.startRecording(); + }); + + Assertions.assertEquals(user1UnableToStartErrorString, exception.getMessage()); + Assertions.assertEquals( + "SDC recording did not return an SRR ID for user '" + + user1String + + onCicsRegionMsg + + regionaApplid, + exception.getCause().getMessage() + ); + } + + @Test + void testStartRecordingBadUri() throws IllegalArgumentException, IllegalAccessException, + NoSuchFieldException, SecurityException, InstantiationException, + InvocationTargetException, NoSuchMethodException, ClassNotFoundException, + SdvManagerException, CredentialsException, CicstsManagerException { + // Mock SDVPort + sdvPort.when(() -> SdvPort.get(regionaTag)).thenReturn("////gfg\\"); + + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + rrA.addUserToRecord(user1); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + // Mock HTTP Client - 1st time + IHttpClient httpClient1 = Mockito.mock(IHttpClient.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1).setURI(Mockito.any()); + + // Mock HTTP Manager + IHttpManagerSpi httpManager = Mockito.mock(IHttpManagerSpi.class); + Mockito.when(httpManager.newHttpClient()).thenReturn(httpClient1); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(null, recordingRegions, null, null, null, null, httpManager); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.startRecording(); + }); + + Assertions.assertEquals(user1UnableToStartErrorString, exception.getMessage()); + Assertions.assertEquals( + "Badly formed URI for SDC service for CICS Region " + + regionaApplid, + exception.getCause().getMessage() + ); + } + + @SuppressWarnings(uncheckedString) + @Test + void testEndRecordingForMultipleRegionsAndUsers() + throws SdvManagerException, CicstsManagerException, CredentialsException, + ClassNotFoundException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, NoSuchFieldException, URISyntaxException, HttpClientException { + + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + user1.setSrrId(srrId1); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + user2.setSrrId(srrId2); + rrA.addUserToRecord(user2); + + // Mock RegionB Terminal + ICicsTerminal regionbTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionB + RecordingRegion rrB = new RecordingRegion(regionbTerminal); + // Mock user 3 + ICredentialsUsernamePassword user3Creds = + new CredentialsUsernamePassword(null, user3String, passwordString); + ISdvUser user3 = new SdvUserImpl(creds3String, user3Creds, regionbTag, tellerRoleString); + user3.setSrrId(srrId3); + rrB.addUserToRecord(user3); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + recordingRegions.put(mockCicsbRegion, rrB); + + // Mock HTTP Client - 1st time + IHttpClient httpClient1 = Mockito.mock(IHttpClient.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1) + .setURI(new URI(httpString + cicsServerStringA + ":" + regionAportString)); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1).setAuthorisation(user1String, passwordString); + // Mock DELETE JSON return from SDC + HttpClientResponse mockDeleteResponse1 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockDeleteResponse1.getStatusCode()).thenReturn(200); + JsonObject deleteBody = new JsonObject(); + deleteBody.addProperty(submitString, false); + Mockito.when(httpClient1.deleteJson(sdcUrl, deleteBody)).thenReturn(mockDeleteResponse1); + + // Mock HTTP Client - 2nd time + IHttpClient httpClient2 = Mockito.mock(IHttpClient.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient2) + .setURI(new URI(httpString + cicsServerStringA + ":" + regionAportString)); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient2).setAuthorisation(user1String, passwordString); + // Mock DELETE JSON return from SDC + HttpClientResponse mockDeleteResponse2 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockDeleteResponse2.getStatusCode()).thenReturn(200); + Mockito.when(httpClient2.deleteJson(sdcUrl, deleteBody)).thenReturn(mockDeleteResponse2); + + // Mock HTTP Client - 3rd time + IHttpClient httpClient3 = Mockito.mock(IHttpClient.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient3) + .setURI(new URI(httpString + cicsServerStringA + ":" + regionAportString)); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient3).setAuthorisation(user1String, passwordString); + // Mock DELETE JSON return from SDC + HttpClientResponse mockDeleteResponse3 = Mockito.mock(HttpClientResponse.class); + Mockito.when(mockDeleteResponse3.getStatusCode()).thenReturn(200); + Mockito.when(httpClient3.deleteJson(sdcUrl, deleteBody)).thenReturn(mockDeleteResponse3); + + // Mock HTTP Manager + IHttpManagerSpi httpManager = Mockito.mock(IHttpManagerSpi.class); + Mockito.when(httpManager.newHttpClient()).thenReturn(httpClient1, httpClient2, httpClient3); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(null, recordingRegions, null, null, null, null, httpManager); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + // Make call to funtion under test + sdvHttpRecorder.endRecording(); + + // Assert HTTP endpoints called + Mockito.verify(httpClient1, Mockito.times(1)).deleteJson(Mockito.any(), Mockito.any()); + Mockito.verify(httpClient2, Mockito.times(1)).deleteJson(Mockito.any(), Mockito.any()); + Mockito.verify(httpClient3, Mockito.times(1)).deleteJson(Mockito.any(), Mockito.any()); + + // Assert that all users are no longer recording + Assertions.assertEquals(false, user1.isRecording()); + Assertions.assertEquals(false, user2.isRecording()); + Assertions.assertEquals(false, user3.isRecording()); + + } + + @SuppressWarnings(uncheckedString) + @Test + void testEndRecordingDeleteServerError() + throws SdvManagerException, CicstsManagerException, CredentialsException, + ClassNotFoundException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, NoSuchFieldException, URISyntaxException, HttpClientException { + + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + user1.setSrrId(srrId1); + rrA.addUserToRecord(user1); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + // Mock HTTP Client - 1st time + IHttpClient httpClient1 = Mockito.mock(IHttpClient.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1) + .setURI(new URI(httpString + cicsServerStringA + ":" + regionAportString)); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1).setAuthorisation(user1String, passwordString); + // Mock DELETE JSON return from SDC + HttpClientResponse mockDeleteResponse1 = Mockito.mock(HttpClientResponse.class); + JsonObject deleteResponseContent1 = new JsonObject(); + deleteResponseContent1.addProperty(srrIdString, nullString); + deleteResponseContent1.addProperty(messagePropString, serverErrorMessage); + Mockito.when(mockDeleteResponse1.getStatusCode()).thenReturn(500); + Mockito.when(mockDeleteResponse1.getStatusMessage()).thenReturn(errorMessageString); + Mockito.when(mockDeleteResponse1.getContent()).thenReturn(deleteResponseContent1); + JsonObject deleteBody = new JsonObject(); + deleteBody.addProperty(submitString, false); + Mockito.when(httpClient1.deleteJson(sdcUrl, deleteBody)).thenReturn(mockDeleteResponse1); + + // Mock HTTP Manager + IHttpManagerSpi httpManager = Mockito.mock(IHttpManagerSpi.class); + Mockito.when(httpManager.newHttpClient()).thenReturn(httpClient1); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(null, recordingRegions, null, null, null, null, httpManager); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.endRecording(); + }); + + Assertions.assertEquals( + "Unable to stop SRR recording " + + srrId1 + + ", for user '" + + user1String + + onCicsRegionMsg + + regionaApplid, + exception.getMessage() + ); + Assertions.assertEquals( + "Could not stop SDC recording for user '" + + user1String + + onCicsRegionMsg + + regionaApplid + + ". Status code: 500" + + errorOutputBadStuffString + + errorOutputPayloadStrng, + exception.getCause().getMessage() + ); + } + + @SuppressWarnings(uncheckedString) + @Test + void testEndRecordingDeleteHttpClientException() + throws SdvManagerException, CicstsManagerException, CredentialsException, + ClassNotFoundException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, NoSuchFieldException, URISyntaxException, HttpClientException { + + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + user1.setSrrId(srrId1); + rrA.addUserToRecord(user1); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + // Mock HTTP Client - 1st time + IHttpClient httpClient1 = Mockito.mock(IHttpClient.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1) + .setURI(new URI(httpString + cicsServerStringA + ":" + regionAportString)); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1).setAuthorisation(user1String, passwordString); + // Mock DELETE JSON return from SDC + JsonObject deleteBody = new JsonObject(); + deleteBody.addProperty(submitString, false); + Mockito.when(httpClient1.deleteJson(sdcUrl, deleteBody)) + .thenThrow(new HttpClientException("Nothing back")); + + // Mock HTTP Manager + IHttpManagerSpi httpManager = Mockito.mock(IHttpManagerSpi.class); + Mockito.when(httpManager.newHttpClient()).thenReturn(httpClient1); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(null, recordingRegions, null, null, null, null, httpManager); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.endRecording(); + }); + + Assertions.assertEquals( + "Unable to stop SRR recording " + + srrId1 + + ", for user '" + + user1String + + onCicsRegionMsg + + regionaApplid, + exception.getMessage() + ); + Assertions.assertEquals( + "Could not stop existing SDC recording for user '" + + user1String + + onCicsRegionMsg + + regionaApplid, + exception.getCause().getMessage() + ); + } + + @Test + void testEndRecordingBadUri() throws CredentialsException, SdvManagerException, + ClassNotFoundException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, NoSuchFieldException { + // Mock SDVPort + sdvPort.when(() -> SdvPort.get(regionaTag)).thenReturn("////gfg\\"); + + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + user1.setSrrId(srrId1); + rrA.addUserToRecord(user1); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + // Mock HTTP Client - 1st time + IHttpClient httpClient1 = Mockito.mock(IHttpClient.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(httpClient1).setURI(Mockito.any()); + + // Mock HTTP Manager + IHttpManagerSpi httpManager = Mockito.mock(IHttpManagerSpi.class); + Mockito.when(httpManager.newHttpClient()).thenReturn(httpClient1); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(null, recordingRegions, null, null, null, null, httpManager); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.endRecording(); + }); + + Assertions.assertEquals( + "Unable to stop SRR recording " + + srrId1 + + ", for user '" + + user1String + + onCicsRegionMsg + + regionaApplid, + exception.getMessage() + ); + Assertions.assertEquals( + "Badly formed URI for SDC service for CICS Region " + + regionaApplid, + exception.getCause().getMessage() + ); + } + + @Test + void testExportRecordingsForMulitpleRegions() + throws CredentialsException, SdvManagerException, ClassNotFoundException, + InstantiationException, IllegalAccessException, IllegalArgumentException, + InvocationTargetException, NoSuchMethodException, SecurityException, + NoSuchFieldException, TestBundleResourceException, IOException, ZosBatchException { + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + user1.setSrrId(srrId1); + user1.setNotRecording(); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + user2.setSrrId(srrId2); + user2.setNotRecording(); + rrA.addUserToRecord(user2); + + // Mock RegionA Terminal + ICicsTerminal regionbTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrB = new RecordingRegion(regionbTerminal); + // Mock user 1 + ICredentialsUsernamePassword user3Creds = + new CredentialsUsernamePassword(null, user3String, passwordString); + ISdvUser user3 = new SdvUserImpl(creds3String, user3Creds, regionbTag, tellerRoleString); + user3.setSrrId(srrId3); + user3.setNotRecording(); + rrB.addUserToRecord(user3); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + recordingRegions.put(mockCicsbRegion, rrB); + + String getYamlJcl = + IOUtils.toString(this.getClass().getResourceAsStream(getYamlString), utfString); + + String getYamlAppendedRegionaJcl = IOUtils + .toString(this.getClass().getResourceAsStream("/getYamlRegionA.jcl"), utfString); + + String getYamlAppendedRegionbJcl = IOUtils + .toString(this.getClass().getResourceAsStream("/getYamlRegionB.jcl"), utfString); + + String regionAyaml = IOUtils + .toString(this.getClass().getResourceAsStream("/yamlRegionA.yaml"), utfString); + + String regionByaml = IOUtils + .toString(this.getClass().getResourceAsStream("/yamlRegionB.yaml"), utfString); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString(Mockito.eq(jclGetYamlPathString), + Mockito.any())).thenReturn(getYamlJcl); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock batchManager + IZosBatchJob zosJobA = Mockito.mock(IZosBatchJob.class); + Mockito.when(zosJobA.waitForJob()).thenReturn(0); + IZosBatchJob zosJobB = Mockito.mock(IZosBatchJob.class); + Mockito.when(zosJobB.waitForJob()).thenReturn(0); + IZosBatchJobOutput batchJobOutputRegionA = Mockito.mock(IZosBatchJobOutput.class); + IZosBatchJobOutput batchJobOutputRegionB = Mockito.mock(IZosBatchJobOutput.class); + List spoolFilesRegionA = new ArrayList<>(); + IZosBatchJobOutputSpoolFile spoolYamlFileRegionA = new ZosBatchJobOutputSpoolFileImpl( + zosJobA, "JobA", "ID123", "STEPA", "PROCA", "YAML", "SECA", regionAyaml); + spoolFilesRegionA.add(spoolYamlFileRegionA); + List spoolFilesRegionB = new ArrayList<>(); + IZosBatchJobOutputSpoolFile spoolYamlFileRegionB = new ZosBatchJobOutputSpoolFileImpl( + zosJobB, "JobB", "ID234", "STEPB", "PROCB", "YAML", "SECB", regionByaml); + spoolFilesRegionB.add(spoolYamlFileRegionB); + Mockito.when(batchJobOutputRegionA.getSpoolFiles()).thenReturn(spoolFilesRegionA); + Mockito.when(batchJobOutputRegionB.getSpoolFiles()).thenReturn(spoolFilesRegionB); + Mockito.when(zosJobA.retrieveOutput()).thenReturn(batchJobOutputRegionA); + Mockito.when(zosJobB.retrieveOutput()).thenReturn(batchJobOutputRegionB); + IZosBatch zosBatchRegionA = Mockito.mock(IZosBatch.class); + Mockito.when(zosBatchRegionA.submitJob(getYamlAppendedRegionaJcl, null)) + .thenReturn(zosJobA); + IZosBatch zosBatchRegionB = Mockito.mock(IZosBatch.class); + Mockito.when(zosBatchRegionB.submitJob(getYamlAppendedRegionbJcl, null)) + .thenReturn(zosJobB); + IZosBatchSpi batchManager = Mockito.mock(IZosBatchSpi.class); + Mockito.when(batchManager.getZosBatch(regionaImage)).thenReturn(zosBatchRegionA); + Mockito.when(batchManager.getZosBatch(regionbImage)).thenReturn(zosBatchRegionB); + + Path storedArtifactRoot = Mockito.mock(Path.class); + Path finalYamlPath = Mockito.mock(Path.class); + Mockito.when(storedArtifactRoot.resolve("bundleB/TestClassB.CICSA.cics-security.yaml")) + .thenReturn(finalYamlPath); + Mockito.when(storedArtifactRoot.resolve("bundleB/TestClassB.CICSB.cics-security.yaml")) + .thenReturn(finalYamlPath); + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(null, recordingRegions, artifactManager, batchManager, + storedArtifactRoot, null, null); + + files.when(() -> Files.write(Mockito.eq(finalYamlPath), + Mockito.eq(regionAyaml.getBytes(utfString)), Mockito.any())).thenReturn(null); + + files.when(() -> Files.write(Mockito.eq(finalYamlPath), + Mockito.eq(regionByaml.getBytes(utfString)), Mockito.any())).thenReturn(null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + sdvHttpRecorder.exportRecordings("bundleB", "TestClassB"); + + // If these write calls are made, we can say all mocks were used with + // their expected attributes and all works + files.verify(() -> Files.write(finalYamlPath, regionAyaml.getBytes(utfString), + StandardOpenOption.CREATE), Mockito.times(1)); + + files.verify(() -> Files.write(finalYamlPath, regionByaml.getBytes(utfString), + StandardOpenOption.CREATE), Mockito.times(1)); + + Mockito.verify(mockLog, Mockito.times(1)) + .info("Storing YAML as test artifact for " + regionaApplid); + + Mockito.verify(mockLog, Mockito.times(1)) + .info("Storing YAML as test artifact for " + regionbApplid); + } + + @Test + void testExportRecordingsWithBadSrrIdForRecording() + throws CredentialsException, SdvManagerException, IOException, + TestBundleResourceException, ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException { + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + user1.setSrrId(null); + user1.setNotRecording(); + rrA.addUserToRecord(user1); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + String getYamlJcl = + IOUtils.toString(this.getClass().getResourceAsStream(getYamlString), utfString); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString(Mockito.eq(jclGetYamlPathString), + Mockito.any())).thenReturn(getYamlJcl); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(null, recordingRegions, artifactManager, null, null, null, null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + files.when(() -> Files.write(Mockito.any(Path.class), Mockito.any(byte[].class), + Mockito.any(OpenOption.class))).thenReturn(null); + + sdvHttpRecorder.exportRecordings("bundleC", "TestClassC"); + + files.verify(() -> Files.write(Mockito.any(Path.class), Mockito.any(byte[].class), + Mockito.any(OpenOption.class)), Mockito.times(0)); + + // Check there is a warning in the log indicating Region A won't record + Mockito.verify(mockLog).warn("No SDC registered for user " + user1String + " on region " + + regionaApplid + ", skipping YAML generation."); + + } + + @Test + void testExportRecordingsYamlJobErrorCode() + throws CredentialsException, ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException, SdvManagerException, + ZosBatchException, IOException, TestBundleResourceException { + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + user1.setSrrId(srrId1); + user1.setNotRecording(); + rrA.addUserToRecord(user1); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + String getYamlJcl = + IOUtils.toString(this.getClass().getResourceAsStream(getYamlString), utfString); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString(Mockito.eq(jclGetYamlPathString), + Mockito.any())).thenReturn(getYamlJcl); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock batchManager + IZosBatchJob zosJobA = Mockito.mock(IZosBatchJob.class); + Mockito.when(zosJobA.waitForJob()).thenReturn(12); + IZosBatchJobOutput batchJobOutputRegionA = Mockito.mock(IZosBatchJobOutput.class); + List spoolFilesRegionA = new ArrayList<>(); + Mockito.when(batchJobOutputRegionA.getSpoolFiles()).thenReturn(spoolFilesRegionA); + Mockito.when(zosJobA.retrieveOutput()).thenReturn(batchJobOutputRegionA); + IZosBatch zosBatchRegionA = Mockito.mock(IZosBatch.class); + Mockito.when(zosBatchRegionA.submitJob(Mockito.any(), Mockito.eq(null))) + .thenReturn(zosJobA); + IZosBatchSpi batchManager = Mockito.mock(IZosBatchSpi.class); + Mockito.when(batchManager.getZosBatch(regionaImage)).thenReturn(zosBatchRegionA); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(null, recordingRegions, artifactManager, batchManager, null, null, + null); + + files.when(() -> Files.write(Mockito.any(Path.class), Mockito.any(byte[].class), + Mockito.any(OpenOption.class))).thenReturn(null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.exportRecordings("bundleD", "TestClassD"); + }); + + Assertions.assertEquals( + "Security metadata job did not return any YAML for CICS Region " + + regionaApplid + + ", containing SRR IDs: " + + srrId1, + exception.getMessage() + ); + + files.verify(() -> Files.write(Mockito.any(Path.class), Mockito.any(byte[].class), + Mockito.any(OpenOption.class)), Mockito.times(0)); + + Mockito.verify(mockLog, Mockito.times(1)).error( + "JCL to get Security metadata fail on CICS Region " + + regionaApplid + + ", check artifacts for more details" + ); + } + + @Test + void testExportRecordingsArtifactFindException() throws CredentialsException, + SdvManagerException, IOException, TestBundleResourceException, ZosBatchException, + ClassNotFoundException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, NoSuchFieldException { + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + user1.setSrrId(srrId1); + user1.setNotRecording(); + rrA.addUserToRecord(user1); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString(Mockito.eq(jclGetYamlPathString), + Mockito.any())).thenThrow(new TestBundleResourceException("cant find files")); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(null, recordingRegions, artifactManager, null, null, null, null); + + files.when(() -> Files.write(Mockito.any(Path.class), Mockito.any(byte[].class), + Mockito.any(OpenOption.class))).thenReturn(null); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.exportRecordings("bundleE", "TestClassE"); + }); + + Assertions.assertEquals( + "Unable to run JCL to get Security metadata on CICS Region " + + regionaApplid, + exception.getMessage() + ); + + files.verify(() -> Files.write(Mockito.any(Path.class), Mockito.any(byte[].class), + Mockito.any(OpenOption.class)), Mockito.times(0)); + } + + @Test + void testExportRecordingsUnableToSaveYamlFile() throws CredentialsException, + SdvManagerException, IOException, TestBundleResourceException, ZosBatchException, + ClassNotFoundException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, NoSuchFieldException { + // Mock RegionA Terminal + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + // Mock RecordingRegionA + RecordingRegion rrA = new RecordingRegion(regionaTerminal); + // Mock user 1 + ICredentialsUsernamePassword user1Creds = + new CredentialsUsernamePassword(null, user1String, passwordString); + ISdvUser user1 = new SdvUserImpl(creds1String, user1Creds, regionaTag, tellerRoleString); + user1.setSrrId(srrId1); + user1.setNotRecording(); + rrA.addUserToRecord(user1); + // Mock user 2 + ICredentialsUsernamePassword user2Creds = + new CredentialsUsernamePassword(null, user2String, passwordString); + ISdvUser user2 = new SdvUserImpl(creds2String, user2Creds, regionaTag, adminRoleString); + user2.setSrrId(srrId2); + user2.setNotRecording(); + rrA.addUserToRecord(user2); + + // Mock recordingRegions + Map recordingRegions = new HashMap<>(); + recordingRegions.put(mockCicsaRegion, rrA); + + String getYamlJcl = + IOUtils.toString(this.getClass().getResourceAsStream(getYamlString), utfString); + + String getYamlAppendedRegionaJcl = IOUtils + .toString(this.getClass().getResourceAsStream("/getYamlRegionA.jcl"), utfString); + + String regionAyaml = IOUtils + .toString(this.getClass().getResourceAsStream("/yamlRegionA.yaml"), utfString); + + // Mock artifactManager + IBundleResources bundleResources = Mockito.mock(IBundleResources.class); + Mockito.when(bundleResources.retrieveSkeletonFileAsString(Mockito.eq(jclGetYamlPathString), + Mockito.any())).thenReturn(getYamlJcl); + IArtifactManager artifactManager = Mockito.mock(IArtifactManager.class); + Mockito.when(artifactManager.getBundleResources(SdvHttpRecorderImpl.class)) + .thenReturn(bundleResources); + + // Mock batchManager + IZosBatchJob zosJobA = Mockito.mock(IZosBatchJob.class); + Mockito.when(zosJobA.waitForJob()).thenReturn(0); + IZosBatchJobOutput batchJobOutputRegionA = Mockito.mock(IZosBatchJobOutput.class); + List spoolFilesRegionA = new ArrayList<>(); + IZosBatchJobOutputSpoolFile spoolYamlFileRegionA = new ZosBatchJobOutputSpoolFileImpl( + zosJobA, "JobA", "ID123", "STEPA", "PROCA", "YAML", "SECA", regionAyaml); + spoolFilesRegionA.add(spoolYamlFileRegionA); + Mockito.when(batchJobOutputRegionA.getSpoolFiles()).thenReturn(spoolFilesRegionA); + Mockito.when(zosJobA.retrieveOutput()).thenReturn(batchJobOutputRegionA); + IZosBatch zosBatchRegionA = Mockito.mock(IZosBatch.class); + Mockito.when(zosBatchRegionA.submitJob(getYamlAppendedRegionaJcl, null)) + .thenReturn(zosJobA); + IZosBatchSpi batchManager = Mockito.mock(IZosBatchSpi.class); + Mockito.when(batchManager.getZosBatch(regionaImage)).thenReturn(zosBatchRegionA); + + Path storedArtifactRoot = Mockito.mock(Path.class); + Path finalYamlPath = Paths.get("/c/dir/" + "bundleF/TestClassF.CICSA.cics-security.yaml"); + Mockito.when(storedArtifactRoot.resolve("bundleF/TestClassF.CICSA.cics-security.yaml")) + .thenReturn(finalYamlPath); + Mockito.when(storedArtifactRoot.resolve("bundleF/TestClassF.CICSB.cics-security.yaml")) + .thenReturn(finalYamlPath); + // Mock SdvRecorderImpl + Class sdvHttpRecorderImplClass = Class.forName(sdvHttpRecorderImplClassString); + SdvHttpRecorderImpl sdvHttpRecorder = (SdvHttpRecorderImpl) sdvHttpRecorderImplClass + .getDeclaredConstructor(IFramework.class, Map.class, IArtifactManager.class, + IZosBatchSpi.class, Path.class, IDynamicStatusStoreService.class, + IHttpManagerSpi.class) + .newInstance(null, recordingRegions, artifactManager, batchManager, + storedArtifactRoot, null, null); + + files.when(() -> Files.write(Mockito.eq(finalYamlPath), + Mockito.eq(regionAyaml.getBytes(utfString)), Mockito.any())) + .thenThrow(new IOException("path not there")); + + // Replace LOG + Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + loggerField.setAccessible(true); + Field loggerSuperField = + sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); + loggerSuperField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvHttpRecorder, mockLog); + loggerSuperField.set(sdvHttpRecorder, mockLog); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvHttpRecorder.exportRecordings("bundleF", "TestClassF"); + }); + + Assertions.assertEquals( + "Unable to add YAML to Galasa run for CICS Region APPL1. " + + "Attempting to save to path: /c/dir/bundleF/TestClassF.CICSA.cics-security.yaml", + exception.getMessage() + ); + + } + +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvManagerImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvManagerImpl.java new file mode 100644 index 000000000..2e2f11bf8 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvManagerImpl.java @@ -0,0 +1,1928 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal; + +import dev.galasa.ICredentialsUsernamePassword; +import dev.galasa.ManagerException; +import dev.galasa.ProductVersion; +import dev.galasa.artifact.internal.ArtifactManagerImpl; +import dev.galasa.cicsts.CicstsManagerException; +import dev.galasa.cicsts.ICicsRegion; +import dev.galasa.cicsts.ICicsTerminal; +import dev.galasa.cicsts.internal.CicstsManagerImpl; +import dev.galasa.cicsts.spi.ICicsRegionProvisioned; +import dev.galasa.cicsts.spi.ICicstsManagerSpi; +import dev.galasa.framework.spi.DynamicStatusStoreException; +import dev.galasa.framework.spi.IConfidentialTextService; +import dev.galasa.framework.spi.IDynamicStatusStoreService; +import dev.galasa.framework.spi.IFramework; +import dev.galasa.framework.spi.IManager; +import dev.galasa.framework.spi.IRun; +import dev.galasa.framework.spi.ResourceUnavailableException; +import dev.galasa.framework.spi.Result; +import dev.galasa.framework.spi.creds.CredentialsException; +import dev.galasa.framework.spi.creds.CredentialsUsernamePassword; +import dev.galasa.framework.spi.creds.ICredentialsService; +import dev.galasa.http.internal.HttpManagerImpl; +import dev.galasa.sdv.ISdvUser; +import dev.galasa.sdv.SdvManagerException; +import dev.galasa.sdv.SdvUser; +import dev.galasa.sdv.internal.properties.SdvHlq; +import dev.galasa.sdv.internal.properties.SdvPort; +import dev.galasa.sdv.internal.properties.SdvRole; +import dev.galasa.zos.internal.ZosManagerImpl; +import dev.galasa.zosbatch.IZosBatchJob; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.apache.commons.logging.Log; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.MockedStatic; +import org.mockito.Mockito; + + +class TestSdvManagerImpl { + + private MockedStatic sdvRole; + private MockedStatic sdvPort; + private MockedStatic sdvHlq; + private MockedStatic sdvUserPoolStatic; + + + @SuppressWarnings("PMD") + private static final Log mockLog = Mockito.mock(Log.class); + + private String testCicsTagA = "CICSA"; + private String testCicsTagB = "CICSB"; + private String testCicsTagC = "CICSC"; + private String roleNameTeller = "TELLER"; + private String roleNameAdmin = "ADMIN"; + private String roleNameOperator = "OPERATOR"; + private String testPort = "32000"; + private String sdvManagerImplClassString = "dev.galasa.sdv.internal.SdvManagerImpl"; + private String privateCicsManagerVariableName = "cicsManager"; + private String creds1Tag = "CREDS1"; + private String creds2Tag = "CREDS2"; + private String creds3Tag = "CREDS3"; + private String creds4Tag = "CREDS4"; + private String user1String = "user1"; + private String user2String = "user2"; + private String user3String = "user3"; + private String user4String = "user4"; + private String password1 = "password1"; + private String password2 = "password2"; + private String password3 = "password3"; + private String password4 = "password4"; + private String secOnMsg = "blah\n\nDFHXS1100I: Security initialization has started.\nblah"; + private String testClassString = "testClass"; + private String sdvUsersToRecordListString = "sdvUsersToRecordList"; + private String recordingRegionsString = "recordingRegions"; + private static final String uncheckedString = "unchecked"; + private String frameworkString = "framework"; + private String sdvRecorderVarName = "sdvRecorder"; + private String logString = "LOG"; + private String modifiersString = "modifiers"; + private String regionaApplid = "APPL1"; + private String runName = "RUN123"; + private String regionbApplid = "APPL2"; + + @BeforeAll + public static void beforeClass() { + Mockito.when(mockLog.isInfoEnabled()).thenReturn(true); + Mockito.when(mockLog.isWarnEnabled()).thenReturn(true); + Mockito.when(mockLog.isErrorEnabled()).thenReturn(true); + } + + @BeforeEach + public void setUp() { + // Registering static mocks before each test + sdvRole = Mockito.mockStatic(SdvRole.class); + sdvPort = Mockito.mockStatic(SdvPort.class); + sdvHlq = Mockito.mockStatic(SdvHlq.class); + sdvUserPoolStatic = Mockito.mockStatic(SdvUserPool.class); + } + + @AfterEach + public void tearDown() { + // Closing static mocks after each test + sdvRole.close(); + sdvPort.close(); + sdvHlq.close(); + sdvUserPoolStatic.close(); + } + + @Test + void testGetSdvUser() throws CredentialsException, SdvManagerException, ClassNotFoundException, + NoSuchFieldException, SecurityException, IllegalArgumentException, + IllegalAccessException, InstantiationException, InvocationTargetException, + NoSuchMethodException, ResourceUnavailableException { + // Create variables for common values used throughout test + String roleTag = "R1"; + String username = user1String; + + // Mocks for statics + sdvPort.when(() -> SdvPort.get(testCicsTagA)).thenReturn(testPort); + sdvHlq.when(() -> SdvHlq.get(testCicsTagA)).thenReturn("CICS.INSTALL"); + sdvRole.when(() -> SdvRole.get(roleTag)).thenReturn(roleNameTeller); + + // Mock ISdvUser annotation + Field testField = Mockito.mock(Field.class); + SdvUser sdvUser = Mockito.mock(SdvUser.class); + Mockito.when(sdvUser.cicsTag()).thenReturn(testCicsTagA); + Mockito.when(sdvUser.roleTag()).thenReturn(roleTag); + Mockito.when(testField.getAnnotation(SdvUser.class)).thenReturn(sdvUser); + + // Mock check for CICS region + ICicstsManagerSpi cicsManager = Mockito.mock(ICicstsManagerSpi.class); + Map mockCicsRegionList = new HashMap<>(); + + ICicsRegionProvisioned mockCicsaRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsaRegion.getTag()).thenReturn(testCicsTagA); + + mockCicsRegionList.put(testCicsTagA, mockCicsaRegion); + Mockito.when(cicsManager.getTaggedCicsRegions()).thenReturn(mockCicsRegionList); + + // Replace private cicsManager instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + Field cicsManagerField = + sdvManagerImplClass.getDeclaredField(privateCicsManagerVariableName); + cicsManagerField.setAccessible(true); + cicsManagerField.set(sdvManager, cicsManager); + + // Mock sdvUserPool + SdvUserPool sdvUserPool = Mockito.mock(SdvUserPool.class); + Mockito.when(sdvUserPool.allocateUser(roleNameTeller, mockCicsaRegion)) + .thenReturn(creds1Tag); + Field sdvUserPoolField = sdvManagerImplClass.getDeclaredField("sdvUserPool"); + sdvUserPoolField.setAccessible(true); + sdvUserPoolField.set(sdvManager, sdvUserPool); + + // Mock getFramework().getCredentialsService() + ICredentialsUsernamePassword testCreds = + new CredentialsUsernamePassword(null, username, password1); + ICredentialsService credService = Mockito.mock(ICredentialsService.class); + Mockito.when(credService.getCredentials(creds1Tag)).thenReturn(testCreds); + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getCredentialsService()).thenReturn(credService); + Field frameworkField = + sdvManagerImplClass.getSuperclass().getDeclaredField(frameworkString); + frameworkField.setAccessible(true); + frameworkField.set(sdvManager, framework); + + // Mock cts + IConfidentialTextService cts = Mockito.mock(IConfidentialTextService.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(cts).registerText(password1, "Password for credential tag: " + creds1Tag); + Field ctsField = sdvManagerImplClass.getDeclaredField("cts"); + ctsField.setAccessible(true); + ctsField.set(sdvManager, cts); + + // Make call to funtion under test + ISdvUser resultUser = sdvManager.getSdvUser(testField, null); + + Assertions.assertEquals(creds1Tag, resultUser.getCredentialsTag()); + Assertions.assertEquals(testCicsTagA, resultUser.getCicsTag()); + Assertions.assertEquals(password1, resultUser.getPassword()); + Assertions.assertEquals(roleNameTeller, resultUser.getRole()); + Assertions.assertEquals(username, resultUser.getUsername()); + Assertions.assertEquals(false, resultUser.isRecording()); + } + + @Test + void testGetSdvUserBlankRoleTag() throws ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException { + // Create variables for common values used throughout test + String roleTag = ""; + + // Mock ISdvUser annotation + Field testField = Mockito.mock(Field.class); + SdvUser sdvUser = Mockito.mock(SdvUser.class); + Mockito.when(sdvUser.cicsTag()).thenReturn(testCicsTagA); + Mockito.when(sdvUser.roleTag()).thenReturn(roleTag); + Mockito.when(testField.getAnnotation(SdvUser.class)).thenReturn(sdvUser); + Mockito.when(testField.getName()).thenReturn("testUser"); + + // Get an SdvManager instance + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvManager.getSdvUser(testField, null); + }); + + Assertions.assertEquals("SdvUser testUser cannot have a blank RoleTag.", + exception.getMessage()); + } + + @Test + void testGetSdvUserNoMatchingRole() throws ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException { + // Create variables for common values used throughout test + String roleTag = "R1"; + + // Mocks for statics + sdvRole.when(() -> SdvRole.get(roleTag)).thenReturn(null); + + // Mock ISdvUser annotation + Field testField = Mockito.mock(Field.class); + SdvUser sdvUser = Mockito.mock(SdvUser.class); + Mockito.when(sdvUser.cicsTag()).thenReturn(testCicsTagA); + Mockito.when(sdvUser.roleTag()).thenReturn(roleTag); + Mockito.when(testField.getAnnotation(SdvUser.class)).thenReturn(sdvUser); + + // Get an SdvManager instance + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvManager.getSdvUser(testField, null); + }); + + Assertions + .assertEquals("Cannot find role. Please create or update CPS Property 'sdv.roleTag." + + roleTag + ".role'.", exception.getMessage()); + } + + @Test + void testGetSdvUserNoMatchingCicsRegion() throws ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException { + // Create variables for common values used throughout test + String roleTag = "R1"; + + // Mocks for statics + sdvRole.when(() -> SdvRole.get(roleTag)).thenReturn(roleNameTeller); + + // Mock ISdvUser annotation + Field testField = Mockito.mock(Field.class); + SdvUser sdvUser = Mockito.mock(SdvUser.class); + Mockito.when(sdvUser.cicsTag()).thenReturn(testCicsTagA); + Mockito.when(sdvUser.roleTag()).thenReturn(roleTag); + Mockito.when(testField.getAnnotation(SdvUser.class)).thenReturn(sdvUser); + Mockito.when(testField.getName()).thenReturn("testUser"); + + // Mock check for CICS region + ICicstsManagerSpi cicsManager = Mockito.mock(ICicstsManagerSpi.class); + Map mockCicsRegionList = new HashMap<>(); + Mockito.when(cicsManager.getTaggedCicsRegions()).thenReturn(mockCicsRegionList); + + // Replace private cicsManager instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + Field cicsManagerField = + sdvManagerImplClass.getDeclaredField(privateCicsManagerVariableName); + cicsManagerField.setAccessible(true); + cicsManagerField.set(sdvManager, cicsManager); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvManager.getSdvUser(testField, null); + }); + + Assertions.assertEquals("Unable to setup SDV User 'testUser', for region with tag '" + + testCicsTagA + "' as a region with a matching 'cicsTag' tag was not found," + + " or the region was not provisioned.", exception.getMessage()); + } + + @Test + void testGetSdvUserNoPort() throws ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException { + // Create variables for common values used throughout test + String roleTag = "R1"; + + // Mocks for statics + sdvPort.when(() -> SdvPort.get(testCicsTagA)).thenReturn(null); + sdvRole.when(() -> SdvRole.get(roleTag)).thenReturn(roleNameTeller); + + // Mock ISdvUser annotation + Field testField = Mockito.mock(Field.class); + SdvUser sdvUser = Mockito.mock(SdvUser.class); + Mockito.when(sdvUser.cicsTag()).thenReturn(testCicsTagA); + Mockito.when(sdvUser.roleTag()).thenReturn(roleTag); + Mockito.when(testField.getAnnotation(SdvUser.class)).thenReturn(sdvUser); + Mockito.when(testField.getName()).thenReturn("testUser"); + + // Mock check for CICS region + ICicstsManagerSpi cicsManager = Mockito.mock(ICicstsManagerSpi.class); + Map mockCicsRegionList = new HashMap<>(); + + ICicsRegionProvisioned mockCicsaRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsaRegion.getTag()).thenReturn(testCicsTagA); + + mockCicsRegionList.put(testCicsTagA, mockCicsaRegion); + Mockito.when(cicsManager.getTaggedCicsRegions()).thenReturn(mockCicsRegionList); + + // Replace private cicsManager instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + Field cicsManagerField = + sdvManagerImplClass.getDeclaredField(privateCicsManagerVariableName); + cicsManagerField.setAccessible(true); + cicsManagerField.set(sdvManager, cicsManager); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvManager.getSdvUser(testField, null); + }); + + Assertions.assertEquals( + "Could not find port. Please create or update CPS property 'sdv.cicsTag." + + testCicsTagA + ".port'.", + exception.getMessage()); + } + + @Test + void testGetSdvUserNoHlq() + throws ClassNotFoundException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, NoSuchFieldException, ResourceUnavailableException { + // Create variables for common values used throughout test + String roleTag = "R1"; + + // Mocks for statics + sdvPort.when(() -> SdvPort.get(testCicsTagA)).thenReturn(testPort); + sdvHlq.when(() -> SdvHlq.get(testCicsTagA)).thenReturn(null); + sdvRole.when(() -> SdvRole.get(roleTag)).thenReturn(roleNameTeller); + + // Mock ISdvUser annotation + Field testField = Mockito.mock(Field.class); + SdvUser sdvUser = Mockito.mock(SdvUser.class); + Mockito.when(sdvUser.cicsTag()).thenReturn(testCicsTagA); + Mockito.when(sdvUser.roleTag()).thenReturn(roleTag); + Mockito.when(testField.getAnnotation(SdvUser.class)).thenReturn(sdvUser); + + // Mock check for CICS region + ICicstsManagerSpi cicsManager = Mockito.mock(ICicstsManagerSpi.class); + Map mockCicsRegionList = new HashMap<>(); + + ICicsRegionProvisioned mockCicsaRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsaRegion.getTag()).thenReturn(testCicsTagA); + + mockCicsRegionList.put(testCicsTagA, mockCicsaRegion); + Mockito.when(cicsManager.getTaggedCicsRegions()).thenReturn(mockCicsRegionList); + + // Replace private cicsManager instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + Field cicsManagerField = + sdvManagerImplClass.getDeclaredField(privateCicsManagerVariableName); + cicsManagerField.setAccessible(true); + cicsManagerField.set(sdvManager, cicsManager); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvManager.getSdvUser(testField, null); + }); + + Assertions.assertEquals( + "Could not find HLQ. Please create or update CPS property 'sdv.cicsTag." + + testCicsTagA + ".hlq'.", + exception.getMessage()); + } + + @Test + void testGetSdvUserUserAllocationException() throws ClassNotFoundException, + InstantiationException, IllegalAccessException, IllegalArgumentException, + InvocationTargetException, NoSuchMethodException, SecurityException, + NoSuchFieldException, SdvManagerException, ResourceUnavailableException { + // Create variables for common values used throughout test + String roleTag = "R1"; + + // Mocks for statics + sdvPort.when(() -> SdvPort.get(testCicsTagA)).thenReturn(testPort); + sdvHlq.when(() -> SdvHlq.get(testCicsTagA)).thenReturn("CICS.INSTALL"); + sdvRole.when(() -> SdvRole.get(roleTag)).thenReturn(roleNameTeller); + + // Mock ISdvUser annotation + Field testField = Mockito.mock(Field.class); + SdvUser sdvUser = Mockito.mock(SdvUser.class); + Mockito.when(sdvUser.cicsTag()).thenReturn(testCicsTagA); + Mockito.when(sdvUser.roleTag()).thenReturn(roleTag); + Mockito.when(testField.getAnnotation(SdvUser.class)).thenReturn(sdvUser); + + // Mock check for CICS region + ICicstsManagerSpi cicsManager = Mockito.mock(ICicstsManagerSpi.class); + Map mockCicsRegionList = new HashMap<>(); + + ICicsRegionProvisioned mockCicsaRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsaRegion.getTag()).thenReturn(testCicsTagA); + + mockCicsRegionList.put(testCicsTagA, mockCicsaRegion); + Mockito.when(cicsManager.getTaggedCicsRegions()).thenReturn(mockCicsRegionList); + + // Replace private cicsManager instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + Field cicsManagerField = + sdvManagerImplClass.getDeclaredField(privateCicsManagerVariableName); + cicsManagerField.setAccessible(true); + cicsManagerField.set(sdvManager, cicsManager); + + // Mock sdvUserPool + SdvUserPool sdvUserPool = Mockito.mock(SdvUserPool.class); + Mockito.when(sdvUserPool.allocateUser(roleNameTeller, mockCicsaRegion)) + .thenThrow(new ResourceUnavailableException("No users available")); + Field sdvUserPoolField = sdvManagerImplClass.getDeclaredField("sdvUserPool"); + sdvUserPoolField.setAccessible(true); + sdvUserPoolField.set(sdvManager, sdvUserPool); + + // Make call to funtion under test + ResourceUnavailableException exception = + Assertions.assertThrows(ResourceUnavailableException.class, () -> { + sdvManager.getSdvUser(testField, null); + }); + + Assertions.assertEquals("No users available", exception.getMessage()); + } + + @Test + void testGetSdvUserCredentialsNotFound() throws InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, NoSuchFieldException, SdvManagerException, + ResourceUnavailableException, CredentialsException, ClassNotFoundException { + // Create variables for common values used throughout test + String roleTag = "R1"; + + // Mocks for statics + sdvPort.when(() -> SdvPort.get(testCicsTagA)).thenReturn(testPort); + sdvHlq.when(() -> SdvHlq.get(testCicsTagA)).thenReturn("CICS.INSTALL"); + sdvRole.when(() -> SdvRole.get(roleTag)).thenReturn(roleNameTeller); + + // Mock ISdvUser annotation + Field testField = Mockito.mock(Field.class); + SdvUser sdvUser = Mockito.mock(SdvUser.class); + Mockito.when(sdvUser.cicsTag()).thenReturn(testCicsTagA); + Mockito.when(sdvUser.roleTag()).thenReturn(roleTag); + Mockito.when(testField.getAnnotation(SdvUser.class)).thenReturn(sdvUser); + + // Mock check for CICS region + ICicstsManagerSpi cicsManager = Mockito.mock(ICicstsManagerSpi.class); + Map mockCicsRegionList = new HashMap<>(); + + ICicsRegionProvisioned mockCicsaRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsaRegion.getTag()).thenReturn(testCicsTagA); + + mockCicsRegionList.put(testCicsTagA, mockCicsaRegion); + Mockito.when(cicsManager.getTaggedCicsRegions()).thenReturn(mockCicsRegionList); + + // Replace private cicsManager instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + Field cicsManagerField = + sdvManagerImplClass.getDeclaredField(privateCicsManagerVariableName); + cicsManagerField.setAccessible(true); + cicsManagerField.set(sdvManager, cicsManager); + + // Mock sdvUserPool + SdvUserPool sdvUserPool = Mockito.mock(SdvUserPool.class); + Mockito.when(sdvUserPool.allocateUser(roleNameTeller, mockCicsaRegion)) + .thenReturn(creds1Tag); + Field sdvUserPoolField = sdvManagerImplClass.getDeclaredField("sdvUserPool"); + sdvUserPoolField.setAccessible(true); + sdvUserPoolField.set(sdvManager, sdvUserPool); + + // Mock getFramework().getCredentialsService() + ICredentialsService credService = Mockito.mock(ICredentialsService.class); + Mockito.when(credService.getCredentials(creds1Tag)) + .thenThrow(new CredentialsException("Did not find user")); + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getCredentialsService()).thenReturn(credService); + Field frameworkField = + sdvManagerImplClass.getSuperclass().getDeclaredField(frameworkString); + frameworkField.setAccessible(true); + frameworkField.set(sdvManager, framework); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvManager.getSdvUser(testField, null); + }); + + Assertions.assertEquals("No credentials were found with the tag: " + creds1Tag, + exception.getMessage()); + } + + @Test + void testProvisionGenerate() throws ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException, + ResourceUnavailableException, ManagerException, CredentialsException { + + ICicstsManagerSpi cicsManager = Mockito.mock(ICicstsManagerSpi.class); + Map mockCicsRegionList = new HashMap<>(); + + // Mock for CICS region A + ICicsRegionProvisioned mockCicsaRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsaRegion.getTag()).thenReturn(testCicsTagA); + // Mock region Product version + ProductVersion mockProductVersion = Mockito.mock(ProductVersion.class); + Mockito.when(mockProductVersion.isEarlierThan(ProductVersion.v(750))).thenReturn(false); + Mockito.when(mockCicsaRegion.getVersion()).thenReturn(mockProductVersion); + // Mock region SEC=YES log message + IZosBatchJob mockIzOsBatchJob = Mockito.mock(IZosBatchJob.class); + Mockito.when(mockIzOsBatchJob.retrieveOutputAsString()).thenReturn(secOnMsg); + Mockito.when(mockCicsaRegion.getRegionJob()).thenReturn(mockIzOsBatchJob); + mockCicsRegionList.put(testCicsTagA, mockCicsaRegion); + + // Mock for CICS region B + ICicsRegionProvisioned mockCicsbRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsbRegion.getTag()).thenReturn(testCicsTagA); + // Mock region Product version + Mockito.when(mockCicsbRegion.getVersion()).thenReturn(mockProductVersion); + // Mock region SEC=YES log message + Mockito.when(mockCicsbRegion.getRegionJob()).thenReturn(mockIzOsBatchJob); + mockCicsRegionList.put(testCicsTagB, mockCicsbRegion); + + // Mock for CICS region C + ICicsRegionProvisioned mockCicscRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicscRegion.getTag()).thenReturn(testCicsTagA); + // Mock region Product version + Mockito.when(mockCicscRegion.getVersion()).thenReturn(mockProductVersion); + // Mock region SEC=YES log message + Mockito.when(mockCicscRegion.getRegionJob()).thenReturn(mockIzOsBatchJob); + mockCicsRegionList.put(testCicsTagC, mockCicscRegion); + + Mockito.when(cicsManager.getTaggedCicsRegions()).thenReturn(mockCicsRegionList); + + // Mock Terminals + ICicsTerminal regionaTerminal = Mockito.mock(ICicsTerminal.class); + Mockito.when(cicsManager.generateCicsTerminal(testCicsTagA)).thenReturn(regionaTerminal); + ICicsTerminal regionbTerminal = Mockito.mock(ICicsTerminal.class); + Mockito.when(cicsManager.generateCicsTerminal(testCicsTagB)).thenReturn(regionbTerminal); + ICicsTerminal regioncTerminal = Mockito.mock(ICicsTerminal.class); + Mockito.when(cicsManager.generateCicsTerminal(testCicsTagC)).thenReturn(regioncTerminal); + + // Replace private cicsManager instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + Field cicsManagerField = + sdvManagerImplClass.getDeclaredField(privateCicsManagerVariableName); + cicsManagerField.setAccessible(true); + cicsManagerField.set(sdvManager, cicsManager); + // Replace testClass to bypass generateAnnotatedFields + Field testClass = sdvManagerImplClass.getSuperclass().getDeclaredField(testClassString); + testClass.setAccessible(true); + testClass.set(sdvManager, null); + // Replace sdvUsersToRecordList with a mocked list + List listOfUsersForAllRegions = new ArrayList<>(); + // user1 + ICredentialsUsernamePassword testCreds1 = + new CredentialsUsernamePassword(null, user1String, password1); + SdvUserImpl newSdvUser1 = + new SdvUserImpl(creds1Tag, testCreds1, testCicsTagA, roleNameTeller); + listOfUsersForAllRegions.add(newSdvUser1); + // user2 + ICredentialsUsernamePassword testCreds2 = + new CredentialsUsernamePassword(null, user2String, password2); + SdvUserImpl newSdvUser2 = + new SdvUserImpl(creds2Tag, testCreds2, testCicsTagB, roleNameTeller); + listOfUsersForAllRegions.add(newSdvUser2); + // user3 + ICredentialsUsernamePassword testCreds3 = + new CredentialsUsernamePassword(null, user3String, password3); + SdvUserImpl newSdvUser3 = + new SdvUserImpl(creds3Tag, testCreds3, testCicsTagA, roleNameAdmin); + listOfUsersForAllRegions.add(newSdvUser3); + // user4 + ICredentialsUsernamePassword testCreds4 = + new CredentialsUsernamePassword(null, user4String, password4); + SdvUserImpl newSdvUser4 = + new SdvUserImpl(creds4Tag, testCreds4, testCicsTagC, roleNameOperator); + listOfUsersForAllRegions.add(newSdvUser4); + + Field sdvUsersToRecordList = + sdvManagerImplClass.getDeclaredField(sdvUsersToRecordListString); + sdvUsersToRecordList.setAccessible(true); + sdvUsersToRecordList.set(sdvManager, listOfUsersForAllRegions); + + // Make call to funtion under test + sdvManager.provisionGenerate(); + + Field recordingRegionsField = sdvManagerImplClass.getDeclaredField(recordingRegionsString); + recordingRegionsField.setAccessible(true); + + @SuppressWarnings(uncheckedString) + Map recordingRegions = + (Map) recordingRegionsField.get(sdvManager); + + // Check correct number of users against each region + Assertions.assertEquals(2, + recordingRegions.get(mockCicsaRegion).getRecordingUsers().size()); + Assertions.assertEquals(1, + recordingRegions.get(mockCicsbRegion).getRecordingUsers().size()); + Assertions.assertEquals(1, + recordingRegions.get(mockCicscRegion).getRecordingUsers().size()); + + // Check correct users against each region + List regionaUsers = new ArrayList<>(); + regionaUsers.add(user1String); + regionaUsers.add(user3String); + for (ISdvUser user : recordingRegions.get(mockCicsaRegion).getRecordingUsers()) { + Assertions.assertTrue(regionaUsers.contains(user.getUsername())); + } + + List regionbUsers = new ArrayList<>(); + regionbUsers.add(user2String); + for (ISdvUser user : recordingRegions.get(mockCicsbRegion).getRecordingUsers()) { + Assertions.assertTrue(regionbUsers.contains(user.getUsername())); + } + + List regioncUsers = new ArrayList<>(); + regioncUsers.add(user4String); + for (ISdvUser user : recordingRegions.get(mockCicscRegion).getRecordingUsers()) { + Assertions.assertTrue(regioncUsers.contains(user.getUsername())); + } + + // Check each region has correct terminal + Assertions.assertEquals(regionaTerminal, + recordingRegions.get(mockCicsaRegion).getMaintenanceTerminal()); + Assertions.assertEquals(regionbTerminal, + recordingRegions.get(mockCicsbRegion).getMaintenanceTerminal()); + Assertions.assertEquals(regioncTerminal, + recordingRegions.get(mockCicscRegion).getMaintenanceTerminal()); + } + + @Test + void testProvisionGenerateOldCicsVersionForRegionA() + throws ClassNotFoundException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, NoSuchFieldException, CredentialsException, + ResourceUnavailableException, ManagerException { + ICicstsManagerSpi cicsManager = Mockito.mock(ICicstsManagerSpi.class); + Map mockCicsRegionList = new HashMap<>(); + + // Mock for CICS region A + ICicsRegionProvisioned mockCicsaRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsaRegion.getTag()).thenReturn(testCicsTagA); + Mockito.when(mockCicsaRegion.getApplid()).thenReturn("OLDREGION"); + // Mock region Product version + ProductVersion mockProductVersion = Mockito.mock(ProductVersion.class); + Mockito.when(mockProductVersion.isEarlierThan(ProductVersion.v(750))).thenReturn(true, + false, false); + Mockito.when(mockCicsaRegion.getVersion()).thenReturn(mockProductVersion); + // Mock region SEC=YES log message + IZosBatchJob mockIzOsBatchJob = Mockito.mock(IZosBatchJob.class); + Mockito.when(mockIzOsBatchJob.retrieveOutputAsString()).thenReturn(secOnMsg); + Mockito.when(mockCicsaRegion.getRegionJob()).thenReturn(mockIzOsBatchJob); + mockCicsRegionList.put(testCicsTagA, mockCicsaRegion); + + // Mock for CICS region B + ICicsRegionProvisioned mockCicsbRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsbRegion.getTag()).thenReturn(testCicsTagA); + // Mock region Product version + Mockito.when(mockCicsbRegion.getVersion()).thenReturn(mockProductVersion); + // Mock region SEC=YES log message + Mockito.when(mockCicsbRegion.getRegionJob()).thenReturn(mockIzOsBatchJob); + mockCicsRegionList.put(testCicsTagB, mockCicsbRegion); + + // Mock for CICS region C + ICicsRegionProvisioned mockCicscRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicscRegion.getTag()).thenReturn(testCicsTagA); + // Mock region Product version + Mockito.when(mockCicscRegion.getVersion()).thenReturn(mockProductVersion); + // Mock region SEC=YES log message + Mockito.when(mockCicscRegion.getRegionJob()).thenReturn(mockIzOsBatchJob); + mockCicsRegionList.put(testCicsTagC, mockCicscRegion); + + Mockito.when(cicsManager.getTaggedCicsRegions()).thenReturn(mockCicsRegionList); + + // Mock Terminals + ICicsTerminal regionbTerminal = Mockito.mock(ICicsTerminal.class); + Mockito.when(cicsManager.generateCicsTerminal(testCicsTagB)).thenReturn(regionbTerminal); + ICicsTerminal regioncTerminal = Mockito.mock(ICicsTerminal.class); + Mockito.when(cicsManager.generateCicsTerminal(testCicsTagC)).thenReturn(regioncTerminal); + + // Replace private cicsManager instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + Field cicsManagerField = + sdvManagerImplClass.getDeclaredField(privateCicsManagerVariableName); + cicsManagerField.setAccessible(true); + cicsManagerField.set(sdvManager, cicsManager); + // Replace testClass to bypass generateAnnotatedFields + Field testClass = sdvManagerImplClass.getSuperclass().getDeclaredField(testClassString); + testClass.setAccessible(true); + testClass.set(sdvManager, null); + // Replace sdvUsersToRecordList with a mocked list + List listOfUsersForAllRegions = new ArrayList<>(); + // user1 + ICredentialsUsernamePassword testCreds1 = + new CredentialsUsernamePassword(null, user1String, password1); + SdvUserImpl newSdvUser1 = + new SdvUserImpl(creds1Tag, testCreds1, testCicsTagA, roleNameTeller); + listOfUsersForAllRegions.add(newSdvUser1); + // user2 + ICredentialsUsernamePassword testCreds2 = + new CredentialsUsernamePassword(null, user2String, password2); + SdvUserImpl newSdvUser2 = + new SdvUserImpl(creds2Tag, testCreds2, testCicsTagB, roleNameTeller); + listOfUsersForAllRegions.add(newSdvUser2); + // user3 + ICredentialsUsernamePassword testCreds3 = + new CredentialsUsernamePassword(null, user3String, password3); + SdvUserImpl newSdvUser3 = + new SdvUserImpl(creds3Tag, testCreds3, testCicsTagA, roleNameAdmin); + listOfUsersForAllRegions.add(newSdvUser3); + // user4 + ICredentialsUsernamePassword testCreds4 = + new CredentialsUsernamePassword(null, user4String, password4); + SdvUserImpl newSdvUser4 = + new SdvUserImpl(creds4Tag, testCreds4, testCicsTagC, roleNameOperator); + listOfUsersForAllRegions.add(newSdvUser4); + + Field sdvUsersToRecordList = + sdvManagerImplClass.getDeclaredField(sdvUsersToRecordListString); + sdvUsersToRecordList.setAccessible(true); + sdvUsersToRecordList.set(sdvManager, listOfUsersForAllRegions); + + // Replace LOG + Field loggerField = sdvManagerImplClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvManager, mockLog); + + // Make call to funtion under test + sdvManager.provisionGenerate(); + + Field recordingRegionsField = sdvManagerImplClass.getDeclaredField(recordingRegionsString); + recordingRegionsField.setAccessible(true); + + @SuppressWarnings(uncheckedString) + Map recordingRegions = + (Map) recordingRegionsField.get(sdvManager); + + // Check correct number of users against each region + Assertions.assertEquals(null, recordingRegions.get(mockCicsaRegion)); + Assertions.assertEquals(1, + recordingRegions.get(mockCicsbRegion).getRecordingUsers().size()); + Assertions.assertEquals(1, + recordingRegions.get(mockCicscRegion).getRecordingUsers().size()); + + // Check correct users against each region + List regionbUsers = new ArrayList<>(); + regionbUsers.add(user2String); + for (ISdvUser user : recordingRegions.get(mockCicsbRegion).getRecordingUsers()) { + Assertions.assertTrue(regionbUsers.contains(user.getUsername())); + } + + List regioncUsers = new ArrayList<>(); + regioncUsers.add(user4String); + for (ISdvUser user : recordingRegions.get(mockCicscRegion).getRecordingUsers()) { + Assertions.assertTrue(regioncUsers.contains(user.getUsername())); + } + + // Check each region has correct terminal + Assertions.assertEquals(regionbTerminal, + recordingRegions.get(mockCicsbRegion).getMaintenanceTerminal()); + Assertions.assertEquals(regioncTerminal, + recordingRegions.get(mockCicscRegion).getMaintenanceTerminal()); + + // Check there is a warning in the log indicating Region A won't record + Mockito.verify(mockLog, Mockito.times(1)) + .warn("SDV recording will not take place on CICS region 'OLDREGION'" + + ". Running version earlier than 750."); + + } + + @Test + void testProvisionGenerateNoSecMsg() throws ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException, CredentialsException, + ResourceUnavailableException, ManagerException { + ICicstsManagerSpi cicsManager = Mockito.mock(ICicstsManagerSpi.class); + Map mockCicsRegionList = new HashMap<>(); + + // Mock for CICS region A + ICicsRegionProvisioned mockCicsaRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsaRegion.getTag()).thenReturn(testCicsTagA); + Mockito.when(mockCicsaRegion.getApplid()).thenReturn("NOSEC"); + // Mock region Product version + ProductVersion mockProductVersion = Mockito.mock(ProductVersion.class); + Mockito.when(mockProductVersion.isEarlierThan(ProductVersion.v(750))).thenReturn(false, + false, false); + Mockito.when(mockCicsaRegion.getVersion()).thenReturn(mockProductVersion); + // Mock region SEC=YES log message + IZosBatchJob mockIzOsBatchJobNoSec = Mockito.mock(IZosBatchJob.class); + Mockito.when(mockIzOsBatchJobNoSec.retrieveOutputAsString()) + .thenReturn("blah\n\nDFHXS1102I: Security is inactive.\nblah"); + Mockito.when(mockCicsaRegion.getRegionJob()).thenReturn(mockIzOsBatchJobNoSec); + mockCicsRegionList.put(testCicsTagA, mockCicsaRegion); + + // Mock for CICS region B + ICicsRegionProvisioned mockCicsbRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsbRegion.getTag()).thenReturn(testCicsTagA); + // Mock region Product version + Mockito.when(mockCicsbRegion.getVersion()).thenReturn(mockProductVersion); + // Mock region SEC=YES log message + IZosBatchJob mockIzOsBatchJob = Mockito.mock(IZosBatchJob.class); + Mockito.when(mockIzOsBatchJob.retrieveOutputAsString()).thenReturn(secOnMsg); + Mockito.when(mockCicsbRegion.getRegionJob()).thenReturn(mockIzOsBatchJob); + mockCicsRegionList.put(testCicsTagB, mockCicsbRegion); + + // Mock for CICS region C + ICicsRegionProvisioned mockCicscRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicscRegion.getTag()).thenReturn(testCicsTagA); + // Mock region Product version + Mockito.when(mockCicscRegion.getVersion()).thenReturn(mockProductVersion); + // Mock region SEC=YES log message + Mockito.when(mockCicscRegion.getRegionJob()).thenReturn(mockIzOsBatchJob); + mockCicsRegionList.put(testCicsTagC, mockCicscRegion); + + Mockito.when(cicsManager.getTaggedCicsRegions()).thenReturn(mockCicsRegionList); + + // Mock Terminals + ICicsTerminal regionbTerminal = Mockito.mock(ICicsTerminal.class); + Mockito.when(cicsManager.generateCicsTerminal(testCicsTagB)).thenReturn(regionbTerminal); + ICicsTerminal regioncTerminal = Mockito.mock(ICicsTerminal.class); + Mockito.when(cicsManager.generateCicsTerminal(testCicsTagC)).thenReturn(regioncTerminal); + + // Replace private cicsManager instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + Field cicsManagerField = + sdvManagerImplClass.getDeclaredField(privateCicsManagerVariableName); + cicsManagerField.setAccessible(true); + cicsManagerField.set(sdvManager, cicsManager); + // Replace testClass to bypass generateAnnotatedFields + Field testClass = sdvManagerImplClass.getSuperclass().getDeclaredField(testClassString); + testClass.setAccessible(true); + testClass.set(sdvManager, null); + // Replace sdvUsersToRecordList with a mocked list + List listOfUsersForAllRegions = new ArrayList<>(); + // user1 + ICredentialsUsernamePassword testCreds1 = + new CredentialsUsernamePassword(null, user1String, password1); + SdvUserImpl newSdvUser1 = + new SdvUserImpl(creds1Tag, testCreds1, testCicsTagA, roleNameTeller); + listOfUsersForAllRegions.add(newSdvUser1); + // user2 + ICredentialsUsernamePassword testCreds2 = + new CredentialsUsernamePassword(null, user2String, password2); + SdvUserImpl newSdvUser2 = + new SdvUserImpl(creds2Tag, testCreds2, testCicsTagB, roleNameTeller); + listOfUsersForAllRegions.add(newSdvUser2); + // user3 + ICredentialsUsernamePassword testCreds3 = + new CredentialsUsernamePassword(null, user3String, password3); + SdvUserImpl newSdvUser3 = + new SdvUserImpl(creds3Tag, testCreds3, testCicsTagA, roleNameAdmin); + listOfUsersForAllRegions.add(newSdvUser3); + // user4 + ICredentialsUsernamePassword testCreds4 = + new CredentialsUsernamePassword(null, user4String, password4); + SdvUserImpl newSdvUser4 = + new SdvUserImpl(creds4Tag, testCreds4, testCicsTagC, roleNameOperator); + listOfUsersForAllRegions.add(newSdvUser4); + + Field sdvUsersToRecordList = + sdvManagerImplClass.getDeclaredField(sdvUsersToRecordListString); + sdvUsersToRecordList.setAccessible(true); + sdvUsersToRecordList.set(sdvManager, listOfUsersForAllRegions); + + // Replace LOG + Field loggerField = sdvManagerImplClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvManager, mockLog); + + // Make call to funtion under test + sdvManager.provisionGenerate(); + + Field recordingRegionsField = sdvManagerImplClass.getDeclaredField(recordingRegionsString); + recordingRegionsField.setAccessible(true); + + @SuppressWarnings(uncheckedString) + Map recordingRegions = + (Map) recordingRegionsField.get(sdvManager); + + // Check correct number of users against each region + Assertions.assertEquals(null, recordingRegions.get(mockCicsaRegion)); + Assertions.assertEquals(1, + recordingRegions.get(mockCicsbRegion).getRecordingUsers().size()); + Assertions.assertEquals(1, + recordingRegions.get(mockCicscRegion).getRecordingUsers().size()); + + // Check correct users against each region + List regionbUsers = new ArrayList<>(); + regionbUsers.add(user2String); + for (ISdvUser user : recordingRegions.get(mockCicsbRegion).getRecordingUsers()) { + Assertions.assertTrue(regionbUsers.contains(user.getUsername())); + } + + List regioncUsers = new ArrayList<>(); + regioncUsers.add(user4String); + for (ISdvUser user : recordingRegions.get(mockCicscRegion).getRecordingUsers()) { + Assertions.assertTrue(regioncUsers.contains(user.getUsername())); + } + + // Check each region has correct terminal + Assertions.assertEquals(regionbTerminal, + recordingRegions.get(mockCicsbRegion).getMaintenanceTerminal()); + Assertions.assertEquals(regioncTerminal, + recordingRegions.get(mockCicscRegion).getMaintenanceTerminal()); + + // Check there is a warning in the log indicating Region A won't record + Mockito.verify(mockLog, Mockito.times(1)) + .warn("SDV recording will not take place on CICS region 'NOSEC'" + + ". Security is not active."); + } + + @Test + void testProvisionGenerateNoUsersForRegion() + throws ClassNotFoundException, NoSuchFieldException, SecurityException, + IllegalArgumentException, IllegalAccessException, CredentialsException, + InstantiationException, InvocationTargetException, NoSuchMethodException, + ResourceUnavailableException, ManagerException { + ICicstsManagerSpi cicsManager = Mockito.mock(ICicstsManagerSpi.class); + Map mockCicsRegionList = new HashMap<>(); + + // Mock for CICS region A + ICicsRegionProvisioned mockCicsaRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsaRegion.getTag()).thenReturn(testCicsTagA); + Mockito.when(mockCicsaRegion.getApplid()).thenReturn("OLDREGION"); + // Mock region Product version + ProductVersion mockProductVersion = Mockito.mock(ProductVersion.class); + Mockito.when(mockProductVersion.isEarlierThan(ProductVersion.v(750))).thenReturn(false, + false, false); + Mockito.when(mockCicsaRegion.getVersion()).thenReturn(mockProductVersion); + // Mock region SEC=YES log message + IZosBatchJob mockIzOsBatchJob = Mockito.mock(IZosBatchJob.class); + Mockito.when(mockIzOsBatchJob.retrieveOutputAsString()).thenReturn(secOnMsg); + Mockito.when(mockCicsaRegion.getRegionJob()).thenReturn(mockIzOsBatchJob); + mockCicsRegionList.put(testCicsTagA, mockCicsaRegion); + + // Mock for CICS region B + ICicsRegionProvisioned mockCicsbRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsbRegion.getTag()).thenReturn(testCicsTagA); + // Mock region Product version + Mockito.when(mockCicsbRegion.getVersion()).thenReturn(mockProductVersion); + // Mock region SEC=YES log message + Mockito.when(mockCicsbRegion.getRegionJob()).thenReturn(mockIzOsBatchJob); + mockCicsRegionList.put(testCicsTagB, mockCicsbRegion); + + // Mock for CICS region C + ICicsRegionProvisioned mockCicscRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicscRegion.getTag()).thenReturn(testCicsTagA); + // Mock region Product version + Mockito.when(mockCicscRegion.getVersion()).thenReturn(mockProductVersion); + // Mock region SEC=YES log message + Mockito.when(mockCicscRegion.getRegionJob()).thenReturn(mockIzOsBatchJob); + mockCicsRegionList.put(testCicsTagC, mockCicscRegion); + + Mockito.when(cicsManager.getTaggedCicsRegions()).thenReturn(mockCicsRegionList); + + // Mock Terminals + ICicsTerminal regionbTerminal = Mockito.mock(ICicsTerminal.class); + Mockito.when(cicsManager.generateCicsTerminal(testCicsTagB)).thenReturn(regionbTerminal); + ICicsTerminal regioncTerminal = Mockito.mock(ICicsTerminal.class); + Mockito.when(cicsManager.generateCicsTerminal(testCicsTagC)).thenReturn(regioncTerminal); + + // Replace private cicsManager instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + Field cicsManagerField = + sdvManagerImplClass.getDeclaredField(privateCicsManagerVariableName); + cicsManagerField.setAccessible(true); + cicsManagerField.set(sdvManager, cicsManager); + // Replace testClass to bypass generateAnnotatedFields + Field testClass = sdvManagerImplClass.getSuperclass().getDeclaredField(testClassString); + testClass.setAccessible(true); + testClass.set(sdvManager, null); + // Replace sdvUsersToRecordList with a mocked list + List listOfUsersForAllRegions = new ArrayList<>(); + // user1 + ICredentialsUsernamePassword testCreds1 = + new CredentialsUsernamePassword(null, user1String, password1); + SdvUserImpl newSdvUser1 = + new SdvUserImpl(creds1Tag, testCreds1, testCicsTagB, roleNameTeller); + listOfUsersForAllRegions.add(newSdvUser1); + // user2 + ICredentialsUsernamePassword testCreds2 = + new CredentialsUsernamePassword(null, user2String, password2); + SdvUserImpl newSdvUser2 = + new SdvUserImpl(creds2Tag, testCreds2, testCicsTagB, roleNameTeller); + listOfUsersForAllRegions.add(newSdvUser2); + // user3 + ICredentialsUsernamePassword testCreds3 = + new CredentialsUsernamePassword(null, user3String, password3); + SdvUserImpl newSdvUser3 = + new SdvUserImpl(creds3Tag, testCreds3, testCicsTagB, roleNameAdmin); + listOfUsersForAllRegions.add(newSdvUser3); + // user4 + ICredentialsUsernamePassword testCreds4 = + new CredentialsUsernamePassword(null, user4String, password4); + SdvUserImpl newSdvUser4 = + new SdvUserImpl(creds4Tag, testCreds4, testCicsTagC, roleNameOperator); + listOfUsersForAllRegions.add(newSdvUser4); + + Field sdvUsersToRecordList = + sdvManagerImplClass.getDeclaredField(sdvUsersToRecordListString); + sdvUsersToRecordList.setAccessible(true); + sdvUsersToRecordList.set(sdvManager, listOfUsersForAllRegions); + + // Replace LOG + Field loggerField = sdvManagerImplClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvManager, mockLog); + + // Make call to funtion under test + sdvManager.provisionGenerate(); + + Field recordingRegionsField = sdvManagerImplClass.getDeclaredField(recordingRegionsString); + recordingRegionsField.setAccessible(true); + + @SuppressWarnings(uncheckedString) + Map recordingRegions = + (Map) recordingRegionsField.get(sdvManager); + + // Check correct number of users against each region + Assertions.assertEquals(null, recordingRegions.get(mockCicsaRegion)); + Assertions.assertEquals(3, + recordingRegions.get(mockCicsbRegion).getRecordingUsers().size()); + Assertions.assertEquals(1, + recordingRegions.get(mockCicscRegion).getRecordingUsers().size()); + + // Check correct users against each region + List regionbUsers = new ArrayList<>(); + regionbUsers.add(user1String); + regionbUsers.add(user2String); + regionbUsers.add(user3String); + for (ISdvUser user : recordingRegions.get(mockCicsbRegion).getRecordingUsers()) { + Assertions.assertTrue(regionbUsers.contains(user.getUsername())); + } + + List regioncUsers = new ArrayList<>(); + regioncUsers.add(user4String); + for (ISdvUser user : recordingRegions.get(mockCicscRegion).getRecordingUsers()) { + Assertions.assertTrue(regioncUsers.contains(user.getUsername())); + } + + // Check each region has correct terminal + Assertions.assertEquals(regionbTerminal, + recordingRegions.get(mockCicsbRegion).getMaintenanceTerminal()); + Assertions.assertEquals(regioncTerminal, + recordingRegions.get(mockCicscRegion).getMaintenanceTerminal()); + + // Check there is a warning in the log indicating Region A won't record + Mockito.verify(mockLog, Mockito.times(1)) + .warn("No users have been listed for recording via the SdvUser " + + "annotation for cicsTag 'CICSA'."); + + } + + @Test + void testProvisionGenerateException() throws CredentialsException, NoSuchFieldException, + SecurityException, IllegalArgumentException, IllegalAccessException, + ResourceUnavailableException, ManagerException, ClassNotFoundException, + InstantiationException, InvocationTargetException, NoSuchMethodException { + + ICicstsManagerSpi cicsManager = Mockito.mock(ICicstsManagerSpi.class); + Map mockCicsRegionList = new HashMap<>(); + + // Mock for CICS region A + ICicsRegionProvisioned mockCicsaRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsaRegion.getTag()).thenReturn(testCicsTagA); + // Mock region Product version + ProductVersion mockProductVersion = Mockito.mock(ProductVersion.class); + Mockito.when(mockProductVersion.isEarlierThan(ProductVersion.v(750))).thenReturn(false); + Mockito.when(mockCicsaRegion.getVersion()).thenReturn(mockProductVersion); + // Mock region SEC=YES log message + IZosBatchJob mockIzOsBatchJob = Mockito.mock(IZosBatchJob.class); + Mockito.when(mockIzOsBatchJob.retrieveOutputAsString()).thenReturn(secOnMsg); + Mockito.when(mockCicsaRegion.getRegionJob()).thenReturn(mockIzOsBatchJob); + mockCicsRegionList.put(testCicsTagA, mockCicsaRegion); + + Mockito.when(cicsManager.getTaggedCicsRegions()).thenReturn(mockCicsRegionList); + Mockito.when(mockCicsaRegion.getApplid()).thenReturn(regionaApplid); + Mockito.when(cicsManager.locateCicsRegion(testCicsTagA)).thenReturn(mockCicsaRegion); + + // Mock Terminals + Mockito.when(cicsManager.generateCicsTerminal(testCicsTagA)) + .thenThrow(new CicstsManagerException("Ooppss")); + + // Replace private cicsManager instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + Field cicsManagerField = + sdvManagerImplClass.getDeclaredField(privateCicsManagerVariableName); + cicsManagerField.setAccessible(true); + cicsManagerField.set(sdvManager, cicsManager); + // Replace testClass to bypass generateAnnotatedFields + Field testClass = sdvManagerImplClass.getSuperclass().getDeclaredField(testClassString); + testClass.setAccessible(true); + testClass.set(sdvManager, null); + // Replace sdvUsersToRecordList with a mocked list + List listOfUsersForAllRegions = new ArrayList<>(); + // user1 + ICredentialsUsernamePassword testCreds1 = + new CredentialsUsernamePassword(null, user1String, password1); + SdvUserImpl newSdvUser1 = + new SdvUserImpl(creds1Tag, testCreds1, testCicsTagA, roleNameTeller); + listOfUsersForAllRegions.add(newSdvUser1); + // user3 + ICredentialsUsernamePassword testCreds3 = + new CredentialsUsernamePassword(null, user3String, password3); + SdvUserImpl newSdvUser3 = + new SdvUserImpl(creds3Tag, testCreds3, testCicsTagA, roleNameAdmin); + listOfUsersForAllRegions.add(newSdvUser3); + + Field sdvUsersToRecordList = + sdvManagerImplClass.getDeclaredField(sdvUsersToRecordListString); + sdvUsersToRecordList.setAccessible(true); + sdvUsersToRecordList.set(sdvManager, listOfUsersForAllRegions); + + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Field dssField = sdvManagerImplClass.getDeclaredField("dss"); + dssField.setAccessible(true); + dssField.set(sdvManager, dssService); + + // Mock releaseUsers bits + sdvUserPoolStatic + .when(() -> SdvUserPool.deleteDss(creds1Tag, regionaApplid, runName, dssService)) + .thenAnswer(invocation -> { + return null; + }); + + sdvUserPoolStatic + .when(() -> SdvUserPool.deleteDss(creds3Tag, regionaApplid, runName, dssService)) + .thenAnswer(invocation -> { + return null; + }); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(runName); + Field frameworkField = + sdvManagerImplClass.getSuperclass().getDeclaredField(frameworkString); + frameworkField.setAccessible(true); + frameworkField.set(sdvManager, framework); + + // Make call to funtion under test + ManagerException exception = Assertions.assertThrows(ManagerException.class, () -> { + sdvManager.provisionGenerate(); + }); + + Assertions.assertEquals("Ooppss", exception.getMessage()); + + // Verify users released. + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(creds1Tag), + Mockito.eq(regionaApplid), Mockito.eq(runName), Mockito.any()), Mockito.times(1)); + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(creds3Tag), + Mockito.eq(regionaApplid), Mockito.eq(runName), Mockito.any()), Mockito.times(1)); + sdvUserPoolStatic.verifyNoMoreInteractions(); + + } + + @Test + void testProvisionStart() throws InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, ClassNotFoundException, SdvManagerException, NoSuchFieldException { + // Replace private sdvRecorder instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + + SdvHttpRecorderImpl sdvRecorder = Mockito.mock(SdvHttpRecorderImpl.class); + Field sdvRecorderField = sdvManagerImplClass.getDeclaredField(sdvRecorderVarName); + sdvRecorderField.setAccessible(true); + sdvRecorderField.set(sdvManager, sdvRecorder); + + // Make call to funtion under test + sdvManager.provisionStart(); + + Mockito.verify(sdvRecorder, Mockito.times(1)).prepareEnvironments("LOG_GENERAL_001"); + Mockito.verifyNoMoreInteractions(sdvRecorder); + } + + @Test + void testProvisionStop() throws InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, ClassNotFoundException, SdvManagerException, NoSuchFieldException, + CredentialsException, CicstsManagerException { + // Replace private sdvRecorder instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + + SdvHttpRecorderImpl sdvRecorder = Mockito.mock(SdvHttpRecorderImpl.class); + Field sdvRecorderField = sdvManagerImplClass.getDeclaredField(sdvRecorderVarName); + sdvRecorderField.setAccessible(true); + sdvRecorderField.set(sdvManager, sdvRecorder); + + // Replace sdvUsersToRecordList with a mocked list + List listOfUsersForAllRegions = new ArrayList<>(); + // user1 + ICredentialsUsernamePassword testCreds1 = + new CredentialsUsernamePassword(null, user1String, password1); + SdvUserImpl newSdvUser1 = + new SdvUserImpl(creds1Tag, testCreds1, testCicsTagA, roleNameTeller); + listOfUsersForAllRegions.add(newSdvUser1); + // user2 + ICredentialsUsernamePassword testCreds2 = + new CredentialsUsernamePassword(null, user2String, password2); + SdvUserImpl newSdvUser2 = + new SdvUserImpl(creds2Tag, testCreds2, testCicsTagB, roleNameTeller); + listOfUsersForAllRegions.add(newSdvUser2); + // user3 + ICredentialsUsernamePassword testCreds3 = + new CredentialsUsernamePassword(null, user3String, password3); + SdvUserImpl newSdvUser3 = + new SdvUserImpl(creds3Tag, testCreds3, testCicsTagA, roleNameAdmin); + listOfUsersForAllRegions.add(newSdvUser3); + + Field sdvUsersToRecordList = + sdvManagerImplClass.getDeclaredField(sdvUsersToRecordListString); + sdvUsersToRecordList.setAccessible(true); + sdvUsersToRecordList.set(sdvManager, listOfUsersForAllRegions); + + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + + // Mock cicsManager + ICicstsManagerSpi cicsManager = Mockito.mock(ICicstsManagerSpi.class); + + ICicsRegionProvisioned mockCicsaRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsaRegion.getApplid()).thenReturn(regionaApplid); + Mockito.when(cicsManager.locateCicsRegion(testCicsTagA)).thenReturn(mockCicsaRegion); + + ICicsRegionProvisioned mockCicsbRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsbRegion.getApplid()).thenReturn(regionbApplid); + Mockito.when(cicsManager.locateCicsRegion(testCicsTagB)).thenReturn(mockCicsbRegion); + + // Replace private cicsManager instance in sdvManager + Field cicsManagerField = + sdvManagerImplClass.getDeclaredField(privateCicsManagerVariableName); + cicsManagerField.setAccessible(true); + cicsManagerField.set(sdvManager, cicsManager); + + sdvUserPoolStatic + .when(() -> SdvUserPool.deleteDss(creds1Tag, regionaApplid, runName, dssService)) + .thenAnswer(invocation -> { + return null; + }); + + sdvUserPoolStatic + .when(() -> SdvUserPool.deleteDss(creds3Tag, regionaApplid, runName, dssService)) + .thenAnswer(invocation -> { + return null; + }); + + sdvUserPoolStatic + .when(() -> SdvUserPool.deleteDss(creds2Tag, regionbApplid, runName, dssService)) + .thenAnswer(invocation -> { + return null; + }); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(runName); + Field frameworkField = + sdvManagerImplClass.getSuperclass().getDeclaredField(frameworkString); + frameworkField.setAccessible(true); + frameworkField.set(sdvManager, framework); + + // Make call to funtion under test + sdvManager.provisionStop(); + + Mockito.verify(sdvRecorder, Mockito.times(1)).endRecording(); + Mockito.verify(sdvRecorder, Mockito.times(1)).cleanUpEnvironments(); + Mockito.verifyNoMoreInteractions(sdvRecorder); + + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(creds1Tag), + Mockito.eq(regionaApplid), Mockito.eq(runName), Mockito.any()), Mockito.times(1)); + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(creds3Tag), + Mockito.eq(regionaApplid), Mockito.eq(runName), Mockito.any()), Mockito.times(1)); + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(creds2Tag), + Mockito.eq(regionbApplid), Mockito.eq(runName), Mockito.any()), Mockito.times(1)); + sdvUserPoolStatic.verifyNoMoreInteractions(); + } + + @Test + void testProvisionStopEndRecordingException() throws InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, ClassNotFoundException, SdvManagerException, + NoSuchFieldException, CredentialsException, CicstsManagerException { + // Replace private sdvRecorder instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + + SdvHttpRecorderImpl sdvRecorder = Mockito.mock(SdvHttpRecorderImpl.class); + Mockito.doThrow(new SdvManagerException("test1")).when(sdvRecorder).endRecording(); + Field sdvRecorderField = sdvManagerImplClass.getDeclaredField(sdvRecorderVarName); + sdvRecorderField.setAccessible(true); + sdvRecorderField.set(sdvManager, sdvRecorder); + + // Replace sdvUsersToRecordList with a mocked list + List listOfUsersForAllRegions = new ArrayList<>(); + // user1 + ICredentialsUsernamePassword testCreds1 = + new CredentialsUsernamePassword(null, user1String, password1); + SdvUserImpl newSdvUser1 = + new SdvUserImpl(creds1Tag, testCreds1, testCicsTagA, roleNameTeller); + listOfUsersForAllRegions.add(newSdvUser1); + // user2 + ICredentialsUsernamePassword testCreds2 = + new CredentialsUsernamePassword(null, user2String, password2); + SdvUserImpl newSdvUser2 = + new SdvUserImpl(creds2Tag, testCreds2, testCicsTagB, roleNameTeller); + listOfUsersForAllRegions.add(newSdvUser2); + // user3 + ICredentialsUsernamePassword testCreds3 = + new CredentialsUsernamePassword(null, user3String, password3); + SdvUserImpl newSdvUser3 = + new SdvUserImpl(creds3Tag, testCreds3, testCicsTagA, roleNameAdmin); + listOfUsersForAllRegions.add(newSdvUser3); + + Field sdvUsersToRecordList = + sdvManagerImplClass.getDeclaredField(sdvUsersToRecordListString); + sdvUsersToRecordList.setAccessible(true); + sdvUsersToRecordList.set(sdvManager, listOfUsersForAllRegions); + + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + + // Mock cicsManager + ICicstsManagerSpi cicsManager = Mockito.mock(ICicstsManagerSpi.class); + + ICicsRegionProvisioned mockCicsaRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsaRegion.getApplid()).thenReturn(regionaApplid); + Mockito.when(cicsManager.locateCicsRegion(testCicsTagA)).thenReturn(mockCicsaRegion); + + ICicsRegionProvisioned mockCicsbRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsbRegion.getApplid()).thenReturn(regionbApplid); + Mockito.when(cicsManager.locateCicsRegion(testCicsTagB)).thenReturn(mockCicsbRegion); + + // Replace private cicsManager instance in sdvManager + Field cicsManagerField = + sdvManagerImplClass.getDeclaredField(privateCicsManagerVariableName); + cicsManagerField.setAccessible(true); + cicsManagerField.set(sdvManager, cicsManager); + + sdvUserPoolStatic + .when(() -> SdvUserPool.deleteDss(creds1Tag, regionaApplid, runName, dssService)) + .thenAnswer(invocation -> { + return null; + }); + + sdvUserPoolStatic + .when(() -> SdvUserPool.deleteDss(creds3Tag, regionaApplid, runName, dssService)) + .thenAnswer(invocation -> { + return null; + }); + + sdvUserPoolStatic + .when(() -> SdvUserPool.deleteDss(creds2Tag, regionbApplid, runName, dssService)) + .thenAnswer(invocation -> { + return null; + }); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(runName); + Field frameworkField = + sdvManagerImplClass.getSuperclass().getDeclaredField(frameworkString); + frameworkField.setAccessible(true); + frameworkField.set(sdvManager, framework); + + // Replace LOG + Field loggerField = sdvManagerImplClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvManager, mockLog); + + // Make call to funtion under test + sdvManager.provisionStop(); + + Mockito.verify(sdvRecorder, Mockito.times(1)).endRecording(); + Mockito.verify(sdvRecorder, Mockito.times(1)).cleanUpEnvironments(); + Mockito.verifyNoMoreInteractions(sdvRecorder); + + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(creds1Tag), + Mockito.eq(regionaApplid), Mockito.eq(runName), Mockito.any()), Mockito.times(1)); + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(creds3Tag), + Mockito.eq(regionaApplid), Mockito.eq(runName), Mockito.any()), Mockito.times(1)); + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(creds2Tag), + Mockito.eq(regionbApplid), Mockito.eq(runName), Mockito.any()), Mockito.times(1)); + sdvUserPoolStatic.verifyNoMoreInteractions(); + + // endRecording exception should not have stopped everything else from running, + // but it should had made a log output to make the user aware. + Mockito.verify(mockLog, Mockito.times(1)) + .error(Mockito.eq("Could not stop known SDC recordings in provisionStop."), + Mockito.any(SdvManagerException.class)); + } + + @Test + void testProvisionStopReleaseUsersException() throws InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, ClassNotFoundException, SdvManagerException, + NoSuchFieldException, CredentialsException, CicstsManagerException { + // Replace private sdvRecorder instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + + SdvHttpRecorderImpl sdvRecorder = Mockito.mock(SdvHttpRecorderImpl.class); + Field sdvRecorderField = sdvManagerImplClass.getDeclaredField(sdvRecorderVarName); + sdvRecorderField.setAccessible(true); + sdvRecorderField.set(sdvManager, sdvRecorder); + + // Replace sdvUsersToRecordList with a mocked list + List listOfUsersForAllRegions = new ArrayList<>(); + // user1 + ICredentialsUsernamePassword testCreds1 = + new CredentialsUsernamePassword(null, user1String, password1); + SdvUserImpl newSdvUser1 = + new SdvUserImpl(creds1Tag, testCreds1, testCicsTagA, roleNameTeller); + listOfUsersForAllRegions.add(newSdvUser1); + // user2 + ICredentialsUsernamePassword testCreds2 = + new CredentialsUsernamePassword(null, user2String, password2); + SdvUserImpl newSdvUser2 = + new SdvUserImpl(creds2Tag, testCreds2, testCicsTagB, roleNameTeller); + listOfUsersForAllRegions.add(newSdvUser2); + // user3 + ICredentialsUsernamePassword testCreds3 = + new CredentialsUsernamePassword(null, user3String, password3); + SdvUserImpl newSdvUser3 = + new SdvUserImpl(creds3Tag, testCreds3, testCicsTagA, roleNameAdmin); + listOfUsersForAllRegions.add(newSdvUser3); + + Field sdvUsersToRecordList = + sdvManagerImplClass.getDeclaredField(sdvUsersToRecordListString); + sdvUsersToRecordList.setAccessible(true); + sdvUsersToRecordList.set(sdvManager, listOfUsersForAllRegions); + + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + + // Mock cicsManager + ICicstsManagerSpi cicsManager = Mockito.mock(ICicstsManagerSpi.class); + + ICicsRegionProvisioned mockCicsaRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsaRegion.getApplid()).thenReturn(regionaApplid); + Mockito.when(cicsManager.locateCicsRegion(testCicsTagA)) + .thenThrow(new CicstsManagerException("test 2")); + + ICicsRegionProvisioned mockCicsbRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsbRegion.getApplid()).thenReturn(regionbApplid); + Mockito.when(cicsManager.locateCicsRegion(testCicsTagB)).thenReturn(mockCicsbRegion); + + // Replace private cicsManager instance in sdvManager + Field cicsManagerField = + sdvManagerImplClass.getDeclaredField(privateCicsManagerVariableName); + cicsManagerField.setAccessible(true); + cicsManagerField.set(sdvManager, cicsManager); + + sdvUserPoolStatic + .when(() -> SdvUserPool.deleteDss(creds1Tag, regionaApplid, runName, dssService)) + .thenAnswer(invocation -> { + return null; + }); + + sdvUserPoolStatic + .when(() -> SdvUserPool.deleteDss(creds3Tag, regionaApplid, runName, dssService)) + .thenAnswer(invocation -> { + return null; + }); + + sdvUserPoolStatic + .when(() -> SdvUserPool.deleteDss(creds2Tag, regionbApplid, runName, dssService)) + .thenAnswer(invocation -> { + return null; + }); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(runName); + Field frameworkField = + sdvManagerImplClass.getSuperclass().getDeclaredField(frameworkString); + frameworkField.setAccessible(true); + frameworkField.set(sdvManager, framework); + + // Replace LOG + Field loggerField = sdvManagerImplClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvManager, mockLog); + + // Make call to funtion under test + sdvManager.provisionStop(); + + Mockito.verify(sdvRecorder, Mockito.times(1)).endRecording(); + Mockito.verify(sdvRecorder, Mockito.times(1)).cleanUpEnvironments(); + Mockito.verifyNoMoreInteractions(sdvRecorder); + + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(creds1Tag), + Mockito.eq(regionaApplid), Mockito.eq(runName), Mockito.any()), Mockito.times(0)); + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(creds3Tag), + Mockito.eq(regionaApplid), Mockito.eq(runName), Mockito.any()), Mockito.times(0)); + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(creds2Tag), + Mockito.eq(regionbApplid), Mockito.eq(runName), Mockito.any()), Mockito.times(0)); + sdvUserPoolStatic.verifyNoMoreInteractions(); + + // endRecording exception should not have stopped everything else from running, + // but it should had made a log output to make the user aware. + Mockito.verify(mockLog, Mockito.times(1)) + .error(Mockito.eq("Could not release SDV SdvUsers in provisionStop."), + Mockito.any(CicstsManagerException.class)); + } + + @Test + void testProvisionStopcleanUpEnvironmentsException() throws InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, ClassNotFoundException, SdvManagerException, + NoSuchFieldException, CredentialsException, CicstsManagerException { + // Replace private sdvRecorder instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + + SdvHttpRecorderImpl sdvRecorder = Mockito.mock(SdvHttpRecorderImpl.class); + Mockito.doThrow(new SdvManagerException("test3")).when(sdvRecorder).cleanUpEnvironments(); + Field sdvRecorderField = sdvManagerImplClass.getDeclaredField(sdvRecorderVarName); + sdvRecorderField.setAccessible(true); + sdvRecorderField.set(sdvManager, sdvRecorder); + + // Replace sdvUsersToRecordList with a mocked list + List listOfUsersForAllRegions = new ArrayList<>(); + // user1 + ICredentialsUsernamePassword testCreds1 = + new CredentialsUsernamePassword(null, user1String, password1); + SdvUserImpl newSdvUser1 = + new SdvUserImpl(creds1Tag, testCreds1, testCicsTagA, roleNameTeller); + listOfUsersForAllRegions.add(newSdvUser1); + // user2 + ICredentialsUsernamePassword testCreds2 = + new CredentialsUsernamePassword(null, user2String, password2); + SdvUserImpl newSdvUser2 = + new SdvUserImpl(creds2Tag, testCreds2, testCicsTagB, roleNameTeller); + listOfUsersForAllRegions.add(newSdvUser2); + // user3 + ICredentialsUsernamePassword testCreds3 = + new CredentialsUsernamePassword(null, user3String, password3); + SdvUserImpl newSdvUser3 = + new SdvUserImpl(creds3Tag, testCreds3, testCicsTagA, roleNameAdmin); + listOfUsersForAllRegions.add(newSdvUser3); + + Field sdvUsersToRecordList = + sdvManagerImplClass.getDeclaredField(sdvUsersToRecordListString); + sdvUsersToRecordList.setAccessible(true); + sdvUsersToRecordList.set(sdvManager, listOfUsersForAllRegions); + + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + + // Mock cicsManager + ICicstsManagerSpi cicsManager = Mockito.mock(ICicstsManagerSpi.class); + + ICicsRegionProvisioned mockCicsaRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsaRegion.getApplid()).thenReturn(regionaApplid); + Mockito.when(cicsManager.locateCicsRegion(testCicsTagA)).thenReturn(mockCicsaRegion); + + ICicsRegionProvisioned mockCicsbRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsbRegion.getApplid()).thenReturn(regionbApplid); + Mockito.when(cicsManager.locateCicsRegion(testCicsTagB)).thenReturn(mockCicsbRegion); + + // Replace private cicsManager instance in sdvManager + Field cicsManagerField = + sdvManagerImplClass.getDeclaredField(privateCicsManagerVariableName); + cicsManagerField.setAccessible(true); + cicsManagerField.set(sdvManager, cicsManager); + + sdvUserPoolStatic + .when(() -> SdvUserPool.deleteDss(creds1Tag, regionaApplid, runName, dssService)) + .thenAnswer(invocation -> { + return null; + }); + + sdvUserPoolStatic + .when(() -> SdvUserPool.deleteDss(creds3Tag, regionaApplid, runName, dssService)) + .thenAnswer(invocation -> { + return null; + }); + + sdvUserPoolStatic + .when(() -> SdvUserPool.deleteDss(creds2Tag, regionbApplid, runName, dssService)) + .thenAnswer(invocation -> { + return null; + }); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(runName); + Field frameworkField = + sdvManagerImplClass.getSuperclass().getDeclaredField(frameworkString); + frameworkField.setAccessible(true); + frameworkField.set(sdvManager, framework); + + // Replace LOG + Field loggerField = sdvManagerImplClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvManager, mockLog); + + // Make call to funtion under test + sdvManager.provisionStop(); + + Mockito.verify(sdvRecorder, Mockito.times(1)).endRecording(); + Mockito.verify(sdvRecorder, Mockito.times(1)).cleanUpEnvironments(); + Mockito.verifyNoMoreInteractions(sdvRecorder); + + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(creds1Tag), + Mockito.eq(regionaApplid), Mockito.eq(runName), Mockito.any()), Mockito.times(1)); + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(creds3Tag), + Mockito.eq(regionaApplid), Mockito.eq(runName), Mockito.any()), Mockito.times(1)); + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(creds2Tag), + Mockito.eq(regionbApplid), Mockito.eq(runName), Mockito.any()), Mockito.times(1)); + sdvUserPoolStatic.verifyNoMoreInteractions(); + + // endRecording exception should not have stopped everything else from running, + // but it should had made a log output to make the user aware. + Mockito.verify(mockLog, Mockito.times(1)) + .error(Mockito.eq("Could not cleanup SDV environments in provisionStop."), + Mockito.any(SdvManagerException.class)); + } + + @Test + void testStartOfTestClass() throws InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, ClassNotFoundException, SdvManagerException, NoSuchFieldException { + // Replace private sdvRecorder instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + + SdvHttpRecorderImpl sdvRecorder = Mockito.mock(SdvHttpRecorderImpl.class); + Field sdvRecorderField = sdvManagerImplClass.getDeclaredField(sdvRecorderVarName); + sdvRecorderField.setAccessible(true); + sdvRecorderField.set(sdvManager, sdvRecorder); + + // Make call to funtion under test + sdvManager.startOfTestClass(); + + Mockito.verify(sdvRecorder, Mockito.times(1)).startRecording(); + Mockito.verifyNoMoreInteractions(sdvRecorder); + } + + @Test + void testEndOfTestClassTestPassed() throws InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, ClassNotFoundException, NoSuchFieldException, ManagerException { + // Replace private sdvRecorder instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + + SdvHttpRecorderImpl sdvRecorder = Mockito.mock(SdvHttpRecorderImpl.class); + Field sdvRecorderField = sdvManagerImplClass.getDeclaredField(sdvRecorderVarName); + sdvRecorderField.setAccessible(true); + sdvRecorderField.set(sdvManager, sdvRecorder); + + IFramework framework = Mockito.mock(IFramework.class); + IRun testRun = Mockito.mock(IRun.class); + Mockito.when(testRun.getTestBundleName()).thenReturn("bundleA"); + Mockito.when(testRun.getTestClassName()).thenReturn("classA"); + Mockito.when(framework.getTestRun()).thenReturn(testRun); + Field frameworkField = + sdvManagerImplClass.getSuperclass().getDeclaredField(frameworkString); + frameworkField.setAccessible(true); + frameworkField.set(sdvManager, framework); + + // Make call to funtion under test + Result res = Mockito.mock(Result.class); + Mockito.when(res.isPassed()).thenReturn(true); + + sdvManager.endOfTestClass(res, null); + + Mockito.verify(sdvRecorder, Mockito.times(1)).endRecording(); + Mockito.verify(sdvRecorder, Mockito.times(1)).exportRecordings("bundleA", "classA"); + Mockito.verifyNoMoreInteractions(sdvRecorder); + } + + @Test + void testEndOfTestClassTestFailed() throws InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, ClassNotFoundException, NoSuchFieldException, ManagerException { + // Replace private sdvRecorder instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + + SdvHttpRecorderImpl sdvRecorder = Mockito.mock(SdvHttpRecorderImpl.class); + Field sdvRecorderField = sdvManagerImplClass.getDeclaredField(sdvRecorderVarName); + sdvRecorderField.setAccessible(true); + sdvRecorderField.set(sdvManager, sdvRecorder); + + IFramework framework = Mockito.mock(IFramework.class); + IRun testRun = Mockito.mock(IRun.class); + Mockito.when(testRun.getTestBundleName()).thenReturn("bundleB"); + Mockito.when(testRun.getTestClassName()).thenReturn("classB"); + Mockito.when(framework.getTestRun()).thenReturn(testRun); + Field frameworkField = + sdvManagerImplClass.getSuperclass().getDeclaredField(frameworkString); + frameworkField.setAccessible(true); + frameworkField.set(sdvManager, framework); + + // Make call to funtion under test + Result res = Mockito.mock(Result.class); + Mockito.when(res.isPassed()).thenReturn(false); + + sdvManager.endOfTestClass(res, null); + + Mockito.verify(sdvRecorder, Mockito.times(1)).endRecording(); + Mockito.verify(sdvRecorder, Mockito.times(0)).exportRecordings("bundleB", "classB"); + Mockito.verifyNoMoreInteractions(sdvRecorder); + } + + @Test + void testAreYouProvisionalDependentOn() throws ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException { + // Replace private sdvRecorder instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + + Boolean dependent = false; + // Test ICicstsManagerSpi + IManager cicsManager = new CicstsManagerImpl(); + dependent = sdvManager.areYouProvisionalDependentOn(cicsManager); + Assertions.assertTrue(dependent); + + // Test IArtifactManager + IManager artifactManager = new ArtifactManagerImpl(); + dependent = sdvManager.areYouProvisionalDependentOn(artifactManager); + Assertions.assertTrue(dependent); + + // Test IHttpManagerSpi + IManager httpManager = new HttpManagerImpl(); + dependent = sdvManager.areYouProvisionalDependentOn(httpManager); + Assertions.assertTrue(dependent); + + // Test a random manager + IManager zosManager = new ZosManagerImpl(); + dependent = sdvManager.areYouProvisionalDependentOn(zosManager); + Assertions.assertFalse(dependent); + + } + + @Test + void testReleaseUsersException() throws CredentialsException, NoSuchFieldException, + SecurityException, IllegalArgumentException, IllegalAccessException, + ResourceUnavailableException, ManagerException, ClassNotFoundException, + InstantiationException, InvocationTargetException, NoSuchMethodException { + // Replace private sdvRecorder instance in sdvManager + Class sdvManagerImplClass = Class.forName(sdvManagerImplClassString); + SdvManagerImpl sdvManager = + (SdvManagerImpl) sdvManagerImplClass.getDeclaredConstructor().newInstance(); + + SdvHttpRecorderImpl sdvRecorder = Mockito.mock(SdvHttpRecorderImpl.class); + Field sdvRecorderField = sdvManagerImplClass.getDeclaredField(sdvRecorderVarName); + sdvRecorderField.setAccessible(true); + sdvRecorderField.set(sdvManager, sdvRecorder); + + // Replace sdvUsersToRecordList with a mocked list + List listOfUsersForAllRegions = new ArrayList<>(); + // user1 + ICredentialsUsernamePassword testCreds1 = + new CredentialsUsernamePassword(null, user1String, password1); + SdvUserImpl newSdvUser1 = + new SdvUserImpl(creds1Tag, testCreds1, testCicsTagA, roleNameTeller); + listOfUsersForAllRegions.add(newSdvUser1); + // user2 + ICredentialsUsernamePassword testCreds2 = + new CredentialsUsernamePassword(null, user2String, password2); + SdvUserImpl newSdvUser2 = + new SdvUserImpl(creds2Tag, testCreds2, testCicsTagB, roleNameTeller); + listOfUsersForAllRegions.add(newSdvUser2); + // user3 + ICredentialsUsernamePassword testCreds3 = + new CredentialsUsernamePassword(null, user3String, password3); + SdvUserImpl newSdvUser3 = + new SdvUserImpl(creds3Tag, testCreds3, testCicsTagA, roleNameAdmin); + listOfUsersForAllRegions.add(newSdvUser3); + + Field sdvUsersToRecordList = + sdvManagerImplClass.getDeclaredField(sdvUsersToRecordListString); + sdvUsersToRecordList.setAccessible(true); + sdvUsersToRecordList.set(sdvManager, listOfUsersForAllRegions); + + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Field dssField = sdvManagerImplClass.getDeclaredField("dss"); + dssField.setAccessible(true); + dssField.set(sdvManager, dssService); + + // Mock cicsManager + ICicstsManagerSpi cicsManager = Mockito.mock(ICicstsManagerSpi.class); + + ICicsRegionProvisioned mockCicsaRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsaRegion.getApplid()).thenReturn(regionaApplid); + Mockito.when(cicsManager.locateCicsRegion(testCicsTagA)).thenReturn(mockCicsaRegion); + + ICicsRegionProvisioned mockCicsbRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsbRegion.getApplid()).thenReturn(regionbApplid); + Mockito.when(cicsManager.locateCicsRegion(testCicsTagB)).thenReturn(mockCicsbRegion); + + // Replace private cicsManager instance in sdvManager + Field cicsManagerField = + sdvManagerImplClass.getDeclaredField(privateCicsManagerVariableName); + cicsManagerField.setAccessible(true); + cicsManagerField.set(sdvManager, cicsManager); + + sdvUserPoolStatic + .when(() -> SdvUserPool.deleteDss(creds1Tag, regionaApplid, runName, dssService)) + .thenThrow(new DynamicStatusStoreException("could not delete")); + + sdvUserPoolStatic + .when(() -> SdvUserPool.deleteDss(creds3Tag, regionaApplid, runName, dssService)) + .thenAnswer(invocation -> { + return null; + }); + + sdvUserPoolStatic + .when(() -> SdvUserPool.deleteDss(creds2Tag, regionbApplid, runName, dssService)) + .thenAnswer(invocation -> { + return null; + }); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn(runName); + Field frameworkField = + sdvManagerImplClass.getSuperclass().getDeclaredField(frameworkString); + frameworkField.setAccessible(true); + frameworkField.set(sdvManager, framework); + + // Replace LOG + Field loggerField = sdvManagerImplClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvManager, mockLog); + + // Make call to funtion under test + sdvManager.provisionStop(); + + Mockito.verify(sdvRecorder, Mockito.times(1)).endRecording(); + Mockito.verify(sdvRecorder, Mockito.times(1)).cleanUpEnvironments(); + Mockito.verifyNoMoreInteractions(sdvRecorder); + + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(creds1Tag), + Mockito.eq(regionaApplid), Mockito.eq(runName), Mockito.any()), Mockito.times(1)); + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(creds3Tag), + Mockito.eq(regionaApplid), Mockito.eq(runName), Mockito.any()), Mockito.times(1)); + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(creds2Tag), + Mockito.eq(regionbApplid), Mockito.eq(runName), Mockito.any()), Mockito.times(1)); + sdvUserPoolStatic.verifyNoMoreInteractions(); + + Mockito.verify(mockLog, Mockito.times(1)) + .error(Mockito.eq("Could not release SDV User: " + creds1Tag + ", on CICS region " + + regionaApplid + ", for test run " + runName), + Mockito.any(DynamicStatusStoreException.class)); + + } +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvManagersResourceMonitor.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvManagersResourceMonitor.java new file mode 100644 index 000000000..e4d441276 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvManagersResourceMonitor.java @@ -0,0 +1,460 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal; + +import dev.galasa.framework.spi.DynamicStatusStoreException; +import dev.galasa.framework.spi.FrameworkException; +import dev.galasa.framework.spi.IDynamicStatusStoreService; +import dev.galasa.framework.spi.IFramework; +import dev.galasa.framework.spi.IFrameworkRuns; +import dev.galasa.framework.spi.IResourceManagement; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Modifier; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import org.apache.commons.logging.Log; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + + +class TestSdvManagersResourceMonitor { + + private String runningManagersPrefixString = "manager.runningManagers"; + private String sdvManagersResourceMonitorClassString = + "dev.galasa.sdv.internal.SdvManagersResourceMonitor"; + private String logString = "LOG"; + private String modifiersString = "modifiers"; + + private String runOneString = "RUN1"; + private String runTwoString = "RUN2"; + private String runThreeString = "RUN3"; + private String runningManagersApplid1 = "manager.runningManagers.APPL1"; + private String runningManagersApplid2 = "manager.runningManagers.APPL2"; + + @SuppressWarnings("PMD") + private static final Log mockLog = Mockito.mock(Log.class); + + @BeforeEach + public void setUp() { + Mockito.reset(mockLog); + Mockito.when(mockLog.isInfoEnabled()).thenReturn(true); + Mockito.when(mockLog.isWarnEnabled()).thenReturn(true); + Mockito.when(mockLog.isErrorEnabled()).thenReturn(true); + Mockito.when(mockLog.isTraceEnabled()).thenReturn(true); + Mockito.when(mockLog.isDebugEnabled()).thenReturn(true); + } + + @Test + void testRunWithNoActiveRunsOrDssEntries() + throws ClassNotFoundException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, NoSuchFieldException, FrameworkException { + // Mock framework + IFramework framework = Mockito.mock(IFramework.class); + IFrameworkRuns frameworkRuns = Mockito.mock(IFrameworkRuns.class); + + Set allActiveRuns = new HashSet(); + Mockito.when(frameworkRuns.getActiveRunNames()).thenReturn(allActiveRuns); + + Mockito.when(framework.getFrameworkRuns()).thenReturn(frameworkRuns); + + // Mock resourceManagement + IResourceManagement resMan = Mockito.mock(IResourceManagement.class); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Map runningManagersInDss = new HashMap<>(); + Mockito.when(dssService.getPrefix(runningManagersPrefixString)) + .thenReturn(runningManagersInDss); + + // Get SdvUserResourceMonitor instance + Class sdvManagersResourceMonitorClass = + Class.forName(sdvManagersResourceMonitorClassString); + SdvManagersResourceMonitor sdvManagersResourceMonitor = + (SdvManagersResourceMonitor) sdvManagersResourceMonitorClass + .getDeclaredConstructor(IFramework.class, IResourceManagement.class, + IDynamicStatusStoreService.class) + .newInstance(framework, resMan, dssService); + + // Replace LOG + Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvManagersResourceMonitor, mockLog); + + // Make call to funtion under test + sdvManagersResourceMonitor.run(); + + Mockito.verify(dssService, Mockito.times(0)).delete(Mockito.any(String.class)); + Mockito.verify(dssService, Mockito.times(0)).put(Mockito.any(String.class), + Mockito.any(String.class)); + Mockito.verify(dssService, Mockito.times(0)).performActions(Mockito.any()); + } + + @Test + void testRunWithActiveRunsMatchingDssEntries() + throws ClassNotFoundException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, NoSuchFieldException, FrameworkException { + // Mock framework + IFramework framework = Mockito.mock(IFramework.class); + IFrameworkRuns frameworkRuns = Mockito.mock(IFrameworkRuns.class); + + Set allActiveRuns = new HashSet(); + allActiveRuns.add(runOneString); + allActiveRuns.add(runTwoString); + allActiveRuns.add(runThreeString); + Mockito.when(frameworkRuns.getActiveRunNames()).thenReturn(allActiveRuns); + + Mockito.when(framework.getFrameworkRuns()).thenReturn(frameworkRuns); + + // Mock resourceManagement + IResourceManagement resMan = Mockito.mock(IResourceManagement.class); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Map runningManagersInDss = new HashMap<>(); + runningManagersInDss.put(runningManagersApplid1, runOneString + "," + runTwoString); + runningManagersInDss.put(runningManagersApplid2, runThreeString); + Mockito.when(dssService.getPrefix(runningManagersPrefixString)) + .thenReturn(runningManagersInDss); + + // Get SdvUserResourceMonitor instance + Class sdvManagersResourceMonitorClass = + Class.forName(sdvManagersResourceMonitorClassString); + SdvManagersResourceMonitor sdvManagersResourceMonitor = + (SdvManagersResourceMonitor) sdvManagersResourceMonitorClass + .getDeclaredConstructor(IFramework.class, IResourceManagement.class, + IDynamicStatusStoreService.class) + .newInstance(framework, resMan, dssService); + + // Replace LOG + Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvManagersResourceMonitor, mockLog); + + // Make call to funtion under test + sdvManagersResourceMonitor.run(); + + Mockito.verify(dssService, Mockito.times(0)).delete(Mockito.any(String.class)); + Mockito.verify(dssService, Mockito.times(0)).put(Mockito.any(String.class), + Mockito.any(String.class)); + Mockito.verify(dssService, Mockito.times(0)).performActions(Mockito.any()); + } + + @Test + void testRunException() + throws DynamicStatusStoreException, ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException { + // Mock framework + IFramework framework = Mockito.mock(IFramework.class); + + // Mock resourceManagement + IResourceManagement resMan = Mockito.mock(IResourceManagement.class); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.getPrefix(runningManagersPrefixString)) + .thenThrow(new DynamicStatusStoreException("cannot read store")); + + // Get SdvUserResourceMonitor instance + Class sdvManagersResourceMonitorClass = + Class.forName(sdvManagersResourceMonitorClassString); + SdvManagersResourceMonitor sdvManagersResourceMonitor = + (SdvManagersResourceMonitor) sdvManagersResourceMonitorClass + .getDeclaredConstructor(IFramework.class, IResourceManagement.class, + IDynamicStatusStoreService.class) + .newInstance(framework, resMan, dssService); + + // Replace LOG + Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvManagersResourceMonitor, mockLog); + + // Make call to funtion under test + sdvManagersResourceMonitor.run(); + + Mockito.verify(dssService, Mockito.times(0)).delete(Mockito.any(String.class)); + Mockito.verify(dssService, Mockito.times(0)).put(Mockito.any(String.class), + Mockito.any(String.class)); + Mockito.verify(dssService, Mockito.times(0)).performActions(Mockito.any()); + + // Verify that although an exception occurred, the program continues, and simply logs + // an error to the log. + Mockito.verify(mockLog, Mockito.times(1)) + .error("Failure during scanning DSS for SDV Managers"); + } + + @Test + void testRunWithDssEntryNotInActiveRunsButNotLastManagerOnRegion() + throws FrameworkException, ClassNotFoundException, NoSuchFieldException, + SecurityException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException { + // Mock framework + IFramework framework = Mockito.mock(IFramework.class); + IFrameworkRuns frameworkRuns = Mockito.mock(IFrameworkRuns.class); + + Set allActiveRuns = new HashSet(); + allActiveRuns.add(runTwoString); + allActiveRuns.add(runThreeString); + Mockito.when(frameworkRuns.getActiveRunNames()).thenReturn(allActiveRuns); + + Mockito.when(framework.getFrameworkRuns()).thenReturn(frameworkRuns); + + // Mock resourceManagement + IResourceManagement resMan = Mockito.mock(IResourceManagement.class); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Map runningManagersInDss = new HashMap<>(); + runningManagersInDss.put(runningManagersApplid1, runOneString + "," + runTwoString); + runningManagersInDss.put(runningManagersApplid2, runThreeString); + Mockito.when(dssService.getPrefix(runningManagersPrefixString)) + .thenReturn(runningManagersInDss); + Mockito.when(dssService.get(runningManagersApplid1)) + .thenReturn(runOneString + "," + runTwoString); + Mockito.when(dssService.get(runningManagersApplid2)).thenReturn(runThreeString); + + // Get SdvUserResourceMonitor instance + Class sdvManagersResourceMonitorClass = + Class.forName(sdvManagersResourceMonitorClassString); + SdvManagersResourceMonitor sdvManagersResourceMonitor = + (SdvManagersResourceMonitor) sdvManagersResourceMonitorClass + .getDeclaredConstructor(IFramework.class, IResourceManagement.class, + IDynamicStatusStoreService.class) + .newInstance(framework, resMan, dssService); + + // Replace LOG + Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvManagersResourceMonitor, mockLog); + + // Make call to funtion under test + sdvManagersResourceMonitor.run(); + + Mockito.verify(dssService, Mockito.times(0)).delete(Mockito.any(String.class)); + Mockito.verify(dssService, Mockito.times(1)).put(runningManagersApplid1, runTwoString); + Mockito.verify(dssService, Mockito.times(0)).performActions(Mockito.any()); + } + + @Test + void testRunWithDssEntryNotInActiveRunsButIsLastManagerOnRegion() + throws FrameworkException, ClassNotFoundException, NoSuchFieldException, + SecurityException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException { + // Mock framework + IFramework framework = Mockito.mock(IFramework.class); + IFrameworkRuns frameworkRuns = Mockito.mock(IFrameworkRuns.class); + + Set allActiveRuns = new HashSet(); + allActiveRuns.add(runOneString); + allActiveRuns.add(runTwoString); + Mockito.when(frameworkRuns.getActiveRunNames()).thenReturn(allActiveRuns); + + Mockito.when(framework.getFrameworkRuns()).thenReturn(frameworkRuns); + + // Mock resourceManagement + IResourceManagement resMan = Mockito.mock(IResourceManagement.class); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Map runningManagersInDss = new HashMap<>(); + runningManagersInDss.put(runningManagersApplid1, runOneString + "," + runTwoString); + runningManagersInDss.put(runningManagersApplid2, runThreeString); + Mockito.when(dssService.getPrefix(runningManagersPrefixString)) + .thenReturn(runningManagersInDss); + Mockito.when(dssService.get(runningManagersApplid2)).thenReturn(runThreeString); + + // Get SdvUserResourceMonitor instance + Class sdvManagersResourceMonitorClass = + Class.forName(sdvManagersResourceMonitorClassString); + SdvManagersResourceMonitor sdvManagersResourceMonitor = + (SdvManagersResourceMonitor) sdvManagersResourceMonitorClass + .getDeclaredConstructor(IFramework.class, IResourceManagement.class, + IDynamicStatusStoreService.class) + .newInstance(framework, resMan, dssService); + + // Replace LOG + Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvManagersResourceMonitor, mockLog); + + // Make call to funtion under test + sdvManagersResourceMonitor.run(); + + Mockito.verify(dssService, Mockito.times(0)).delete(Mockito.any(String.class)); + Mockito.verify(dssService, Mockito.times(0)).put(Mockito.any(String.class), + Mockito.any(String.class)); + Mockito.verify(dssService, Mockito.times(1)).performActions(Mockito.any(), Mockito.any()); + } + + @Test + void testrunFinishedOrDeletedIsLastManagerOnRegion() + throws FrameworkException, ClassNotFoundException, NoSuchFieldException, + SecurityException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException { + // Mock framework + IFramework framework = Mockito.mock(IFramework.class); + + // Mock resourceManagement + IResourceManagement resMan = Mockito.mock(IResourceManagement.class); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Map runningManagersInDss = new HashMap<>(); + runningManagersInDss.put(runningManagersApplid1, runOneString + "," + runTwoString); + runningManagersInDss.put(runningManagersApplid2, runThreeString); + Mockito.when(dssService.getPrefix(runningManagersPrefixString)) + .thenReturn(runningManagersInDss); + Mockito.when(dssService.get(runningManagersApplid1)) + .thenReturn(runOneString + "," + runTwoString); + Mockito.when(dssService.get(runningManagersApplid2)).thenReturn(runThreeString); + + // Get SdvUserResourceMonitor instance + Class sdvManagersResourceMonitorClass = + Class.forName(sdvManagersResourceMonitorClassString); + SdvManagersResourceMonitor sdvManagersResourceMonitor = + (SdvManagersResourceMonitor) sdvManagersResourceMonitorClass + .getDeclaredConstructor(IFramework.class, IResourceManagement.class, + IDynamicStatusStoreService.class) + .newInstance(framework, resMan, dssService); + + // Replace LOG + Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvManagersResourceMonitor, mockLog); + + // Make call to funtion under test + sdvManagersResourceMonitor.runFinishedOrDeleted(runOneString); + + Mockito.verify(dssService, Mockito.times(0)).delete(Mockito.any(String.class)); + Mockito.verify(dssService, Mockito.times(1)).put(runningManagersApplid1, runTwoString); + Mockito.verify(dssService, Mockito.times(0)).performActions(Mockito.any()); + } + + @Test + void testrunFinishedOrDeletedNotLastManagerOnRegion() + throws FrameworkException, ClassNotFoundException, NoSuchFieldException, + SecurityException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException { + // Mock framework + IFramework framework = Mockito.mock(IFramework.class); + + // Mock resourceManagement + IResourceManagement resMan = Mockito.mock(IResourceManagement.class); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Map runningManagersInDss = new HashMap<>(); + runningManagersInDss.put(runningManagersApplid1, runOneString + "," + runTwoString); + runningManagersInDss.put(runningManagersApplid2, runThreeString); + Mockito.when(dssService.getPrefix(runningManagersPrefixString)) + .thenReturn(runningManagersInDss); + Mockito.when(dssService.get(runningManagersApplid2)).thenReturn(runThreeString); + + // Get SdvUserResourceMonitor instance + Class sdvManagersResourceMonitorClass = + Class.forName(sdvManagersResourceMonitorClassString); + SdvManagersResourceMonitor sdvManagersResourceMonitor = + (SdvManagersResourceMonitor) sdvManagersResourceMonitorClass + .getDeclaredConstructor(IFramework.class, IResourceManagement.class, + IDynamicStatusStoreService.class) + .newInstance(framework, resMan, dssService); + + // Replace LOG + Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvManagersResourceMonitor, mockLog); + + // Make call to funtion under test + sdvManagersResourceMonitor.runFinishedOrDeleted(runThreeString); + + Mockito.verify(dssService, Mockito.times(0)).delete(Mockito.any(String.class)); + Mockito.verify(dssService, Mockito.times(0)).put(Mockito.any(String.class), + Mockito.any(String.class)); + Mockito.verify(dssService, Mockito.times(1)).performActions(Mockito.any(), Mockito.any()); + } + + @Test + void testrunFinishedOrDeletedException() + throws DynamicStatusStoreException, ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, NoSuchFieldException { + // Mock framework + IFramework framework = Mockito.mock(IFramework.class); + + // Mock resourceManagement + IResourceManagement resMan = Mockito.mock(IResourceManagement.class); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.when(dssService.getPrefix(runningManagersPrefixString)) + .thenThrow(new DynamicStatusStoreException("cannot read store")); + + // Get SdvUserResourceMonitor instance + Class sdvManagersResourceMonitorClass = + Class.forName(sdvManagersResourceMonitorClassString); + SdvManagersResourceMonitor sdvManagersResourceMonitor = + (SdvManagersResourceMonitor) sdvManagersResourceMonitorClass + .getDeclaredConstructor(IFramework.class, IResourceManagement.class, + IDynamicStatusStoreService.class) + .newInstance(framework, resMan, dssService); + + // Replace LOG + Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvManagersResourceMonitor, mockLog); + + // Make call to funtion under test + sdvManagersResourceMonitor.runFinishedOrDeleted(runOneString); + + Mockito.verify(dssService, Mockito.times(0)).delete(Mockito.any(String.class)); + Mockito.verify(dssService, Mockito.times(0)).put(runningManagersApplid1, runTwoString); + Mockito.verify(dssService, Mockito.times(0)).performActions(Mockito.any()); + + // Verify that although an exception occurred, the program continues, and simply logs + // an error to the log. + Mockito.verify(mockLog, Mockito.times(1)) + .error("Failure cleaning up SDV Managers for finished run RUN1"); + } +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvResourceManagement.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvResourceManagement.java new file mode 100644 index 000000000..f4dd85ccc --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvResourceManagement.java @@ -0,0 +1,135 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal; + +import dev.galasa.framework.spi.DynamicStatusStoreException; +import dev.galasa.framework.spi.FrameworkException; +import dev.galasa.framework.spi.IDynamicStatusStoreService; +import dev.galasa.framework.spi.IFramework; +import dev.galasa.framework.spi.IResourceManagement; +import dev.galasa.framework.spi.ResourceManagerException; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.util.Random; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + + +class TestSdvResourceManagement { + + private String sdvResourceManagementClassString = + "dev.galasa.sdv.internal.SdvResourceManagement"; + + @Test + void testStart() throws ClassNotFoundException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, NoSuchFieldException, FrameworkException, ResourceManagerException { + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + + // Mock framework + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getDynamicStatusStoreService("sdv")).thenReturn(dssService); + Random randomNum = Mockito.mock(Random.class); + Mockito.when(randomNum.nextInt()).thenReturn(16); + Mockito.when(framework.getRandom()).thenReturn(randomNum); + + // Mock resourceManagement + IResourceManagement resMan = Mockito.mock(IResourceManagement.class); + ScheduledExecutorService exeService = Mockito.mock(ScheduledExecutorService.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(exeService).scheduleWithFixedDelay(Mockito.any(SdvUserResourceMonitor.class), + Mockito.any(int.class), Mockito.eq(20), Mockito.eq(TimeUnit.SECONDS)); + Mockito.doAnswer(invocation -> { + return null; + }).when(exeService).scheduleWithFixedDelay(Mockito.any(SdvManagersResourceMonitor.class), + Mockito.any(int.class), Mockito.eq(20), Mockito.eq(TimeUnit.SECONDS)); + Mockito.when(resMan.getScheduledExecutorService()).thenReturn(exeService); + + // Get SdvUserResourceMonitor instance + Class sdvResourceManagementClass = Class.forName(sdvResourceManagementClassString); + SdvResourceManagement sdvResourceManagement = + (SdvResourceManagement) sdvResourceManagementClass.getDeclaredConstructor() + .newInstance(); + + Boolean initialised = sdvResourceManagement.initialise(framework, resMan); + Assertions.assertTrue(initialised); + + // Make call to funtion under test + sdvResourceManagement.start(); + + Mockito.verify(exeService, Mockito.times(1)).scheduleWithFixedDelay( + Mockito.any(SdvUserResourceMonitor.class), Mockito.any(long.class), + Mockito.any(long.class), Mockito.eq(TimeUnit.SECONDS)); + + Mockito.verify(exeService, Mockito.times(1)).scheduleWithFixedDelay( + Mockito.any(SdvManagersResourceMonitor.class), Mockito.any(long.class), + Mockito.any(long.class), Mockito.eq(TimeUnit.SECONDS)); + } + + @Test + void testRunFinishedOrDeleted() throws ClassNotFoundException, InstantiationException, + IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, ResourceManagerException, + DynamicStatusStoreException, NoSuchFieldException { + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + + // Mock framework + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getDynamicStatusStoreService("sdv")).thenReturn(dssService); + Random randomNum = Mockito.mock(Random.class); + Mockito.when(randomNum.nextInt()).thenReturn(16); + Mockito.when(framework.getRandom()).thenReturn(randomNum); + + // Mock resourceManagement + IResourceManagement resMan = Mockito.mock(IResourceManagement.class); + ScheduledExecutorService exeService = Mockito.mock(ScheduledExecutorService.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(exeService).scheduleWithFixedDelay(Mockito.any(SdvUserResourceMonitor.class), + Mockito.any(int.class), Mockito.eq(20), Mockito.eq(TimeUnit.SECONDS)); + Mockito.doAnswer(invocation -> { + return null; + }).when(exeService).scheduleWithFixedDelay(Mockito.any(SdvManagersResourceMonitor.class), + Mockito.any(int.class), Mockito.eq(20), Mockito.eq(TimeUnit.SECONDS)); + Mockito.when(resMan.getScheduledExecutorService()).thenReturn(exeService); + + // Get SdvUserResourceMonitor instance + Class sdvResourceManagementClass = Class.forName(sdvResourceManagementClassString); + SdvResourceManagement sdvResourceManagement = + (SdvResourceManagement) sdvResourceManagementClass.getDeclaredConstructor() + .newInstance(); + + Boolean initialised = sdvResourceManagement.initialise(framework, resMan); + Assertions.assertTrue(initialised); + + // Replace the monitors + SdvUserResourceMonitor userResMon = Mockito.mock(SdvUserResourceMonitor.class); + SdvManagersResourceMonitor manResMon = Mockito.mock(SdvManagersResourceMonitor.class); + + Field sdvUserResourceMonitorField = + sdvResourceManagementClass.getDeclaredField("sdvUserResourceMonitor"); + sdvUserResourceMonitorField.setAccessible(true); + sdvUserResourceMonitorField.set(sdvResourceManagement, userResMon); + + Field sdvManagersResourceMonitorField = + sdvResourceManagementClass.getDeclaredField("sdvManagersResourceMonitor"); + sdvManagersResourceMonitorField.setAccessible(true); + sdvManagersResourceMonitorField.set(sdvResourceManagement, manResMon); + + // Make call to funtion under test + sdvResourceManagement.runFinishedOrDeleted("RUN123"); + + Mockito.verify(userResMon, Mockito.times(1)).runFinishedOrDeleted("RUN123"); + Mockito.verify(manResMon, Mockito.times(1)).runFinishedOrDeleted("RUN123"); + } +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvUserImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvUserImpl.java new file mode 100644 index 000000000..5d2c6cf19 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvUserImpl.java @@ -0,0 +1,71 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal; + +import dev.galasa.ICredentialsUsernamePassword; +import dev.galasa.framework.spi.creds.CredentialsException; +import dev.galasa.framework.spi.creds.CredentialsUsernamePassword; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +class TestSdvUserImpl { + + SdvUserImpl ru; + + private static final String TEST_SRR_ID = "1234"; + + @BeforeEach + void beforeEach() throws CredentialsException { + ICredentialsUsernamePassword credentials = + new CredentialsUsernamePassword(null, "user1", "password1"); + ru = new SdvUserImpl("CREDS1", credentials, "CICS1", "TELLER"); + } + + @Test + void testGetCredentials() { + Assertions.assertEquals("CREDS1", ru.getCredentialsTag()); + + Assertions.assertEquals("user1", ru.getUsername()); + Assertions.assertEquals("password1", ru.getPassword()); + } + + @Test + void testGetRole() { + Assertions.assertEquals("TELLER", ru.getRole()); + } + + @Test + void testGetSrrIdAndIsRecordingWhenNotSet() { + Assertions.assertEquals(null, ru.getSrrId()); + Assertions.assertEquals(false, ru.isRecording()); + } + + @Test + void testGetSrrIdAndIsRecordingWhenSet() { + + ru.setSrrId(TEST_SRR_ID); + + Assertions.assertEquals(TEST_SRR_ID, ru.getSrrId()); + Assertions.assertEquals(true, ru.isRecording()); + } + + @Test + void testSetNotRecording() { + + ru.setSrrId(TEST_SRR_ID); + ru.setNotRecording(); + + Assertions.assertEquals(TEST_SRR_ID, ru.getSrrId()); + Assertions.assertEquals(false, ru.isRecording()); + } + + @Test + void testgetCicsTag() { + Assertions.assertEquals("CICS1", ru.getCicsTag()); + } +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvUserPool.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvUserPool.java new file mode 100644 index 000000000..d31a8a923 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvUserPool.java @@ -0,0 +1,328 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal; + +import dev.galasa.cicsts.spi.ICicsRegionProvisioned; +import dev.galasa.framework.spi.DssDelete; +import dev.galasa.framework.spi.DynamicStatusStoreException; +import dev.galasa.framework.spi.DynamicStatusStoreMatchException; +import dev.galasa.framework.spi.IDynamicStatusStoreService; +import dev.galasa.framework.spi.IFramework; +import dev.galasa.framework.spi.IResourcePoolingService; +import dev.galasa.framework.spi.InsufficientResourcesAvailableException; +import dev.galasa.framework.spi.ResourceUnavailableException; +import dev.galasa.sdv.SdvManagerException; +import dev.galasa.sdv.internal.properties.SdvPoolUsers; +import dev.galasa.zos.IZosImage; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.List; +import org.apache.commons.logging.Log; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.MockedStatic; +import org.mockito.Mockito; + + +class TestSdvUserPool { + + private MockedStatic sdvPoolUsers; + + private String roleName = "TELLER"; + private String zosImageId = "IMG1"; + private String applidString = "APPL1"; + private String sdvUserPoolClassString = "dev.galasa.sdv.internal.SdvUserPool"; + private String dssVariableString = "dss"; + + @SuppressWarnings("PMD") + private static final Log mockLog = Mockito.mock(Log.class); + + @BeforeEach + public void setUp() { + // Registering static mocks before each test + sdvPoolUsers = Mockito.mockStatic(SdvPoolUsers.class); + + Mockito.when(mockLog.isTraceEnabled()).thenReturn(true); + } + + @AfterEach + public void tearDown() { + // Closing static mocks after each test + sdvPoolUsers.close(); + } + + @Test + void testAllocateUser() throws SdvManagerException, ResourceUnavailableException, + InstantiationException, IllegalAccessException, IllegalArgumentException, + InvocationTargetException, NoSuchMethodException, SecurityException, + InsufficientResourcesAvailableException, NoSuchFieldException, ClassNotFoundException, + DynamicStatusStoreMatchException, DynamicStatusStoreException { + // Mock IZosImage + IZosImage mockZosImage = Mockito.mock(IZosImage.class); + Mockito.when(mockZosImage.getImageID()).thenReturn(zosImageId); + + // Mock CICS region + ICicsRegionProvisioned mockCicsaRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsaRegion.getZosImage()).thenReturn(mockZosImage); + Mockito.when(mockCicsaRegion.getApplid()).thenReturn(applidString); + + // Mocks for statics + List userCredList = new ArrayList<>(); + userCredList.add("CREDS11"); + userCredList.add("CREDS22"); + userCredList.add("CREDS33"); + sdvPoolUsers.when(() -> SdvPoolUsers.get(zosImageId, roleName)).thenReturn(userCredList); + + // Get SdvUserPool instance + Class sdvUserPoolClass = Class.forName(sdvUserPoolClassString); + SdvUserPool sdvUserPool = + (SdvUserPool) sdvUserPoolClass.getDeclaredConstructor(IFramework.class, + IDynamicStatusStoreService.class, IResourcePoolingService.class) + .newInstance(null, null, null); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).performActions(Mockito.any()); + Field dssField = sdvUserPoolClass.getDeclaredField(dssVariableString); + dssField.setAccessible(true); + dssField.set(sdvUserPool, dssService); + + // Mock rps + List allocatedUserCredList = new ArrayList<>(); + allocatedUserCredList.add("CREDS33"); + IResourcePoolingService resourcePoolingService = + Mockito.mock(IResourcePoolingService.class); + Mockito.when(resourcePoolingService.obtainResources(userCredList, null, 1, 1, dssService, + "sdvuser.APPL1.")).thenReturn(allocatedUserCredList); + Field rpsField = sdvUserPoolClass.getDeclaredField("rps"); + rpsField.setAccessible(true); + rpsField.set(sdvUserPool, resourcePoolingService); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn("RUN123"); + Field frameworkField = sdvUserPoolClass.getDeclaredField("framework"); + frameworkField.setAccessible(true); + frameworkField.set(sdvUserPool, framework); + + // Replace LOG + Field loggerField = sdvUserPoolClass.getDeclaredField("LOG"); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField("modifiers"); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvUserPool, mockLog); + + // Make call to funtion under test + String userCred = sdvUserPool.allocateUser(roleName, mockCicsaRegion); + + Assertions.assertEquals("CREDS33", userCred); + + // Check there is a warning in the log indicating Region A won't record + Mockito.verify(mockLog, Mockito.times(1)).trace("Allocated SDV User CREDS33 on image " + + zosImageId + " for CICS Applid APPL1 from SDV User pool allocation"); + } + + @Test + void testNoUsersFoundForRoleOnImage() + throws ClassNotFoundException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, SdvManagerException, ResourceUnavailableException { + // Mock IZosImage + IZosImage mockZosImage = Mockito.mock(IZosImage.class); + Mockito.when(mockZosImage.getImageID()).thenReturn(zosImageId); + + // Mock CICS region + ICicsRegionProvisioned mockCicsaRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsaRegion.getZosImage()).thenReturn(mockZosImage); + Mockito.when(mockCicsaRegion.getApplid()).thenReturn(applidString); + + // Mocks for statics + List userCredList = new ArrayList<>(); + sdvPoolUsers.when(() -> SdvPoolUsers.get(zosImageId, roleName)).thenReturn(userCredList); + + // Get SdvUserPool instance + Class sdvUserPoolClass = Class.forName(sdvUserPoolClassString); + SdvUserPool sdvUserPool = + (SdvUserPool) sdvUserPoolClass.getDeclaredConstructor(IFramework.class, + IDynamicStatusStoreService.class, IResourcePoolingService.class) + .newInstance(null, null, null); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvUserPool.allocateUser(roleName, mockCicsaRegion); + }); + + Assertions.assertEquals( + "No user credential tags provided for role '" + roleName + "' on z/OS image '" + + zosImageId + "'. Please create or update CPS property 'sdv.zosImage." + + zosImageId + ".role." + roleName + ".credTags'.", + exception.getMessage()); + } + + @Test + void testNoResourcesAvailable() + throws ClassNotFoundException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, DynamicStatusStoreMatchException, DynamicStatusStoreException, + NoSuchFieldException, InsufficientResourcesAvailableException { + // Mock IZosImage + IZosImage mockZosImage = Mockito.mock(IZosImage.class); + Mockito.when(mockZosImage.getImageID()).thenReturn(zosImageId); + + // Mock CICS region + ICicsRegionProvisioned mockCicsaRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsaRegion.getZosImage()).thenReturn(mockZosImage); + Mockito.when(mockCicsaRegion.getApplid()).thenReturn(applidString); + + // Mocks for statics + List userCredList = new ArrayList<>(); + userCredList.add("CREDS44"); + userCredList.add("CREDS55"); + userCredList.add("CREDS66"); + sdvPoolUsers.when(() -> SdvPoolUsers.get(zosImageId, roleName)).thenReturn(userCredList); + + // Get SdvUserPool instance + Class sdvUserPoolClass = Class.forName(sdvUserPoolClassString); + SdvUserPool sdvUserPool = + (SdvUserPool) sdvUserPoolClass.getDeclaredConstructor(IFramework.class, + IDynamicStatusStoreService.class, IResourcePoolingService.class) + .newInstance(null, null, null); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService).performActions(Mockito.any()); + Field dssField = sdvUserPoolClass.getDeclaredField(dssVariableString); + dssField.setAccessible(true); + dssField.set(sdvUserPool, dssService); + + // Mock rps + List allocatedUserCredList = new ArrayList<>(); + allocatedUserCredList.add("CREDS66"); + IResourcePoolingService resourcePoolingService = + Mockito.mock(IResourcePoolingService.class); + Mockito.when(resourcePoolingService.obtainResources(userCredList, null, 1, 1, dssService, + "sdvuser.APPL1.")) + .thenThrow(new InsufficientResourcesAvailableException("No Users")); + Field rpsField = sdvUserPoolClass.getDeclaredField("rps"); + rpsField.setAccessible(true); + rpsField.set(sdvUserPool, resourcePoolingService); + + // Make call to funtion under test + ResourceUnavailableException exception = + Assertions.assertThrows(ResourceUnavailableException.class, () -> { + sdvUserPool.allocateUser(roleName, mockCicsaRegion); + }); + + Assertions.assertEquals("No Users", exception.getMessage()); + } + + @Test + void testDssError() + throws ClassNotFoundException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, DynamicStatusStoreMatchException, DynamicStatusStoreException, + NoSuchFieldException, InsufficientResourcesAvailableException { + // Mock IZosImage + IZosImage mockZosImage = Mockito.mock(IZosImage.class); + Mockito.when(mockZosImage.getImageID()).thenReturn(zosImageId); + + // Mock CICS region + ICicsRegionProvisioned mockCicsaRegion = Mockito.mock(ICicsRegionProvisioned.class); + Mockito.when(mockCicsaRegion.getZosImage()).thenReturn(mockZosImage); + Mockito.when(mockCicsaRegion.getApplid()).thenReturn(applidString); + + // Mocks for statics + List userCredList = new ArrayList<>(); + userCredList.add("CREDS77"); + userCredList.add("CREDS88"); + userCredList.add("CREDS99"); + sdvPoolUsers.when(() -> SdvPoolUsers.get(zosImageId, roleName)).thenReturn(userCredList); + + // Get SdvUserPool instance + Class sdvUserPoolClass = Class.forName(sdvUserPoolClassString); + SdvUserPool sdvUserPool = + (SdvUserPool) sdvUserPoolClass.getDeclaredConstructor(IFramework.class, + IDynamicStatusStoreService.class, IResourcePoolingService.class) + .newInstance(null, null, null); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.doThrow(new DynamicStatusStoreException("something went wrong")).when(dssService) + .performActions(Mockito.any(), Mockito.any()); + Field dssField = sdvUserPoolClass.getDeclaredField(dssVariableString); + dssField.setAccessible(true); + dssField.set(sdvUserPool, dssService); + + // Mock rps + List allocatedUserCredList = new ArrayList<>(); + allocatedUserCredList.add("CREDS99"); + IResourcePoolingService resourcePoolingService = + Mockito.mock(IResourcePoolingService.class); + Mockito.when(resourcePoolingService.obtainResources(userCredList, null, 1, 1, dssService, + "sdvuser.APPL1.")).thenReturn(allocatedUserCredList); + Field rpsField = sdvUserPoolClass.getDeclaredField("rps"); + rpsField.setAccessible(true); + rpsField.set(sdvUserPool, resourcePoolingService); + + IFramework framework = Mockito.mock(IFramework.class); + Mockito.when(framework.getTestRunName()).thenReturn("RUN123"); + Field frameworkField = sdvUserPoolClass.getDeclaredField("framework"); + frameworkField.setAccessible(true); + frameworkField.set(sdvUserPool, framework); + + // Make call to funtion under test + SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { + sdvUserPool.allocateUser(roleName, mockCicsaRegion); + }); + + Assertions.assertEquals( + "Could not update the DSS for user allocation of SDV User CREDS99 on image " + + zosImageId, + exception.getMessage()); + } + + @Test + void testDeleteDss() + throws ClassNotFoundException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, DynamicStatusStoreMatchException, DynamicStatusStoreException, + NoSuchFieldException, InsufficientResourcesAvailableException { + // Get SdvUserPool instance + Class sdvUserPoolClass = Class.forName(sdvUserPoolClassString); + SdvUserPool sdvUserPool = + (SdvUserPool) sdvUserPoolClass.getDeclaredConstructor(IFramework.class, + IDynamicStatusStoreService.class, IResourcePoolingService.class) + .newInstance(null, null, null); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Mockito.doAnswer(invocation -> { + return null; + }).when(dssService) + .performActions(Mockito.any(DssDelete.class), Mockito.any(DssDelete.class)); + Field dssField = sdvUserPoolClass.getDeclaredField(dssVariableString); + dssField.setAccessible(true); + dssField.set(sdvUserPool, dssService); + + // Make call to funtion under test + sdvUserPool.deleteDss("user1", "APPL1", "RUN123", dssService); + + // Ensure perform action is called, with 2x dss entries to delete + Mockito.verify(dssService, Mockito.times(1)) + .performActions(Mockito.any(DssDelete.class), Mockito.any(DssDelete.class)); + + } +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvUserResourceMonitor.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvUserResourceMonitor.java new file mode 100644 index 000000000..991dc141b --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvUserResourceMonitor.java @@ -0,0 +1,440 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package dev.galasa.sdv.internal; + +import dev.galasa.framework.spi.DynamicStatusStoreException; +import dev.galasa.framework.spi.DynamicStatusStoreMatchException; +import dev.galasa.framework.spi.FrameworkException; +import dev.galasa.framework.spi.IDynamicStatusStoreService; +import dev.galasa.framework.spi.IFramework; +import dev.galasa.framework.spi.IFrameworkRuns; +import dev.galasa.framework.spi.IResourceManagement; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Modifier; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import org.apache.commons.logging.Log; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.MockedStatic; +import org.mockito.Mockito; + + +class TestSdvUserResourceMonitor { + + private MockedStatic sdvUserPoolStatic; + + private String sdvUserString = "sdvuser"; + private String sdvUserResourceMonitorClassString = + "dev.galasa.sdv.internal.SdvUserResourceMonitor"; + private String logString = "LOG"; + private String modifiersString = "modifiers"; + + private String dssEntryUser1RegionA = "sdvuser.APPL1.USER1"; + private String dssEntryUser2RegionA = "sdvuser.APPL1.USER2"; + private String dssEntryUser1RegionB = "sdvuser.APPL2.USER1"; + private String runThreeString = "RUN3"; + private String runFourString = "RUN4"; + private String user1String = "USER1"; + private String user2String = "USER2"; + + @SuppressWarnings("PMD") + private static final Log mockLog = Mockito.mock(Log.class); + + @BeforeEach + public void setUp() { + // Registering static mocks before each test + sdvUserPoolStatic = Mockito.mockStatic(SdvUserPool.class); + + Mockito.reset(mockLog); + Mockito.when(mockLog.isInfoEnabled()).thenReturn(true); + Mockito.when(mockLog.isWarnEnabled()).thenReturn(true); + Mockito.when(mockLog.isErrorEnabled()).thenReturn(true); + Mockito.when(mockLog.isTraceEnabled()).thenReturn(true); + Mockito.when(mockLog.isDebugEnabled()).thenReturn(true); + } + + @AfterEach + public void tearDown() { + // Closing static mocks after each test + sdvUserPoolStatic.close(); + } + + @Test + void testRunWithNoActiveRunsOrDssEntries() + throws ClassNotFoundException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, NoSuchFieldException, FrameworkException { + // Mock framework + IFramework framework = Mockito.mock(IFramework.class); + IFrameworkRuns frameworkRuns = Mockito.mock(IFrameworkRuns.class); + + Set allActiveRuns = new HashSet(); + Mockito.when(frameworkRuns.getActiveRunNames()).thenReturn(allActiveRuns); + + Mockito.when(framework.getFrameworkRuns()).thenReturn(frameworkRuns); + + // Mock resourceManagement + IResourceManagement resMan = Mockito.mock(IResourceManagement.class); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Map sdvUsersInDss = new HashMap<>(); + Mockito.when(dssService.getPrefix(sdvUserString)).thenReturn(sdvUsersInDss); + + // Get SdvUserResourceMonitor instance + Class sdvUserResourceMonitorClass = Class.forName(sdvUserResourceMonitorClassString); + SdvUserResourceMonitor sdvUserResourceMonitor = + (SdvUserResourceMonitor) sdvUserResourceMonitorClass + .getDeclaredConstructor(IFramework.class, IResourceManagement.class, + IDynamicStatusStoreService.class) + .newInstance(framework, resMan, dssService); + + // Replace LOG + Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvUserResourceMonitorClass, mockLog); + + // Make call to funtion under test + sdvUserResourceMonitor.run(); + + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any()), Mockito.times(0)); + sdvUserPoolStatic.verifyNoMoreInteractions(); + + Assertions.assertTrue(true); + } + + @Test + void testRunWithActiveRunsMatchingDssEntries() + throws ClassNotFoundException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException, NoSuchFieldException, FrameworkException { + // Mock framework + IFramework framework = Mockito.mock(IFramework.class); + IFrameworkRuns frameworkRuns = Mockito.mock(IFrameworkRuns.class); + + Set allActiveRuns = new HashSet(); + allActiveRuns.add("RUN1"); + allActiveRuns.add("RUN2"); + Mockito.when(frameworkRuns.getActiveRunNames()).thenReturn(allActiveRuns); + + Mockito.when(framework.getFrameworkRuns()).thenReturn(frameworkRuns); + + // Mock resourceManagement + IResourceManagement resMan = Mockito.mock(IResourceManagement.class); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Map sdvUsersInDss = new HashMap<>(); + sdvUsersInDss.put(dssEntryUser1RegionA, "RUN1"); + sdvUsersInDss.put(dssEntryUser2RegionA, "RUN1"); + sdvUsersInDss.put(dssEntryUser1RegionB, "RUN2"); + Mockito.when(dssService.getPrefix(sdvUserString)).thenReturn(sdvUsersInDss); + + // Get SdvUserResourceMonitor instance + Class sdvUserResourceMonitorClass = Class.forName(sdvUserResourceMonitorClassString); + SdvUserResourceMonitor sdvUserResourceMonitor = + (SdvUserResourceMonitor) sdvUserResourceMonitorClass + .getDeclaredConstructor(IFramework.class, IResourceManagement.class, + IDynamicStatusStoreService.class) + .newInstance(framework, resMan, dssService); + + // Replace LOG + Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvUserResourceMonitorClass, mockLog); + + // Make call to funtion under test + sdvUserResourceMonitor.run(); + + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any()), Mockito.times(0)); + sdvUserPoolStatic.verifyNoMoreInteractions(); + + Assertions.assertTrue(true); + } + + @Test + void testRunWithDssEntriesNotInActiveRuns() throws FrameworkException, ClassNotFoundException, + NoSuchFieldException, SecurityException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException { + // Mock framework + IFramework framework = Mockito.mock(IFramework.class); + IFrameworkRuns frameworkRuns = Mockito.mock(IFrameworkRuns.class); + + Set allActiveRuns = new HashSet(); + allActiveRuns.add(runFourString); + Mockito.when(frameworkRuns.getActiveRunNames()).thenReturn(allActiveRuns); + + Mockito.when(framework.getFrameworkRuns()).thenReturn(frameworkRuns); + + // Mock resourceManagement + IResourceManagement resMan = Mockito.mock(IResourceManagement.class); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Map sdvUsersInDss = new HashMap<>(); + sdvUsersInDss.put(dssEntryUser1RegionA, runThreeString); + sdvUsersInDss.put(dssEntryUser2RegionA, runThreeString); + sdvUsersInDss.put(dssEntryUser1RegionB, runFourString); + Mockito.when(dssService.getPrefix(sdvUserString)).thenReturn(sdvUsersInDss); + + // Get SdvUserResourceMonitor instance + Class sdvUserResourceMonitorClass = Class.forName(sdvUserResourceMonitorClassString); + SdvUserResourceMonitor sdvUserResourceMonitor = + (SdvUserResourceMonitor) sdvUserResourceMonitorClass + .getDeclaredConstructor(IFramework.class, IResourceManagement.class, + IDynamicStatusStoreService.class) + .newInstance(framework, resMan, dssService); + + // Replace LOG + Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvUserResourceMonitorClass, mockLog); + + // Make call to funtion under test + sdvUserResourceMonitor.run(); + + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(user1String), Mockito.any(), + Mockito.eq(runThreeString), Mockito.any()), Mockito.times(1)); + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(user2String), Mockito.any(), + Mockito.eq(runThreeString), Mockito.any()), Mockito.times(1)); + sdvUserPoolStatic.verifyNoMoreInteractions(); + + Assertions.assertTrue(true); + } + + @Test + void testRunException() throws FrameworkException, ClassNotFoundException, NoSuchFieldException, + SecurityException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException { + // Mock framework + IFramework framework = Mockito.mock(IFramework.class); + IFrameworkRuns frameworkRuns = Mockito.mock(IFrameworkRuns.class); + + Set allActiveRuns = new HashSet(); + allActiveRuns.add(runFourString); + Mockito.when(frameworkRuns.getActiveRunNames()).thenReturn(allActiveRuns); + + Mockito.when(framework.getFrameworkRuns()) + .thenThrow(new FrameworkException("cannot access framework")); + + // Mock resourceManagement + IResourceManagement resMan = Mockito.mock(IResourceManagement.class); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Map sdvUsersInDss = new HashMap<>(); + sdvUsersInDss.put(dssEntryUser1RegionA, runThreeString); + sdvUsersInDss.put(dssEntryUser2RegionA, runThreeString); + sdvUsersInDss.put(dssEntryUser1RegionB, runFourString); + Mockito.when(dssService.getPrefix(sdvUserString)).thenReturn(sdvUsersInDss); + + // Get SdvUserResourceMonitor instance + Class sdvUserResourceMonitorClass = Class.forName(sdvUserResourceMonitorClassString); + SdvUserResourceMonitor sdvUserResourceMonitor = + (SdvUserResourceMonitor) sdvUserResourceMonitorClass + .getDeclaredConstructor(IFramework.class, IResourceManagement.class, + IDynamicStatusStoreService.class) + .newInstance(framework, resMan, dssService); + + // Replace LOG + Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvUserResourceMonitorClass, mockLog); + + // Make call to funtion under test + sdvUserResourceMonitor.run(); + + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(user1String), Mockito.any(), + Mockito.eq(runThreeString), Mockito.any()), Mockito.times(0)); + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(user2String), Mockito.any(), + Mockito.eq(runThreeString), Mockito.any()), Mockito.times(0)); + sdvUserPoolStatic.verifyNoMoreInteractions(); + + // Verify that although an exception occurred, the program continues, and simply logs + // an error to the log. + Mockito.verify(mockLog, Mockito.times(1)) + .error("Failure during scanning DSS for SDV Users"); + } + + @Test + void testrunFinishedOrDeleted() throws FrameworkException, ClassNotFoundException, + NoSuchFieldException, SecurityException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException { + // Mock framework + IFramework framework = Mockito.mock(IFramework.class); + + // Mock resourceManagement + IResourceManagement resMan = Mockito.mock(IResourceManagement.class); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Map sdvUsersInDss = new HashMap<>(); + sdvUsersInDss.put(dssEntryUser1RegionA, runThreeString); + sdvUsersInDss.put(dssEntryUser2RegionA, runThreeString); + sdvUsersInDss.put(dssEntryUser1RegionB, runFourString); + Mockito.when(dssService.getPrefix(sdvUserString)).thenReturn(sdvUsersInDss); + + // Get SdvUserResourceMonitor instance + Class sdvUserResourceMonitorClass = Class.forName(sdvUserResourceMonitorClassString); + SdvUserResourceMonitor sdvUserResourceMonitor = + (SdvUserResourceMonitor) sdvUserResourceMonitorClass + .getDeclaredConstructor(IFramework.class, IResourceManagement.class, + IDynamicStatusStoreService.class) + .newInstance(framework, resMan, dssService); + + // Replace LOG + Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvUserResourceMonitorClass, mockLog); + + // Make call to funtion under test + sdvUserResourceMonitor.runFinishedOrDeleted(runThreeString); + + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(user1String), Mockito.any(), + Mockito.eq(runThreeString), Mockito.any()), Mockito.times(1)); + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(user2String), Mockito.any(), + Mockito.eq(runThreeString), Mockito.any()), Mockito.times(1)); + sdvUserPoolStatic.verifyNoMoreInteractions(); + + Assertions.assertTrue(true); + } + + @Test + void testrunFinishedOrDeletedException() throws FrameworkException, ClassNotFoundException, + NoSuchFieldException, SecurityException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException { + // Mock framework + IFramework framework = Mockito.mock(IFramework.class); + + // Mock resourceManagement + IResourceManagement resMan = Mockito.mock(IResourceManagement.class); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Map sdvUsersInDss = new HashMap<>(); + sdvUsersInDss.put(dssEntryUser1RegionA, runThreeString); + sdvUsersInDss.put(dssEntryUser2RegionA, runThreeString); + sdvUsersInDss.put(dssEntryUser1RegionB, runFourString); + Mockito.when(dssService.getPrefix(sdvUserString)) + .thenThrow(new DynamicStatusStoreException("cannot read dss")); + + // Get SdvUserResourceMonitor instance + Class sdvUserResourceMonitorClass = Class.forName(sdvUserResourceMonitorClassString); + SdvUserResourceMonitor sdvUserResourceMonitor = + (SdvUserResourceMonitor) sdvUserResourceMonitorClass + .getDeclaredConstructor(IFramework.class, IResourceManagement.class, + IDynamicStatusStoreService.class) + .newInstance(framework, resMan, dssService); + + // Replace LOG + Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvUserResourceMonitorClass, mockLog); + + // Make call to funtion under test + sdvUserResourceMonitor.runFinishedOrDeleted(runThreeString); + + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(user1String), Mockito.any(), + Mockito.eq(runThreeString), Mockito.any()), Mockito.times(0)); + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(user2String), Mockito.any(), + Mockito.eq(runThreeString), Mockito.any()), Mockito.times(0)); + sdvUserPoolStatic.verifyNoMoreInteractions(); + + // Verify that although an exception occurred, the program continues, and simply logs + // an error to the log. + Mockito.verify(mockLog, Mockito.times(1)) + .error("Failure cleaning up SDV Users for finished run " + runThreeString); + } + + @Test + void testrunFinishedOrDeletedDssDeleteException() + throws FrameworkException, ClassNotFoundException, NoSuchFieldException, + SecurityException, InstantiationException, IllegalAccessException, + IllegalArgumentException, InvocationTargetException, NoSuchMethodException { + // Mock framework + IFramework framework = Mockito.mock(IFramework.class); + + // Mock resourceManagement + IResourceManagement resMan = Mockito.mock(IResourceManagement.class); + + // Mock dss + IDynamicStatusStoreService dssService = Mockito.mock(IDynamicStatusStoreService.class); + Map sdvUsersInDss = new HashMap<>(); + sdvUsersInDss.put(dssEntryUser1RegionA, runThreeString); + sdvUsersInDss.put(dssEntryUser2RegionA, runThreeString); + sdvUsersInDss.put(dssEntryUser1RegionB, runFourString); + Mockito.when(dssService.getPrefix(sdvUserString)).thenReturn(sdvUsersInDss); + + // Get SdvUserResourceMonitor instance + Class sdvUserResourceMonitorClass = Class.forName(sdvUserResourceMonitorClassString); + SdvUserResourceMonitor sdvUserResourceMonitor = + (SdvUserResourceMonitor) sdvUserResourceMonitorClass + .getDeclaredConstructor(IFramework.class, IResourceManagement.class, + IDynamicStatusStoreService.class) + .newInstance(framework, resMan, dssService); + + // Replace LOG + Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); + loggerField.setAccessible(true); + // remove final modifier + Field modifiersField = Field.class.getDeclaredField(modifiersString); + modifiersField.setAccessible(true); + modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); + loggerField.set(sdvUserResourceMonitorClass, mockLog); + + sdvUserPoolStatic.when(() -> SdvUserPool.deleteDss(Mockito.eq(user1String), Mockito.any(), + Mockito.eq(runThreeString), Mockito.any())) + .thenThrow(new DynamicStatusStoreMatchException("not found")); + + // Make call to funtion under test + sdvUserResourceMonitor.runFinishedOrDeleted(runThreeString); + + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(user1String), Mockito.any(), + Mockito.eq(runThreeString), Mockito.any()), Mockito.times(1)); + sdvUserPoolStatic.verify(() -> SdvUserPool.deleteDss(Mockito.eq(user2String), Mockito.any(), + Mockito.eq(runThreeString), Mockito.any()), Mockito.times(1)); + sdvUserPoolStatic.verifyNoMoreInteractions(); + + // Verify that although an exception occurred, the program continues, and simply logs + // an error to the log. + Mockito.verify(mockLog, Mockito.times(1)) + .error("Failure in discarding SDV User " + user1String + " on CICS Applid APPL1" + + " allocated to run " + runThreeString); + } +} diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/resources/getYaml.jcl b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/resources/getYaml.jcl new file mode 100644 index 000000000..e35c7b071 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/resources/getYaml.jcl @@ -0,0 +1,7 @@ +//MYLIB JCLLIB ORDER=(CICS.INSTALL.SDFHPROC) +//SDVCAPTR EXEC DFHXSDSO, +// HLQ=CICS.INSTALL, +// LOGSTRM=owner1.APPL1.DFHSECR, +// CYL=100 +//EXTRACT.SYSIN DD * +HEADER=NO \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/resources/getYamlRegionA.jcl b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/resources/getYamlRegionA.jcl new file mode 100644 index 000000000..a12289b56 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/resources/getYamlRegionA.jcl @@ -0,0 +1,13 @@ +//MYLIB JCLLIB ORDER=(CICS.INSTALL.SDFHPROC) +//SDVCAPTR EXEC DFHXSDSO, +// HLQ=CICS.INSTALL, +// LOGSTRM=owner1.APPL1.DFHSECR, +// CYL=100 +//EXTRACT.SYSIN DD * +HEADER=NO +MATCHID=_654654 +USERID=user1,ROLE=TELLER +MATCHID=_7676575 +USERID=user2,ROLE=ADMIN +/* +// \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/resources/getYamlRegionB.jcl b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/resources/getYamlRegionB.jcl new file mode 100644 index 000000000..210b62f76 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/resources/getYamlRegionB.jcl @@ -0,0 +1,11 @@ +//MYLIB JCLLIB ORDER=(CICS.INSTALL.SDFHPROC) +//SDVCAPTR EXEC DFHXSDSO, +// HLQ=CICS.INSTALL, +// LOGSTRM=owner1.APPL1.DFHSECR, +// CYL=100 +//EXTRACT.SYSIN DD * +HEADER=NO +MATCHID=_4543634 +USERID=user3,ROLE=TELLER +/* +// \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/resources/yamlRegionA.yaml b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/resources/yamlRegionA.yaml new file mode 100644 index 000000000..47cd4ee41 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/resources/yamlRegionA.yaml @@ -0,0 +1 @@ +regionASecurityYAML \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/resources/yamlRegionB.yaml b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/resources/yamlRegionB.yaml new file mode 100644 index 000000000..a304c420a --- /dev/null +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/resources/yamlRegionB.yaml @@ -0,0 +1 @@ +regionBSecurityYAML \ No newline at end of file diff --git a/galasa-managers-parent/gradle.properties b/galasa-managers-parent/gradle.properties index 492e06796..d942f9ac5 100644 --- a/galasa-managers-parent/gradle.properties +++ b/galasa-managers-parent/gradle.properties @@ -1,6 +1,6 @@ org.gradle.jvmargs=-Xmx4096M -jacocoEnabled= false +jacocoEnabled= true isMainOrRelease= false diff --git a/galasa-managers-parent/settings.gradle b/galasa-managers-parent/settings.gradle index 988c9d372..767ec2472 100644 --- a/galasa-managers-parent/settings.gradle +++ b/galasa-managers-parent/settings.gradle @@ -84,6 +84,8 @@ include 'galasa-managers-languages-parent:dev.galasa.java.windows.manager' // galasa-managers-testingtools-parent include 'galasa-managers-testingtools-parent:dev.galasa.jmeter.manager' include 'galasa-managers-testingtools-parent:dev.galasa.jmeter.manager.ivt' +include 'galasa-managers-testingtools-parent:dev.galasa.sdv.manager' +include 'galasa-managers-testingtools-parent:dev.galasa.sdv.manager.ivt' include 'galasa-managers-testingtools-parent:dev.galasa.selenium.manager' include 'galasa-managers-testingtools-parent:dev.galasa.selenium.manager.ivt' include 'galasa-managers-testingtools-parent:dev.galasa.vtp.manager' diff --git a/release.yaml b/release.yaml index ef41acd0f..850117904 100644 --- a/release.yaml +++ b/release.yaml @@ -317,6 +317,21 @@ managers: obr: true bom: true isolated: true + + - artifact: dev.galasa.sdv.manager + version: 0.34.0 + obr: true + javadoc: true + bom: true + mvp: true + isolated: true + codecoverage: true + + - artifact: dev.galasa.sdv.manager.ivt + version: 0.34.0 + obr: true + mvp: true + isolated: true - artifact: dev.galasa.selenium.manager version: 0.34.0 From d013c1afe7a85cf626bcbf8f3459ad37052c8b0d Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Mon, 3 Jun 2024 15:55:53 +0100 Subject: [PATCH 193/263] added test files to detect-secrets and audited the secrets Signed-off-by: Savvas Kyriacou --- .secrets.baseline | 85 +++++++++++++++++++ build-locally.sh | 40 ++++++++- .../cicsts/ICeciResponseOutputValue.java | 12 +-- .../internal/TestDockerRegistryImpl.java | 2 +- .../src/main/resources/testSecret.yaml | 2 +- .../main/resources/k8s/config-grafana.yaml | 12 +-- .../src/main/res/jmeter.properties | 4 +- .../internal/shared/LinuxSharedImage.java | 2 +- .../zos3270/orders/GraphicsEscapeTest.java | 2 +- .../src/test/java/t/TestColour.java | 2 +- .../src/test/java/t/TestInbound.java | 2 +- .../RseapiZosDatasetAttributesListdsi.java | 12 +-- .../ZosmfZosDatasetAttributesListdsi.java | 12 +-- .../internal/properties/TestServerCreds.java | 12 +-- .../internal/properties/TestServerCreds.java | 12 +-- 15 files changed, 167 insertions(+), 46 deletions(-) create mode 100644 .secrets.baseline diff --git a/.secrets.baseline b/.secrets.baseline new file mode 100644 index 000000000..6734c89e3 --- /dev/null +++ b/.secrets.baseline @@ -0,0 +1,85 @@ +{ + "exclude": { + "files": "^.secrets.baseline$", + "lines": null + }, + "generated_at": "2024-06-03T14:55:28Z", + "plugins_used": [ + { + "name": "AWSKeyDetector" + }, + { + "name": "ArtifactoryDetector" + }, + { + "name": "AzureStorageKeyDetector" + }, + { + "base64_limit": 4.5, + "name": "Base64HighEntropyString" + }, + { + "name": "BasicAuthDetector" + }, + { + "name": "BoxDetector" + }, + { + "name": "CloudantDetector" + }, + { + "ghe_instance": "github.ibm.com", + "name": "GheDetector" + }, + { + "name": "GitHubTokenDetector" + }, + { + "hex_limit": 3, + "name": "HexHighEntropyString" + }, + { + "name": "IbmCloudIamDetector" + }, + { + "name": "IbmCosHmacDetector" + }, + { + "name": "JwtTokenDetector" + }, + { + "keyword_exclude": null, + "name": "KeywordDetector" + }, + { + "name": "MailchimpDetector" + }, + { + "name": "NpmDetector" + }, + { + "name": "PrivateKeyDetector" + }, + { + "name": "SlackDetector" + }, + { + "name": "SoftlayerDetector" + }, + { + "name": "SquareOAuthDetector" + }, + { + "name": "StripeDetector" + }, + { + "name": "TwilioKeyDetector" + } + ], + "results": {}, + "version": "0.13.1+ibm.62.dss", + "word_list": { + "file": null, + "hash": null + } +} diff --git a/build-locally.sh b/build-locally.sh index 2d3452950..4f60457e6 100755 --- a/build-locally.sh +++ b/build-locally.sh @@ -78,6 +78,15 @@ Options are: EOF } +function check_exit_code () { + # This function takes 3 parameters in the form: + # $1 an integer value of the returned exit code + # $2 an error message to display if $1 is not equal to 0 + if [[ "$1" != "0" ]]; then + error "$2" + exit 1 + fi +} #----------------------------------------------------------------------------------------- # Process parameters #----------------------------------------------------------------------------------------- @@ -185,9 +194,36 @@ function build_code { info "Using command: ${cmd}" $cmd 2>&1 > ${log_file} - rc=$? ; if [[ "${rc}" != "0" ]]; then error "Failed to build ${project} see logs at ${log_file}" ; exit 1 ; fi + rc=$? + check_exit_code $rc "Failed to build ${project} see logs at ${log_file}" success "Project ${project} built - OK - log is at ${log_file}" } -build_code \ No newline at end of file +function check_secrets { + h2 "updating secrets baseline" + cd ${BASEDIR} + detect-secrets scan --update .secrets.baseline + rc=$? + check_exit_code $rc "Failed to run detect-secrets. Please check it is installed properly" + success "updated secrets file" + + h2 "running audit for secrets" + detect-secrets audit .secrets.baseline + rc=$? + check_exit_code $rc "Failed to audit detect-secrets." + + #Check all secrets have been audited + secrets=$(grep -c hashed_secret .secrets.baseline) + audits=$(grep -c is_secret .secrets.baseline) + if [[ "$secrets" != "$audits" ]]; then + error "Not all secrets found have been audited" + exit 1 + fi + success "secrets audit complete" +} + + +build_code + +check_secrets \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeciResponseOutputValue.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeciResponseOutputValue.java index 589811c9b..f08704bb1 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeciResponseOutputValue.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeciResponseOutputValue.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts; @@ -14,7 +14,7 @@ * show:
      * INTO('A.....')
      * and in Hex:
      - * INTO(X'C13456789ABC')
      + * INTO(X'C13456789ABC')
      example hex in javadoc comment //pragma: allowlist secret * Both representations are available using the {@link #getTextValue()} and {@link #getHexValue()} methods respectively */ public interface ICeciResponseOutputValue { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/test/java/dev/galasa/docker/internal/TestDockerRegistryImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/test/java/dev/galasa/docker/internal/TestDockerRegistryImpl.java index 74196d93a..fe2e06a9e 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/test/java/dev/galasa/docker/internal/TestDockerRegistryImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/test/java/dev/galasa/docker/internal/TestDockerRegistryImpl.java @@ -115,7 +115,7 @@ public void retrieveBearerTokenUnauthorised() throws DockerManagerException, Mal when(credentialsMock.getUsername()).thenReturn("testUsername"); when(credentialsMock.getPassword()).thenReturn("testPassword"); String user = "testUsername"; - String password = "testPassword"; + String password = "testPassword"; //unit test mock password //pragma: allowlist secret when(clientMock.setAuthorisation(user, password)).thenReturn(clientMock); when(clientMock.build()).thenReturn(clientMock); // Base64 encoding credentials to replicate private encoding method (generateDockerRegistryAuthStructure) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testSecret.yaml b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testSecret.yaml index fb0caea30..b4fcb1faa 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testSecret.yaml +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager.ivt/src/main/resources/testSecret.yaml @@ -9,4 +9,4 @@ kind: Secret metadata: name: testsecret data: - test_password: dGVzdHBhc3N3b3Jk \ No newline at end of file + test_password: dGVzdHBhc3N3b3Jk #This is used in in the IVT test only #pragma: allowlist secret \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config-grafana.yaml b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config-grafana.yaml index 92c440f9e..4c24153d9 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config-grafana.yaml +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/resources/k8s/config-grafana.yaml @@ -90,7 +90,7 @@ data: ;password = # Use either URL or the previous fields to configure the database - # Example: mysql://user:secret@host:port/database + # Example: mysql://user:secret@host:port/database #pragma: allowlist secret ;url = # For "postgres" only, either "disable", "require" or "verify-full" @@ -164,7 +164,7 @@ data: ;admin_user = admin # default admin password, can be changed before first start of grafana, or in profile settings - ;admin_password = admin + ;admin_password = admin #property is not used as it is commented out #pragma: allowlist secret # used for signing ;secret_key = SW2YcwTIb9zpOOhoPsMm @@ -276,7 +276,7 @@ data: ;enabled = false ;allow_sign_up = true ;client_id = some_id - ;client_secret = some_secret + ;client_secret = some_secret #property is not used as it is commented out #pragma: allowlist secret ;scopes = user:email,read:org ;auth_url = https://github.com/login/oauth/authorize ;token_url = https://github.com/login/oauth/access_token @@ -289,7 +289,7 @@ data: ;enabled = false ;allow_sign_up = true ;client_id = some_client_id - ;client_secret = some_client_secret + ;client_secret = some_client_secret #property is not used as it is commented out #pragma: allowlist secret ;scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email ;auth_url = https://accounts.google.com/o/oauth2/auth ;token_url = https://accounts.google.com/o/oauth2/token @@ -302,7 +302,7 @@ data: ;name = OAuth ;allow_sign_up = true ;client_id = some_id - ;client_secret = some_secret + ;client_secret = some_secret #property is not used as it is commented out #pragma: allowlist secret ;scopes = user:email,read:org ;auth_url = https://foo.bar/login/oauth/authorize ;token_url = https://foo.bar/login/oauth/access_token @@ -323,7 +323,7 @@ data: ;enabled = false ;allow_sign_up = true ;client_id = some_id - ;client_secret = some_secret + ;client_secret = some_secret #property is not used as it is commented out #pragma: allowlist secret ;scopes = user:email ;allowed_organizations = diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/res/jmeter.properties b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/res/jmeter.properties index 02bd43e0f..72cde0228 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/res/jmeter.properties +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager.ivt/src/main/res/jmeter.properties @@ -316,7 +316,7 @@ remote_hosts=127.0.0.1 #server.rmi.ssl.keystore.file=rmi_keystore.jks # # Password of Keystore -#server.rmi.ssl.keystore.password=changeit +#server.rmi.ssl.keystore.password=changeit #property is not used as it is commented out #pragma: allowlist secret # # Key alias #server.rmi.ssl.keystore.alias=rmi @@ -328,7 +328,7 @@ remote_hosts=127.0.0.1 #server.rmi.ssl.truststore.file=rmi_keystore.jks # # Password of Trust store -#server.rmi.ssl.truststore.password=changeit +#server.rmi.ssl.truststore.password=changeit #property is not used as it is commented out #pragma: allowlist secret # # Set this if you don't want to use SSL for RMI #server.rmi.ssl.disable= false diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/shared/LinuxSharedImage.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/shared/LinuxSharedImage.java index 8c6400fc8..f56ba7215 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/shared/LinuxSharedImage.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/shared/LinuxSharedImage.java @@ -78,7 +78,7 @@ public LinuxSharedImage(LinuxManagerImpl manager, String tag, String hostid, Str throw new LinuxManagerException("useradd of username " + this.username + " failed:-\n" + response); } - String tempPassword = "ThisIsTheFutureOfTesting"; + String tempPassword = "ThisIsTheFutureOfTesting"; //Not a secret but this raises a vulnerability on server side runs. Issue has been raised to correct this //pragma: allowlist secret for(int i = 0; i < 4; i++) { tempPassword = tempPassword + Integer.toString(this.random.nextInt(10)); } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java index 128d936b7..f72653f4a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java @@ -90,7 +90,7 @@ public void testGeConvertToDatastream() throws Exception { System.out.println(hexDatastream); - assertThat(hexDatastream).as("Expected outbound datastream").isEqualTo("7D40401140C1F1F20850F3F4"); + assertThat(hexDatastream).as("Expected outbound datastream").isEqualTo("7D40401140C1F1F20850F3F4"); // expected output as a hex code, not a secret //pragma: allowlist secret } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestColour.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestColour.java index 51f710671..76282f600 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestColour.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestColour.java @@ -22,7 +22,7 @@ public class TestColour extends Zos3270TestBase { public static void main(String[] args) throws DecoderException, Zos3270Exception { - String inbound = "f5c2115b611311c2601df8d59699948193408689859384a211c5401df0d596999481931df8c995a38595a28511c6501d40e385a2a340c99597a4a3404040401df011c8f0290341f442f7c0f8c889878893898788a3899587114b50290341f242f2c0f0d9858440d985a58599a285290341f242f2c0f0d98584408187818995114c6f290341f242f1c0f0c293a48540d985a58599a285290341f242f3c0f0d789959240d985a58599a285290341f242f4c0f0c79985859540d985a58599a285290341f242f5c0f0e3a49998a49689a28540d985a58599a285114df0290341f242f7c0f0e68889a38540d985a58599a28511505e290341f442f6c0f0e885939396a640e4958485999389958511d27a290341f142f6c0f0e885939396a640c29389959211d55c290242f6c0f0e885939396a640d6a4a393899585114c60290341f242f6c0f0e885939396a640d985a58599a285114040290242f7c0f0e385a2a340c5a7a3859584858440c481a381a2a39985819440d4819711d550290242f2c0f0d9858440d6a4a39389958511d940290242f2c0f0d98584290242f1c0f0c293a485290242f3c0f0d7899592290242f4c0f0c799858595290242f5c0f0e3a49998a49689a285290242f6c0f0e885939396a6290242f7c0f0e68889a3851df0c4858681a493a3115a50290242f2c0f8d98584290242f1c0f8c293a485290242f3c0f8d7899592290242f4c0f8c799858595290242f5c0f8e3a49998a49689a285290242f6c0f8e885939396a6290242f7c0f8e68889a3851df8c4858681a493a311d2f0290341f142f2c0f0d9858440c293899592115050290341f442f2c0f0d9858440e49584859993899585115b60290341f442f4c0c1115c6f1df0"; + String inbound = "f5c2115b611311c2601df8d59699948193408689859384a211c5401df0d596999481931df8c995a38595a28511c6501d40e385a2a340c99597a4a3404040401df011c8f0290341f442f7c0f8c889878893898788a3899587114b50290341f242f2c0f0d9858440d985a58599a285290341f242f2c0f0d98584408187818995114c6f290341f242f1c0f0c293a48540d985a58599a285290341f242f3c0f0d789959240d985a58599a285290341f242f4c0f0c79985859540d985a58599a285290341f242f5c0f0e3a49998a49689a28540d985a58599a285114df0290341f242f7c0f0e68889a38540d985a58599a28511505e290341f442f6c0f0e885939396a640e4958485999389958511d27a290341f142f6c0f0e885939396a640c29389959211d55c290242f6c0f0e885939396a640d6a4a393899585114c60290341f242f6c0f0e885939396a640d985a58599a285114040290242f7c0f0e385a2a340c5a7a3859584858440c481a381a2a39985819440d4819711d550290242f2c0f0d9858440d6a4a39389958511d940290242f2c0f0d98584290242f1c0f0c293a485290242f3c0f0d7899592290242f4c0f0c799858595290242f5c0f0e3a49998a49689a285290242f6c0f0e885939396a6290242f7c0f0e68889a3851df0c4858681a493a3115a50290242f2c0f8d98584290242f1c0f8c293a485290242f3c0f8d7899592290242f4c0f8c799858595290242f5c0f8e3a49998a49689a285290242f6c0f8e885939396a6290242f7c0f8e68889a3851df8c4858681a493a311d2f0290341f142f2c0f0d9858440c293899592115050290341f442f2c0f0d9858440e49584859993899585115b60290341f442f4c0c1115c6f1df0"; // expected input as a hex code, not a secret //pragma: allowlist secret byte[] inboundBytes = Hex.decodeHex(inbound); Network network = new Network("here", 1, "a"); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestInbound.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestInbound.java index c76c03dde..9f8216bfa 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestInbound.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/t/TestInbound.java @@ -26,7 +26,7 @@ public static void main(String[] args) throws TerminalInterruptedException, Netw // String inbound = "f5c01140c1131140401d004a54444a53303120776173207375636365737366756c2e204a534f4e20636f6e76657274656420746f20446174612e2020205472616e73666f726d20636f6d6d616e64207375636365737366756c2e1d00200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001d00200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001d00200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001d0020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"; - String inbound1 = "f5c311c5e41311405d290242f1c0f8c3e5c6d4e2f0f140e3c5e2e340d4c1d7e2c5e311c5d21d60c3e4e2e3d6d4c5d940d5e4d4c2c5d97a1dd1f1f1f1f1f1f11df011c7f6290242f1c060d7c1d9e340d5e4d4c2c5d97a1dd1f2f2f2f2f2f2f2f2f2f21df0114ad9290242f1c060d8e4c1d5e3c9e3e87a1dd1f3f3f3f340401df0115a50290242f2c061c3d6d5e3d9d6d340e3c5e2e34040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040"; + String inbound1 = "f5c311c5e41311405d290242f1c0f8c3e5c6d4e2f0f140e3c5e2e340d4c1d7e2c5e311c5d21d60c3e4e2e3d6d4c5d940d5e4d4c2c5d97a1dd1f1f1f1f1f1f11df011c7f6290242f1c060d7c1d9e340d5e4d4c2c5d97a1dd1f2f2f2f2f2f2f2f2f2f21df0114ad9290242f1c060d8e4c1d5e3c9e3e87a1dd1f3f3f3f340401df0115a50290242f2c061c3d6d5e3d9d6d340e3c5e2e34040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040"; // expected input as a hex code, not a secret //pragma: allowlist secret String inbound2 = "f140114040124040"; String inbound3 = "f1c611c26013"; byte[] inbound1Bytes = Hex.decodeHex(inbound1); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosDatasetAttributesListdsi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosDatasetAttributesListdsi.java index 9c9a88a04..93725a7e8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosDatasetAttributesListdsi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.rseapi.manager/src/main/java/dev/galasa/zosfile/rseapi/manager/internal/RseapiZosDatasetAttributesListdsi.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.rseapi.manager.internal; import java.io.BufferedReader; @@ -58,7 +58,7 @@ public class RseapiZosDatasetAttributesListdsi { private static final String PROP_SYSCREATE = "syscreate"; private static final String PROP_SYSREFDATE = "sysrefdate"; private static final String PROP_SYSEXDATE = "sysexdate"; - private static final String PROP_SYSPASSWORD = "syspassword"; + private static final String PROP_SYSPASSWORD = "syspassword"; //Not a password but a pointer to a password //pragma: allowlist secret private static final String PROP_SYSRACFA = "sysracfa"; private static final String PROP_SYSUPDATED = "sysupdated"; private static final String PROP_SYSTRKSCYL = "systrkscyl"; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosDatasetAttributesListdsi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosDatasetAttributesListdsi.java index bfd53084c..5dbee28ce 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosDatasetAttributesListdsi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosfile.zosmf.manager/src/main/java/dev/galasa/zosfile/zosmf/manager/internal/ZosmfZosDatasetAttributesListdsi.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile.zosmf.manager.internal; import java.io.BufferedReader; @@ -61,7 +61,7 @@ public class ZosmfZosDatasetAttributesListdsi { private static final String PROP_SYSCREATE = "syscreate"; private static final String PROP_SYSREFDATE = "sysrefdate"; private static final String PROP_SYSEXDATE = "sysexdate"; - private static final String PROP_SYSPASSWORD = "syspassword"; + private static final String PROP_SYSPASSWORD = "syspassword"; //Not a password but a pointer to a password //pragma: allowlist secret private static final String PROP_SYSRACFA = "sysracfa"; private static final String PROP_SYSUPDATED = "sysupdated"; private static final String PROP_SYSTRKSCYL = "systrkscyl"; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestServerCreds.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestServerCreds.java index 82fee88e1..04f944e70 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestServerCreds.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/test/java/dev/galasa/zosmf/internal/properties/TestServerCreds.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosmf.internal.properties; import org.junit.Assert; @@ -28,7 +28,7 @@ public class TestServerCreds { // // private static final String SERVER_ID = "server"; // -// private static final String CREDS = "creds"; +// private static final String CREDS = "creds"; commented out unit test //pragma: allowlist secret // // @Test // public void testConstructor() { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestServerCreds.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestServerCreds.java index f8f46558c..98e256798 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestServerCreds.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/test/java/dev/galasa/zosrseapi/internal/properties/TestServerCreds.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosrseapi.internal.properties; import org.junit.Assert; @@ -28,7 +28,7 @@ public class TestServerCreds { // // private static final String SERVER_ID = "server"; // -// private static final String CREDS = "creds"; +// private static final String CREDS = "creds"; commented out unit test //pragma: allowlist secret // // @Test // public void testConstructor() { From dd5f2945b3095bba894ad4a0cb15bc40368ca0cd Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Tue, 4 Jun 2024 15:38:03 +0100 Subject: [PATCH 194/263] added .pre-commit-config.yaml file to trigger detect-secrets Signed-off-by: Savvas Kyriacou --- .pre-commit-config.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 000000000..3e262ed5d --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,6 @@ +repos: + - repo: https://github.com/ibm/detect-secrets + rev: 0.13.1+ibm.62.dss + hooks: + - id: detect-secrets # pragma: whitelist secret + args: [--baseline, .secrets.baseline, --use-all-plugins, --fail-on-unaudited] \ No newline at end of file From 239a01bb68e3f572b6719ef650611000d5ab0ba3 Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Wed, 5 Jun 2024 16:53:34 +0100 Subject: [PATCH 195/263] added sed command to remove the generated at to prevent merge conflicts Signed-off-by: Savvas Kyriacou --- .secrets.baseline | 1 - build-locally.sh | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.secrets.baseline b/.secrets.baseline index 6734c89e3..fafda2d67 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,6 @@ "files": "^.secrets.baseline$", "lines": null }, - "generated_at": "2024-06-03T14:55:28Z", "plugins_used": [ { "name": "AWSKeyDetector" diff --git a/build-locally.sh b/build-locally.sh index 4f60457e6..bca3a8628 100755 --- a/build-locally.sh +++ b/build-locally.sh @@ -220,6 +220,7 @@ function check_secrets { error "Not all secrets found have been audited" exit 1 fi + sed -i '' '/[ ]*"generated_at": ".*",/d' .secrets.baseline success "secrets audit complete" } From 140cea41b3be31a8bbcf9968b567735a50dc6d2d Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Fri, 7 Jun 2024 15:23:58 +0100 Subject: [PATCH 196/263] bumped version of jta to the new package version Signed-off-by: Savvas Kyriacou --- .../dev.galasa.db2.manager/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle index 357db1e8b..0775b9372 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle @@ -9,7 +9,7 @@ version = '0.34.0' dependencies { // implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') implementation 'com.ibm.db2.jcc:db2jcc:db2jcc4' - implementation 'dev.galasa:jta:1.1' + implementation 'dev.galasa:jta:1.2' } // Note: These values are consumed by the parent build process From b6d58ce12d7e0becdca22c0b53a579de67fb6ed1 Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Fri, 7 Jun 2024 16:40:22 +0100 Subject: [PATCH 197/263] Empty Commit to trigger build. Signed-off-by: Savvas Kyriacou From 7f74262adb6efc68275972bdd3e2eb79f23404db Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Tue, 11 Jun 2024 13:52:57 +0100 Subject: [PATCH 198/263] Upgrade versions to 0.34.1 for patch Signed-off-by: Jade Carino --- galasa-managers-parent/build.gradle | 4 ++-- .../buildSrc/src/main/groovy/galasa.manager.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index 389fa9a7c..84fee8772 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -9,7 +9,7 @@ plugins { // It is used as the version number of the managers bundle, which contains a yaml // file which is in a release.yaml, but published to maven, so that the OBR build // can pick it up later. -version = "0.34.0" +version = "0.34.1" // A configuration to publish the merge exec into configurations { @@ -192,7 +192,7 @@ publishing { name = "Manifest for managers bundle versions" artifactId = "dev.galasa.managers.manifest" groupId = 'dev.galasa' - version = "0.34.0" + version = "0.34.1" description = "Conveys bundle version information to OBR builds." licenses { license { diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle index 438a1bc38..45c502e72 100644 --- a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle +++ b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle @@ -6,7 +6,7 @@ plugins { dependencies { api 'dev.galasa:dev.galasa:0.34.0' - implementation 'dev.galasa:dev.galasa.framework:0.34.0' + implementation 'dev.galasa:dev.galasa.framework:0.34.1' implementation 'commons-logging:commons-logging:1.2' implementation 'org.osgi:org.osgi.core:6.0.0' implementation 'org.osgi:org.osgi.service.component.annotations:1.3.0' From 3cfc784bdfa6afb9a11cc1d9c409877d8e4cd257 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 12 Jun 2024 13:08:01 +0100 Subject: [PATCH 199/263] Bump dev version to 0.35.0 Signed-off-by: Jade Carino --- galasa-managers-parent/build.gradle | 4 ++-- .../buildSrc/src/main/groovy/galasa.manager.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index 84fee8772..ffe4a44e3 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -9,7 +9,7 @@ plugins { // It is used as the version number of the managers bundle, which contains a yaml // file which is in a release.yaml, but published to maven, so that the OBR build // can pick it up later. -version = "0.34.1" +version = "0.35.0" // A configuration to publish the merge exec into configurations { @@ -192,7 +192,7 @@ publishing { name = "Manifest for managers bundle versions" artifactId = "dev.galasa.managers.manifest" groupId = 'dev.galasa' - version = "0.34.1" + version = "0.35.0" description = "Conveys bundle version information to OBR builds." licenses { license { diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle index 45c502e72..64da827a6 100644 --- a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle +++ b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle @@ -6,7 +6,7 @@ plugins { dependencies { api 'dev.galasa:dev.galasa:0.34.0' - implementation 'dev.galasa:dev.galasa.framework:0.34.1' + implementation 'dev.galasa:dev.galasa.framework:0.35.0' implementation 'commons-logging:commons-logging:1.2' implementation 'org.osgi:org.osgi.core:6.0.0' implementation 'org.osgi:org.osgi.service.component.annotations:1.3.0' From 2e5d78f0a97820ce5ff66cdc03ec9f66036d9a2b Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 12 Jun 2024 13:39:57 +0100 Subject: [PATCH 200/263] Empty for build Signed-off-by: Jade Carino From e95636b75ed138b165371924e878434ad2cf5ba4 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Thu, 13 Jun 2024 15:52:22 +0100 Subject: [PATCH 201/263] Small extra detail to gherkin docs Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../dev.galasa.zos3270.manager/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/README.md b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/README.md index c57783d74..361683938 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/README.md +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/README.md @@ -35,6 +35,8 @@ Where xxxxxx is the text in an protected or unprotected field on the screen. `AND press terminal key ENTER` +`AND press terminal key BACKTAB` + `AND press terminal key PFxx` where xx is the PF number ### Type something From 66fd9020db1ce29a56024161cb22816cfdb3c3eb Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Thu, 13 Jun 2024 16:14:53 +0100 Subject: [PATCH 202/263] Add instructions for running the Db2 IVT locally Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../dev.galasa.db2.manager.ivt/README.md | 135 ++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/README.md diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/README.md b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/README.md new file mode 100644 index 000000000..1076e9b07 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/README.md @@ -0,0 +1,135 @@ +# Running the Db2 Manager IVT locally + +To run the Db2 manager IVT, it requires a Db2 instance to connect to. This can be achieved locally using [Db2 Community Edition for Docker](https://www.ibm.com/docs/en/db2/11.5?topic=deployments-db2-community-edition-docker). + +## Prerequisites + +You will need: + +- Docker engine (e.g. using [Rancher Desktop](https://rancherdesktop.io) or [colima](https://github.com/abiosoft/colima)) +- [galasactl](https://github.com/galasa-dev/cli/releases) +- Gradle 6.8.2 + +### Running on Apple Silicon + +**If you are not on an Apple Silicon machine (e.g. M1 MacBook), you can skip this section.** + +Since the Db2 Community Edition Docker image is only built for x86-based machines, if you are on an Apple Silicon machine, you can start an x86_64 Docker environment with Rosetta emulation, using [colima](https://github.com/abiosoft/colima). + +To do this: + +1. Install colima with `brew install colima` +2. Start the x86_64 Docker environment by running: + ```bash + colima start --arch x86_64 --vm-type=vz --vz-rosetta + ``` +3. Verify that your Docker context is set to the new `colima` context using `docker context ls`. The output should look like this: + ```bash + NAME DESCRIPTION DOCKER ENDPOINT ERROR + colima * colima unix:///Users/em/.colima/default/docker.sock + default Current DOCKER_HOST based configuration unix:///var/run/docker.sock + rancher-desktop Rancher Desktop moby context unix:///Users/em/.rd/docker.sock + ``` + +## Steps + +### 1. Running Db2 in a Docker container + +More guidance around running Db2 on different operating systems can be found [here](https://www.ibm.com/docs/en/db2/11.5?topic=system-linux). + +To run Db2 locally, you can start a Docker container as follows: + +1. Create a `.env_list` file with the following contents: + ``` + LICENSE=accept + DB2INSTANCE=db2inst1 + DB2INST1_PASSWORD=password + DBNAME=testdb + BLU=false + ENABLE_ORACLE_COMPATIBILITY=false + UPDATEAVAIL=NO + TO_CREATE_SAMPLEDB=false + REPODB=false + IS_OSXFS=true + PERSISTENT_HOME=false + HADR_ENABLED=false + ``` + + Note: the `DB2INSTANCE` and `DB2INST1_PASSWORD` values will be used as the credentials to connect to the Db2 server in the IVT. + +2. Pull the Db2 Docker image from ICR: + ```bash + docker pull icr.io/db2_community/db2 + ``` +3. Run a Db2 Docker container, making sure `/path/to/.env_list` is replaced with the actual absolute or relative path to the `.env_list` file you created earlier: + ```bash + docker run -h db2server --name db2server --restart=always --detach --privileged=true -p 50000:50000 --env-file /path/to/.env_list icr.io/db2_community/db2 + ``` +4. It may take a while for Db2 to start, so you can view the logs of the created Docker container until a `(*) Setup has completed` message appears: + ```bash + docker logs db2server -f + ``` + +5. Verify that the testdb database was created by logging into the Db2 Docker container: + ```bash + docker exec -ti db2server bash -c "su - db2inst1" + ``` + + Then, inside the Docker container, run: + ```bash + db2 list db directory + ``` + + The output should look like similar to the output below: + ```bash + [db2inst1@db2server ~]$ db2 list db directory + + System Database Directory + + Number of entries in the directory = 1 + + Database 1 entry: + + Database alias = TESTDB + Database name = TESTDB + Local database directory = /database/data + Database release level = 15.00 + Comment = + Directory entry type = Indirect + Catalog database partition number = 0 + Alternate server hostname = + Alternate server port number = + ``` + +### 2. Setting CPS properties and Credentials + +Once the Docker container running Db2 is working: + +1. Add the following properties to your `cps.properties` file: + + ```properties + db2.dse.instance.PRIMARY.name=DB2INST1 + db2.dse.schema.PRIMARY.name=testdb + db2.instance.DB2INST1.url=jdbc:db2://127.0.0.1:50000/testdb + db2.instance.DB2INST1.credentials=TESTDB + ``` + +2. Add the following properties to your `credentials.properties` file: + + ```properties + secure.credentials.TESTDB.username=db2inst1 + secure.credentials.TESTDB.password=password + ``` + +### 3. Running the Db2 manager IVT + +Having configured your `cps.properties` and `credentials.properties` files, you should now be able to run the Db2 manager IVT using `galasactl`: + +1. Build the `managers` project using the `build-locally.sh` script: + ```bash + ./build-locally -c + ``` +2. Run the Db2 manager IVT, replacing `0.34.0` with the relevant Galasa OBR version you wish to use: + ```bash + galasactl runs submit local --obr mvn:dev.galasa/dev.galasa.uber.obr/0.34.0/obr --class dev.galasa.db2.manager.ivt/dev.galasa.db2.manager.ivt.Db2ManagerIVT --log - + ``` \ No newline at end of file From fbff833025fca80e4cd9b208371bd52421e3115c Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Tue, 18 Jun 2024 09:55:54 +0100 Subject: [PATCH 203/263] Upgrading the DB2 Manager for sanity check Signed-off-by: Jade Carino --- .../dev.galasa.db2.manager/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle index 0775b9372..901eada67 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Db2 Manager' -version = '0.34.0' +version = '0.35.0' dependencies { // implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') From 57cff319753319edb870cb8a8983874ed2e95077 Mon Sep 17 00:00:00 2001 From: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> Date: Tue, 18 Jun 2024 15:48:05 +0100 Subject: [PATCH 204/263] use correct cics tag used in ivts Signed-off-by: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> --- .../main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/src/main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/src/main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java index 0e285ecb9..8d993a7d0 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/src/main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/src/main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java @@ -26,13 +26,13 @@ public class SdvManagerIVT { @Logger public Log logger; - @CicsRegion + @CicsRegion(cicsTag = "A") public ICicsRegion cics; - @CicsTerminal + @CicsTerminal(cicsTag = "A") public ICicsTerminal terminal; - @SdvUser(roleTag = "role1") + @SdvUser(cicsTag = "A", roleTag = "R1") public ISdvUser user1; private static final String SDV_TCPIPSERVICE_NAME = "SDVXSDT"; From 31bf7f6dc7f4e3a96b4a77a4204d6076db495032 Mon Sep 17 00:00:00 2001 From: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> Date: Tue, 18 Jun 2024 16:05:12 +0100 Subject: [PATCH 205/263] sdv ivt version increment Signed-off-by: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> --- .../dev.galasa.sdv.manager.ivt/build.gradle | 2 +- .../main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java | 5 ----- release.yaml | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/build.gradle index 431a18aca..d993f5c54 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa SDV Manager IVT' -version = '0.34.0' +version = '0.35.0' dependencies { implementation project (':galasa-managers-cicsts-parent:dev.galasa.cicsts.ceci.manager') diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/src/main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/src/main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java index 8d993a7d0..78afc3897 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/src/main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/src/main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java @@ -11,9 +11,7 @@ import dev.galasa.BeforeClass; import dev.galasa.Test; -import dev.galasa.cicsts.CicsRegion; import dev.galasa.cicsts.CicsTerminal; -import dev.galasa.cicsts.ICicsRegion; import dev.galasa.cicsts.ICicsTerminal; import dev.galasa.core.manager.Logger; import dev.galasa.sdv.ISdvUser; @@ -26,9 +24,6 @@ public class SdvManagerIVT { @Logger public Log logger; - @CicsRegion(cicsTag = "A") - public ICicsRegion cics; - @CicsTerminal(cicsTag = "A") public ICicsTerminal terminal; diff --git a/release.yaml b/release.yaml index 850117904..ccea2ed57 100644 --- a/release.yaml +++ b/release.yaml @@ -328,7 +328,7 @@ managers: codecoverage: true - artifact: dev.galasa.sdv.manager.ivt - version: 0.34.0 + version: 0.35.0 obr: true mvp: true isolated: true From a802bba1d7be7ebc4a5ebe28801eae9afa062f66 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Tue, 18 Jun 2024 18:50:58 +0100 Subject: [PATCH 206/263] Upgrade JTA wrapper depended on in DB2 Manager to 2.0.1 Signed-off-by: Jade Carino --- .secrets.baseline | 13 ++++++++++++- galasa-managers-parent/build.gradle | 1 + .../dev.galasa.db2.manager/build.gradle | 2 +- release.yaml | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index fafda2d67..91932d663 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -75,7 +75,18 @@ "name": "TwilioKeyDetector" } ], - "results": {}, + "results": { + "galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/README.md": [ + { + "hashed_secret": "22199ec38c6bedb7616f8e42aa3ad6e9f196cd24", + "is_secret": false, + "is_verified": false, + "line_number": 114, + "type": "Secret Keyword", + "verified_result": null + } + ] + }, "version": "0.13.1+ibm.62.dss", "word_list": { "file": null, diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index ffe4a44e3..2415fd641 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -41,6 +41,7 @@ task jacocoMerge(type: JacocoMerge) { } repositories { + mavenLocal() maven { url "$sourceMaven" } diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle index 901eada67..d9a32487c 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle @@ -9,7 +9,7 @@ version = '0.35.0' dependencies { // implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager') implementation 'com.ibm.db2.jcc:db2jcc:db2jcc4' - implementation 'dev.galasa:jta:1.2' + implementation 'dev.galasa:jta:2.0.1' } // Note: These values are consumed by the parent build process diff --git a/release.yaml b/release.yaml index 850117904..dc4579f9f 100644 --- a/release.yaml +++ b/release.yaml @@ -134,7 +134,7 @@ managers: isolated: true - artifact: dev.galasa.db2.manager - version: 0.34.0 + version: 0.35.0 obr: true bom: true javadoc: true From f8136ea6d9289670fd207bdb87d1b733f58b3a32 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Tue, 18 Jun 2024 22:18:38 +0100 Subject: [PATCH 207/263] Update bundle file for DB2 Manager Signed-off-by: Jade Carino --- build-locally.sh | 2 +- .../dev.galasa.db2.manager/bnd.bnd | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build-locally.sh b/build-locally.sh index bca3a8628..ef44f33cf 100755 --- a/build-locally.sh +++ b/build-locally.sh @@ -135,7 +135,7 @@ fi # Over-rode SOURCE_MAVEN if you want to build from a different maven repo... if [[ -z ${SOURCE_MAVEN} ]]; then - export SOURCE_MAVEN=https://development.galasa.dev/main/maven-repo/extensions/ + export SOURCE_MAVEN=https://development.galasa.dev/jade-jta/maven-repo/extensions/ info "SOURCE_MAVEN repo defaulting to ${SOURCE_MAVEN}." info "Set this environment variable if you want to over-ride this value." else diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/bnd.bnd index 80beccf94..709ec4b07 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/bnd.bnd @@ -2,7 +2,11 @@ Bundle-Name: Galasa Db2 Manager Export-Package: dev.galasa.db2,\ dev.galasa.db2.spi -Import-Package: !javax.validation.constraints, \ +Import-Package: jakarta.transaction, \ + jakarta.transaction.xa, \ + !javax.transaction, \ + !javax.transaction.xa, \ + !javax.validation.constraints, \ !com.ibm.bidiTools.bdlayout, \ !com.ibm.cics.server, \ com.ibm.dataaccess, \ From 4d265e1911fc484a26c416650427478a257cd5a1 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Tue, 18 Jun 2024 22:19:18 +0100 Subject: [PATCH 208/263] Remove my branch from build script Signed-off-by: Jade Carino --- build-locally.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-locally.sh b/build-locally.sh index ef44f33cf..bca3a8628 100755 --- a/build-locally.sh +++ b/build-locally.sh @@ -135,7 +135,7 @@ fi # Over-rode SOURCE_MAVEN if you want to build from a different maven repo... if [[ -z ${SOURCE_MAVEN} ]]; then - export SOURCE_MAVEN=https://development.galasa.dev/jade-jta/maven-repo/extensions/ + export SOURCE_MAVEN=https://development.galasa.dev/main/maven-repo/extensions/ info "SOURCE_MAVEN repo defaulting to ${SOURCE_MAVEN}." info "Set this environment variable if you want to over-ride this value." else From 71db46966ed1850f577180d72c38c12067595dfb Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 19 Jun 2024 12:56:48 +0100 Subject: [PATCH 209/263] Update bundle file for DB2 Manager Signed-off-by: Jade Carino --- build-locally.sh | 2 +- .../dev.galasa.db2.manager/bnd.bnd | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build-locally.sh b/build-locally.sh index bca3a8628..ef44f33cf 100755 --- a/build-locally.sh +++ b/build-locally.sh @@ -135,7 +135,7 @@ fi # Over-rode SOURCE_MAVEN if you want to build from a different maven repo... if [[ -z ${SOURCE_MAVEN} ]]; then - export SOURCE_MAVEN=https://development.galasa.dev/main/maven-repo/extensions/ + export SOURCE_MAVEN=https://development.galasa.dev/jade-jta/maven-repo/extensions/ info "SOURCE_MAVEN repo defaulting to ${SOURCE_MAVEN}." info "Set this environment variable if you want to over-ride this value." else diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/bnd.bnd index 709ec4b07..3876241d2 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/bnd.bnd @@ -4,8 +4,11 @@ Export-Package: dev.galasa.db2,\ dev.galasa.db2.spi Import-Package: jakarta.transaction, \ jakarta.transaction.xa, \ + !jakarta.enterprise.util, \ + !jakarta.interceptor, \ + !jakarta.enterprise.context, \ !javax.transaction, \ - !javax.transaction.xa, \ + javax.transaction.xa, \ !javax.validation.constraints, \ !com.ibm.bidiTools.bdlayout, \ !com.ibm.cics.server, \ From 5acfa57880e1be470edc137d4eb4a23b223e0848 Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Wed, 19 Jun 2024 14:41:02 +0100 Subject: [PATCH 210/263] updated db2 manager bundle file to include javax packages for jdbc connector Signed-off-by: Savvas Kyriacou --- .../dev.galasa.db2.manager/bnd.bnd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/bnd.bnd index 3876241d2..9257d2961 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/bnd.bnd +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/bnd.bnd @@ -4,11 +4,11 @@ Export-Package: dev.galasa.db2,\ dev.galasa.db2.spi Import-Package: jakarta.transaction, \ jakarta.transaction.xa, \ + javax.transaction, \ + javax.transaction.xa, \ !jakarta.enterprise.util, \ !jakarta.interceptor, \ !jakarta.enterprise.context, \ - !javax.transaction, \ - javax.transaction.xa, \ !javax.validation.constraints, \ !com.ibm.bidiTools.bdlayout, \ !com.ibm.cics.server, \ From f7976010fc6897ff81b1c7a4a6b943948d65d302 Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Wed, 19 Jun 2024 15:38:55 +0100 Subject: [PATCH 211/263] corrected Source maven url Signed-off-by: Savvas Kyriacou --- build-locally.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-locally.sh b/build-locally.sh index ef44f33cf..bca3a8628 100755 --- a/build-locally.sh +++ b/build-locally.sh @@ -135,7 +135,7 @@ fi # Over-rode SOURCE_MAVEN if you want to build from a different maven repo... if [[ -z ${SOURCE_MAVEN} ]]; then - export SOURCE_MAVEN=https://development.galasa.dev/jade-jta/maven-repo/extensions/ + export SOURCE_MAVEN=https://development.galasa.dev/main/maven-repo/extensions/ info "SOURCE_MAVEN repo defaulting to ${SOURCE_MAVEN}." info "Set this environment variable if you want to over-ride this value." else From 7021f9180a13828891c5b1408a7dff25b2ef7a53 Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Wed, 19 Jun 2024 16:12:11 +0100 Subject: [PATCH 212/263] Empty Commit to trigger build. Signed-off-by: Savvas Kyriacou From 294c6ef3ccde1fbb0c9b58a100dff3a0d7590b5c Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Thu, 27 Jun 2024 14:17:07 +0100 Subject: [PATCH 213/263] Bump managers to 0.36.0 (#950) * Bump managers to 0.36.0 Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> * Empty commit to kick off build Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --------- Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- galasa-managers-parent/build.gradle | 4 ++-- .../buildSrc/src/main/groovy/galasa.manager.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index 2415fd641..0922eb38c 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -9,7 +9,7 @@ plugins { // It is used as the version number of the managers bundle, which contains a yaml // file which is in a release.yaml, but published to maven, so that the OBR build // can pick it up later. -version = "0.35.0" +version = "0.36.0" // A configuration to publish the merge exec into configurations { @@ -193,7 +193,7 @@ publishing { name = "Manifest for managers bundle versions" artifactId = "dev.galasa.managers.manifest" groupId = 'dev.galasa' - version = "0.35.0" + version = "0.36.0" description = "Conveys bundle version information to OBR builds." licenses { license { diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle index 64da827a6..8ed2c9f74 100644 --- a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle +++ b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle @@ -6,7 +6,7 @@ plugins { dependencies { api 'dev.galasa:dev.galasa:0.34.0' - implementation 'dev.galasa:dev.galasa.framework:0.35.0' + implementation 'dev.galasa:dev.galasa.framework:0.36.0' implementation 'commons-logging:commons-logging:1.2' implementation 'org.osgi:org.osgi.core:6.0.0' implementation 'org.osgi:org.osgi.service.component.annotations:1.3.0' From 3775484c8bc1383140f94910c7086fdf6ed534d8 Mon Sep 17 00:00:00 2001 From: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> Date: Tue, 2 Jul 2024 17:59:51 +0100 Subject: [PATCH 214/263] use dedicated cics region for test Signed-off-by: Mark Lawrence <15652599+Mark-J-Lawrence@users.noreply.github.com> --- .../main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/src/main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/src/main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java index 78afc3897..d6383f238 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/src/main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/src/main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java @@ -24,10 +24,10 @@ public class SdvManagerIVT { @Logger public Log logger; - @CicsTerminal(cicsTag = "A") + @CicsTerminal(cicsTag = "SDVIVT") public ICicsTerminal terminal; - @SdvUser(cicsTag = "A", roleTag = "R1") + @SdvUser(cicsTag = "SDVIVT", roleTag = "R1") public ISdvUser user1; private static final String SDV_TCPIPSERVICE_NAME = "SDVXSDT"; From e2e6f3b6a7b7dcdf722019ca3cef0d1846101802 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Wed, 3 Jul 2024 15:51:50 +0100 Subject: [PATCH 215/263] Update release.yaml using the auto-generated release.yaml during local builds Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- build-locally.sh | 16 + release.yaml | 947 +++++++++++++++++++++++++++-------------------- 2 files changed, 554 insertions(+), 409 deletions(-) diff --git a/build-locally.sh b/build-locally.sh index bca3a8628..c2508401d 100755 --- a/build-locally.sh +++ b/build-locally.sh @@ -224,7 +224,23 @@ function check_secrets { success "secrets audit complete" } +function update_release_yaml { + h2 "Updating release.yaml" + + # After running 'gradle build', a release.yaml file should have been automatically generated + generated_release_yaml="${BASEDIR}/galasa-managers-parent/build/release.yaml" + current_release_yaml="${BASEDIR}/release.yaml" + + if [[ -f ${generated_release_yaml} ]]; then + cp ${generated_release_yaml} ${current_release_yaml} + success "Updated release.yaml OK" + else + warn "Failed to automatically generate release.yaml, please ensure any changed bundles have had their versions updated in ${current_release_yaml}" + fi +} + build_code +update_release_yaml check_secrets \ No newline at end of file diff --git a/release.yaml b/release.yaml index 9cdf00002..74c688c20 100644 --- a/release.yaml +++ b/release.yaml @@ -1,8 +1,15 @@ # -# Copyright contributors to the Galasa project +# Copyright contributors to the Galasa project # -# SPDX-License-Identifier: EPL-2.0 + +# ----------------------------------------------------------- +# +# WARNING # +# This file is periodically re-generated from the contents of +# the repository, so don't make changes here manually please. +# ----------------------------------------------------------- + apiVersion: galasa.dev/v1alpha kind: Release @@ -14,522 +21,644 @@ managers: # # Manager -# +# - - artifact: dev.galasa.artifact.manager - version: 0.34.0 - obr: true - javadoc: true - bom: true - mvp: true - isolated: true - codecoverage: true - - - artifact: dev.galasa.artifact.manager.ivt - version: 0.25.0 - obr: true - mvp: true - isolated: true - - - artifact: dev.galasa.cicsts.manager - version: 0.32.0 - obr: true - mvp: true - javadoc: true - bom: true - isolated: true - codecoverage: true - - artifact: dev.galasa.cicsts.manager.ivt - version: 0.22.0 - obr: true - mvp: true - bom: true - isolated: true - - artifact: dev.galasa.cicsts.ceci.manager version: 0.25.0 - obr: true - mvp: true - javadoc: true - bom: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: true + isolated: true codecoverage: true - artifact: dev.galasa.cicsts.ceci.manager.ivt version: 0.25.0 - obr: true - mvp: true - bom: true - isolated: true - + obr: true + mvp: true + bom: true + javadoc: false + isolated: true + codecoverage: false + - artifact: dev.galasa.cicsts.ceda.manager version: 0.29.0 - obr: true - mvp: true - javadoc: true - bom: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: true + isolated: true codecoverage: true - + - artifact: dev.galasa.cicsts.ceda.manager.ivt version: 0.22.0 - obr: true - mvp: true - isolated: true - + obr: true + mvp: true + bom: false + javadoc: false + isolated: true + codecoverage: false + - artifact: dev.galasa.cicsts.cemt.manager version: 0.25.0 - obr: true - mvp: true - javadoc: true - bom: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: true + isolated: true codecoverage: true - + - artifact: dev.galasa.cicsts.cemt.manager.ivt version: 0.22.0 - obr: true - mvp: true - isolated: true - + obr: true + mvp: true + bom: false + javadoc: false + isolated: true + codecoverage: false + + - artifact: dev.galasa.cicsts.manager + version: 0.32.0 + obr: true + mvp: true + bom: true + javadoc: true + isolated: true + codecoverage: true + + - artifact: dev.galasa.cicsts.manager.ivt + version: 0.25.0 + obr: true + mvp: true + bom: true + javadoc: false + isolated: false + codecoverage: false + - artifact: dev.galasa.cicsts.resource.manager version: 0.34.0 - obr: true - javadoc: true - bom: true - mvp: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: true + isolated: true codecoverage: true - + - artifact: dev.galasa.cloud.manager version: 0.22.0 - obr: true - javadoc: true - bom: true - mvp: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: true + isolated: true codecoverage: true - - artifact: dev.galasa.common - version: 0.25.0 - obr: true - bom: true - mvp: true - isolated: true - - - artifact: dev.galasa.core.manager - version: 0.31.0 - obr: true - javadoc: true - bom: true - mvp: true - isolated: true - codecoverage: true - - - artifact: dev.galasa.core.manager.ivt - version: 0.21.0 - obr: true - mvp: true - isolated: true - - - artifact: dev.galasa.db2.manager - version: 0.35.0 - obr: true - bom: true - javadoc: true - mvp: true - isolated: true - - - artifact: dev.galasa.db2.manager.ivt - version: 0.34.0 - obr: true - mvp: true - isolated: true - - artifact: dev.galasa.docker.manager version: 0.34.0 - obr: true - javadoc: true - bom: true - mvp: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: true + isolated: true codecoverage: true - + - artifact: dev.galasa.docker.manager.ivt version: 0.25.0 - obr: true - mvp: true - isolated: true - - - artifact: dev.galasa.elasticlog.manager - version: 0.32.0 - obr: true - bom: true - isolated: true - codecoverage: true - - - artifact: dev.galasa.elasticlog.manager.ivt - version: 0.21.0 - obr: true - isolated: true - - - artifact: dev.galasa.galasaecosystem.manager + obr: true + mvp: true + bom: false + javadoc: false + isolated: true + codecoverage: false + + - artifact: dev.galasa.kubernetes.manager version: 0.34.0 - obr: true - bom: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: true + isolated: true codecoverage: true - - artifact: dev.galasa.galasaecosystem.manager.ivt + - artifact: dev.galasa.kubernetes.manager.ivt version: 0.21.0 - obr: true - isolated: true + obr: true + mvp: false + bom: false + javadoc: false + isolated: true + codecoverage: false + + - artifact: dev.galasa.liberty.manager + version: 0.21.0 + obr: true + mvp: true + bom: true + javadoc: true + isolated: true + codecoverage: true + + - artifact: dev.galasa.openstack.manager + version: 0.32.0 + obr: true + mvp: false + bom: true + javadoc: false + isolated: true + codecoverage: true + + - artifact: dev.galasa.common + version: 0.25.0 + obr: true + mvp: true + bom: true + javadoc: false + isolated: true + codecoverage: false - - artifact: dev.galasa.githubissue.manager - version: 0.31.0 - obr: true - mvp: false - bom: true - isolated: false - - artifact: dev.galasa.http.manager version: 0.34.0 - obr: true - javadoc: true - bom: true - mvp: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: true + isolated: true codecoverage: true - + - artifact: dev.galasa.http.manager.ivt version: 0.31.0 - obr: true - mvp: true - isolated: true - + obr: true + mvp: true + bom: false + javadoc: false + isolated: true + codecoverage: false + - artifact: dev.galasa.ipnetwork.manager version: 0.25.0 - obr: true - javadoc: true - bom: true - mvp: true - isolated: true - codecoverage: true - - - artifact: dev.galasa.java.manager - version: 0.21.0 - obr: true - javadoc: true - bom: true - isolated: true - codecoverage: true - - - artifact: dev.galasa.java.ubuntu.manager - version: 0.21.0 - obr: true - javadoc: true - bom: true - isolated: true + obr: true + mvp: true + bom: false + javadoc: false + isolated: true + codecoverage: false + + - artifact: dev.galasa.mq.manager + version: 0.25.0 + obr: true + mvp: false + bom: true + javadoc: true + isolated: true codecoverage: true - - - artifact: dev.galasa.java.windows.manager + + - artifact: dev.galasa.mq.manager.ivt version: 0.21.0 - obr: true - javadoc: true - bom: true - isolated: true + obr: true + mvp: false + bom: true + javadoc: false + isolated: true + codecoverage: false + + - artifact: dev.galasa.artifact.manager + version: 0.34.0 + obr: true + mvp: true + bom: true + javadoc: true + isolated: true codecoverage: true - - - artifact: dev.galasa.jmeter.manager + + - artifact: dev.galasa.artifact.manager.ivt version: 0.25.0 - obr: true - javadoc: true - bom: true - isolated: true + obr: true + mvp: true + bom: false + javadoc: false + isolated: true + codecoverage: false + + - artifact: dev.galasa.core.manager + version: 0.31.0 + obr: true + mvp: true + bom: true + javadoc: true + isolated: true codecoverage: true - - - artifact: dev.galasa.jmeter.manager.ivt - version: 0.25.0 - obr: true - isolated: true - - - artifact: dev.galasa.kubernetes.manager + + - artifact: dev.galasa.core.manager.ivt + version: 0.21.0 + obr: true + mvp: true + bom: false + javadoc: false + isolated: true + codecoverage: false + + - artifact: dev.galasa.textscan.manager version: 0.34.0 - obr: true - javadoc: true - bom: true - mvp: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: true + isolated: true codecoverage: true - - - artifact: dev.galasa.kubernetes.manager.ivt - version: 0.21.0 - obr: true - isolated: true - - - artifact: dev.galasa.liberty.manager + + - artifact: dev.galasa.db2.manager + version: 0.35.0 + obr: true + mvp: true + bom: true + javadoc: true + isolated: true + codecoverage: false + + - artifact: dev.galasa.db2.manager.ivt + version: 0.34.0 + obr: true + mvp: true + bom: false + javadoc: false + isolated: true + codecoverage: false + + - artifact: dev.galasa.eclipseruntime.manager + version: 0.18.0 + obr: false + mvp: false + bom: false + javadoc: false + isolated: false + codecoverage: false + + - artifact: dev.galasa.eclipseruntime.ubuntu.manager + version: 0.18.0 + obr: false + mvp: false + bom: false + javadoc: false + isolated: false + codecoverage: false + + - artifact: dev.galasa.sem.manager + version: 0.25.0 + obr: true + mvp: false + bom: true + javadoc: false + isolated: false + codecoverage: false + + - artifact: dev.galasa.java.manager version: 0.21.0 - obr: true - mvp: true - javadoc: true - bom: true - isolated: true + obr: true + mvp: false + bom: true + javadoc: true + isolated: true codecoverage: true - - - artifact: dev.galasa.linux.manager + + - artifact: dev.galasa.java.ubuntu.manager version: 0.21.0 - obr: true - javadoc: true - bom: true - isolated: true + obr: true + mvp: false + bom: true + javadoc: true + isolated: true codecoverage: true - - - artifact: dev.galasa.linux.manager.ivt - version: 0.21.0 - obr: true - isolated: true - - artifact: dev.galasa.mq.manager - version: 0.25.0 - obr: true - javadoc: true - bom: true - isolated: true - codecoverage: true - - - artifact: dev.galasa.mq.manager.ivt + - artifact: dev.galasa.java.windows.manager version: 0.21.0 - obr: true - bom: true - isolated: true - - - artifact: dev.galasa.openstack.manager + obr: true + mvp: false + bom: true + javadoc: true + isolated: true + codecoverage: true + + - artifact: dev.galasa.elasticlog.manager version: 0.32.0 - obr: true - javadoc: true - bom: true - isolated: true + obr: true + mvp: false + bom: true + javadoc: false + isolated: true codecoverage: true - + + - artifact: dev.galasa.elasticlog.manager.ivt + version: 0.21.0 + obr: true + mvp: false + bom: false + javadoc: false + isolated: true + codecoverage: false + - artifact: dev.galasa.phoenix2.manager version: 0.31.0 - obr: true - bom: true - isolated: true - + obr: true + mvp: false + bom: true + javadoc: false + isolated: true + codecoverage: false + + - artifact: dev.galasa.galasaecosystem.manager + version: 0.34.0 + obr: true + mvp: false + bom: true + javadoc: false + isolated: true + codecoverage: true + + - artifact: dev.galasa.galasaecosystem.manager.ivt + version: 0.21.0 + obr: true + mvp: false + bom: false + javadoc: false + isolated: true + codecoverage: false + + - artifact: dev.galasa.jmeter.manager + version: 0.25.0 + obr: true + mvp: false + bom: true + javadoc: true + isolated: true + codecoverage: false + + - artifact: dev.galasa.jmeter.manager.ivt + version: 0.25.0 + obr: true + mvp: false + bom: true + javadoc: true + isolated: true + codecoverage: false + - artifact: dev.galasa.sdv.manager version: 0.34.0 - obr: true - javadoc: true - bom: true - mvp: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: true + isolated: true codecoverage: true - + - artifact: dev.galasa.sdv.manager.ivt version: 0.35.0 - obr: true - mvp: true - isolated: true - + obr: false + mvp: false + bom: false + javadoc: false + isolated: false + codecoverage: false + - artifact: dev.galasa.selenium.manager version: 0.34.0 - obr: true - javadoc: true - bom: true - mvp: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: true + isolated: true codecoverage: true - + - artifact: dev.galasa.selenium.manager.ivt version: 0.21.0 - obr: true - mvp: true - isolated: true - - - artifact: dev.galasa.sem.manager + obr: true + mvp: true + bom: false + javadoc: false + isolated: true + codecoverage: false + + - artifact: dev.galasa.vtp.manager version: 0.25.0 - obr: true - bom: true - isolated: true - - - artifact: dev.galasa.textscan.manager - version: 0.34.0 - obr: true - mvp: true - javadoc: true - bom: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: true + isolated: true + codecoverage: false + + - artifact: dev.galasa.vtp.manager.ivt + version: 0.21.0 + obr: false + mvp: false + bom: false + javadoc: false + isolated: false + codecoverage: false + + - artifact: dev.galasa.linux.manager + version: 0.21.0 + obr: true + mvp: false + bom: true + javadoc: true + isolated: true codecoverage: true - + + - artifact: dev.galasa.linux.manager.ivt + version: 0.21.0 + obr: true + mvp: false + bom: false + javadoc: false + isolated: true + codecoverage: false + - artifact: dev.galasa.windows.manager version: 0.21.0 - obr: true - javadoc: true - bom: true - isolated: true + obr: true + mvp: false + bom: false + javadoc: false + isolated: true + codecoverage: false + + - artifact: dev.galasa.githubissue.manager + version: 0.31.0 + obr: true + mvp: true + bom: true + javadoc: false + isolated: true + codecoverage: false + + - artifact: dev.galasa.zos.manager + version: 0.34.0 + obr: true + mvp: true + bom: true + javadoc: true + isolated: true codecoverage: true - + + - artifact: dev.galasa.zos.manager.ivt + version: 0.28.0 + obr: true + mvp: true + bom: false + javadoc: false + isolated: true + codecoverage: false + + - artifact: dev.galasa.zos3270.common + version: 0.32.0 + obr: true + mvp: true + bom: false + javadoc: true + isolated: true + codecoverage: false + + - artifact: dev.galasa.zos3270.manager + version: 0.34.0 + obr: true + mvp: true + bom: true + javadoc: true + isolated: true + codecoverage: true + + - artifact: dev.galasa.zos3270.manager.ivt + version: 0.21.0 + obr: true + mvp: true + bom: false + javadoc: false + isolated: true + codecoverage: false + - artifact: dev.galasa.zosbatch.rseapi.manager version: 0.34.0 - obr: true - bom: true - mvp: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: false + isolated: true codecoverage: true - + - artifact: dev.galasa.zosbatch.zosmf.manager version: 0.34.0 - obr: true - bom: true - mvp: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: false + isolated: true codecoverage: true - artifact: dev.galasa.zosconsole.oeconsol.manager version: 0.21.0 - obr: true - bom: true - mvp: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: false + isolated: true codecoverage: true - + - artifact: dev.galasa.zosconsole.zosmf.manager version: 0.31.0 - obr: true - bom: true - mvp: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: false + isolated: true codecoverage: true - + - artifact: dev.galasa.zosfile.rseapi.manager version: 0.34.0 - obr: true - bom: true - mvp: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: false + isolated: true codecoverage: true - + - artifact: dev.galasa.zosfile.zosmf.manager version: 0.34.0 - obr: true - bom: true - mvp: true - isolated: true - codecoverage: true - - - artifact: dev.galasa.zosliberty.manager - version: 0.34.0 - obr: true - mvp: true - javadoc: true - bom: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: false + isolated: true codecoverage: true - + - artifact: dev.galasa.zosliberty.angel.manager version: 0.34.0 - obr: true - javadoc: true - bom: true - isolated: true + obr: true + mvp: false + bom: true + javadoc: true + isolated: true codecoverage: true - - - artifact: dev.galasa.zos.manager + + - artifact: dev.galasa.zosliberty.manager version: 0.34.0 - obr: true - javadoc: true - bom: true - mvp: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: true + isolated: true codecoverage: true - - - artifact: dev.galasa.zos.manager.ivt - version: 0.28.0 - obr: true - mvp: true - isolated: true - - - artifact: dev.galasa.zosprogram.manager - version: 0.25.0 - obr: true - javadoc: true - bom: true - mvp: true - isolated: true - codecoverage: true - + - artifact: dev.galasa.zosmf.manager version: 0.34.0 - obr: true - javadoc: true - bom: true - mvp: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: true + isolated: true codecoverage: true - + + - artifact: dev.galasa.zosprogram.manager + version: 0.25.0 + obr: true + mvp: true + bom: true + javadoc: true + isolated: true + codecoverage: true + - artifact: dev.galasa.zosrseapi.manager version: 0.34.0 - obr: true - javadoc: true - bom: true - mvp: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: true + isolated: true codecoverage: true - + - artifact: dev.galasa.zossecurity.manager version: 0.34.0 - obr: true - javadoc: true - bom: true - mvp: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: true + isolated: true codecoverage: true - + - artifact: dev.galasa.zostsocommand.ssh.manager version: 0.21.0 - obr: true - bom: true - mvp: true - isolated: true + obr: true + mvp: true + bom: true + javadoc: false + isolated: true codecoverage: true - + - artifact: dev.galasa.zosunixcommand.ssh.manager version: 0.21.0 - obr: true - bom: true - mvp: true - isolated: true - codecoverage: true - - - artifact: dev.galasa.zos3270.common - version: 0.32.0 - obr: true - bom: true - mvp: true - isolated: true - codecoverage: true - - - artifact: dev.galasa.zos3270.manager - version: 0.34.0 - obr: true - javadoc: true - bom: true - mvp: true - isolated: true - codecoverage: true - - - artifact: dev.galasa.zos3270.manager.ivt - version: 0.21.0 - obr: true - mvp: true - isolated: true - - - artifact: dev.galasa.vtp.manager - version: 0.25.0 - obr: true - javadoc: true - bom: true - mvp: true - isolated: true \ No newline at end of file + obr: true + mvp: true + bom: true + javadoc: false + isolated: true + codecoverage: true \ No newline at end of file From 76dee0b108d95dd2d088e495931d81276481ded3 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Wed, 3 Jul 2024 17:33:20 +0100 Subject: [PATCH 216/263] 3270 terminals disconnect and re-connect between scenarios Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .secrets.baseline | 13 ++++- .../dev.galasa.zos3270.manager/README.md | 31 +++++++++--- .../zos3270/internal/Zos3270ManagerImpl.java | 49 +++++++++++++++---- .../gherkin/Gherkin3270CheckAppearsOnce.java | 3 ++ .../gherkin/Gherkin3270Coordinator.java | 28 +++++++---- .../gherkin/Gherkin3270Credentials.java | 6 +++ .../gherkin/Gherkin3270GivenTerminal.java | 10 +++- .../gherkin/Gherkin3270MoveCursor.java | 3 ++ .../gherkin/Gherkin3270PressBasicKeys.java | 3 ++ .../gherkin/Gherkin3270PressPfKeys.java | 3 ++ .../internal/gherkin/Gherkin3270Type.java | 5 +- .../gherkin/Gherkin3270TypeInField.java | 3 ++ .../gherkin/Gherkin3270WaitKeyboard.java | 3 ++ .../gherkin/Gherkin3270WaitTextField.java | 3 ++ 14 files changed, 134 insertions(+), 29 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index fafda2d67..91932d663 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -75,7 +75,18 @@ "name": "TwilioKeyDetector" } ], - "results": {}, + "results": { + "galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/README.md": [ + { + "hashed_secret": "22199ec38c6bedb7616f8e42aa3ad6e9f196cd24", + "is_secret": false, + "is_verified": false, + "line_number": 114, + "type": "Secret Keyword", + "verified_result": null + } + ] + }, "version": "0.13.1+ibm.62.dss", "word_list": { "file": null, diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/README.md b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/README.md index c57783d74..84daa08df 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/README.md +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/README.md @@ -17,15 +17,19 @@ NOTE, the spacing and capitalisation must be exact at this time. We will try to There are 4 flavours to the "given a terminal". you can specify an ID for a terminal so that a feature file can operate multiple terminals in the same feature file. You can also specify a zOS image tag to influence which image the terminal connects to. -The default ID is A and the default tag is PRIMARY. +The default ID is `A` and the default tag is `PRIMARY`. -In all the following statements, where you see `terminal` you can leave as default ID of A or code `terminal B` to point to a different terminal. +In all the following statements, where you see `terminal` you can leave as default ID of `A` or code `terminal B` to point to a different terminal. ### Move Cursor `AND move terminal cursor to field "xxxxxx"` -Where xxxxxx is the text in an protected or unprotected field on the screen. +Where `xxxxxx` is the text in an protected or unprotected field on the screen. + +`AND move terminal A cursor to field "xxxxxx"` + +As above, but for the terminal with an id of `A` ### Terminal keys @@ -35,26 +39,39 @@ Where xxxxxx is the text in an protected or unprotected field on the screen. `AND press terminal key ENTER` -`AND press terminal key PFxx` where xx is the PF number +`AND press terminal key PFxx` where `xx` is the PF number + +`AND press terminal A key ENTER` where `A` is the id of the terminal to use. ### Type something -`AND type "xxxxxx" on terminal` where xxxxx is what you want to type where the cursor is +`AND type "xxxxxx" on terminal` where `xxxxx` is what you want to type where the cursor is + +`AND type "xxxxxx" on terminal A` where `A` is the id of the terminal to use. + +`AND type "xxxxxx" on terminal in field labelled "yyyyyy"` where `xxxxxx` is the what you want to type, `yyyyyy` is the field label. WARNING, this will move the cursor. It will locate ANY text `yyyyyy` and then press TAB and then type. -`AND type "xxxxxx" on terminal in field labelled "yyyyyy"` where xxxxxx is the what you want to type, yyyyyy is the field label. WARNING, this will move the cursor. It will locate ANY text yyyyyy and then press TAB and then type. +`AND type "xxxxxx" on terminal A in field labelled "yyyyyy"` where `A` is the id of the terminal to use. ### Wait for the keyboard to unlock `AND wait for terminal keyboard` +`AND wait for terminal A keyboard` + ### Wait for text on the screen `THEN wait for "xxxxxx" in any terminal field` This will wait for the text to appear on the screen on any screen update. WARNING, the keyboard may not be unlocked when this statement finishes. +`THEN wait for "xxxxxx" in any terminal A field` where `A` is the id of the terminal to use. + ### Check single text on screen `THEN check "xxxxxx" appears only once on terminal` -This will search the screen for text xxxxxx and ensure it occurs once. This is immediate, will not wait for updates. +This will search the screen for text `xxxxxx` and ensure it occurs once. This is immediate, will not wait for updates. + +`THEN check "xxxxxx" appears only once on terminal A` where `A` is the id of the terminal to use. + diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java index f9ea2372b..7e6e532d4 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java @@ -27,6 +27,8 @@ import dev.galasa.framework.spi.IGherkinManager; import dev.galasa.framework.spi.IManager; import dev.galasa.framework.spi.ResourceUnavailableException; +import dev.galasa.framework.spi.Result; +import dev.galasa.framework.spi.language.GalasaMethod; import dev.galasa.framework.spi.language.GalasaTest; import dev.galasa.ipnetwork.IIpHost; import dev.galasa.textscan.spi.ITextScannerManagerSpi; @@ -97,7 +99,30 @@ public void initialise(@NotNull IFramework framework, @NotNull List al } } - + + @Override + public Result endOfTestMethod(@NotNull GalasaMethod galasaMethod, @NotNull Result currentResult, Throwable currentException) + throws ManagerException { + + super.endOfTestMethod(galasaMethod, currentResult, currentException); + + if (galasaMethod.isGherkin()) { + // The end of a test method in gherkin equates to the end of the scenario. + // So we need to free up terminals so their state doesn't leech into the next scenario. + // A scenario equates to a java method. + disconnectAllTerminals(); + } + + return currentResult; + } + + private void disconnectAllTerminals() throws Zos3270ManagerException { + for( Zos3270TerminalImpl terminal: terminals) { + if (terminal.isConnected()) { + disconnectTerminal(terminal); + } + } + } @Override public List extraBundles(@NotNull IFramework framework) throws ManagerException { @@ -207,14 +232,20 @@ public void provisionStart() throws ManagerException, ResourceUnavailableExcepti public void provisionStop() { logger.trace("Disconnecting terminals"); for (Zos3270TerminalImpl terminal : terminals) { - try { - terminal.writeRasOutput(); - terminal.flushTerminalCache(); - terminal.disconnect(); - } catch (TerminalInterruptedException e) { - logger.warn("Thread interrupted whilst disconnecting terminals", e); - Thread.currentThread().interrupt(); - } + disconnectTerminal(terminal); + } + } + + private void disconnectTerminal(Zos3270TerminalImpl terminal) { + String terminalId = terminal.getId(); + logger.info("Disconnecting terminal "+terminalId); + try { + terminal.writeRasOutput(); + terminal.flushTerminalCache(); + terminal.disconnect(); + } catch (TerminalInterruptedException e) { + logger.warn("Thread interrupted whilst disconnecting terminals", e); + Thread.currentThread().interrupt(); } } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270CheckAppearsOnce.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270CheckAppearsOnce.java index e2cbce8e3..b27b3b0a6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270CheckAppearsOnce.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270CheckAppearsOnce.java @@ -38,6 +38,9 @@ public void allocateTerminal(IGherkinExecutable executable, Map t } Zos3270TerminalImpl terminal = this.gerkinCoordinator.getTerminal(terminalId); + if (terminal == null ) { + throw new Zos3270ManagerException("Unable to get terminal "+terminalId); + } if (!terminal.isConnected()) { throw new Zos3270ManagerException("Terminal '" + terminalId + "' is not connected"); } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Coordinator.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Coordinator.java index f52dbeeaf..dc38c9a9c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Coordinator.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Coordinator.java @@ -1,39 +1,49 @@ package dev.galasa.zos3270.internal.gherkin; -import java.util.HashMap; +import java.util.*; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import dev.galasa.ManagerException; import dev.galasa.framework.spi.AbstractManager; import dev.galasa.framework.spi.IGherkinExecutable; import dev.galasa.framework.spi.IStatementOwner; import dev.galasa.framework.spi.language.gherkin.GherkinTest; +import dev.galasa.zos3270.TerminalInterruptedException; import dev.galasa.zos3270.Zos3270ManagerException; import dev.galasa.zos3270.internal.Zos3270ManagerImpl; import dev.galasa.zos3270.spi.Zos3270TerminalImpl; public class Gherkin3270Coordinator { + // The manager that this Coordinator is a facade of. private final Zos3270ManagerImpl manager; - private final GherkinTest test; + // The gherkin test is essentially a feature. + private final GherkinTest feature; + private final static Log logger = LogFactory.getLog(Gherkin3270Coordinator.class); + + // This coordinator keeps a reference of the terminals using the id that the gherkin scenario uses, + // which is different to the underlying terminal id. + // This is a mapping of the gherkin terminal id key to the terminal itself. private final HashMap terminals = new HashMap<>(); private final HashMap terminalImageTags = new HashMap<>(); public Gherkin3270Coordinator(Zos3270ManagerImpl manager, GherkinTest gherkinTest) { this.manager = manager; - this.test = gherkinTest; + this.feature = gherkinTest; } public boolean registerStatements() throws ManagerException { //*** Do we have any statements we need to support - if (!manager.registerStatements(this.test, getStatementOwners())) { + if (!manager.registerStatements(this.feature, getStatementOwners())) { return false; } return true; } - public IStatementOwner[] getStatementOwners() { return new IStatementOwner[] { new Gherkin3270GivenTerminal(this, this.manager), @@ -48,8 +58,9 @@ public IStatementOwner[] getStatementOwners() { new Gherkin3270TypeInField(this, this.manager)}; } - protected Zos3270TerminalImpl getTerminal(String id) { - return this.terminals.get(id); + protected Zos3270TerminalImpl getTerminal(String id) throws Zos3270ManagerException { + Zos3270TerminalImpl terminal = this.terminals.get(id); + return terminal ; } protected void registerTerminal(String id, Zos3270TerminalImpl terminal, String imageTag) { @@ -59,7 +70,7 @@ protected void registerTerminal(String id, Zos3270TerminalImpl terminal, String public void provisionGenerate() throws Zos3270ManagerException { // Provision any terminals that are Given - for(IGherkinExecutable executable : this.test.getAllExecutables()) { + for(IGherkinExecutable executable : this.feature.getAllExecutables()) { Object owner = executable.getOwner(); if (owner instanceof Gherkin3270GivenTerminal) { ((Gherkin3270GivenTerminal)owner).provision(executable); @@ -71,7 +82,6 @@ protected String getImageTagForTerminal(String id) { return this.terminalImageTags.get(id); } - public static String defaultTerminaId(String id) { return AbstractManager.defaultString(id, "A").toUpperCase(); } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Credentials.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Credentials.java index cbd33561f..d8cf177ab 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Credentials.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Credentials.java @@ -42,6 +42,9 @@ public void typeUsername(IGherkinExecutable executable, Map testV String credentialsId = AbstractManager.nulled(groups.get(0)); Zos3270TerminalImpl terminal = this.gerkinCoordinator.getTerminal(terminalId); + if (terminal == null ) { + throw new Zos3270ManagerException("Unable to get terminal "+terminalId); + } if (!terminal.isConnected()) { throw new Zos3270ManagerException("Terminal '" + terminalId + "' is not connected"); } @@ -69,6 +72,9 @@ public void typePassword(IGherkinExecutable executable, Map testV String credentialsId = AbstractManager.nulled(groups.get(0)); Zos3270TerminalImpl terminal = this.gerkinCoordinator.getTerminal(terminalId); + if (terminal == null ) { + throw new Zos3270ManagerException("Unable to get terminal "+terminalId); + } if (!terminal.isConnected()) { throw new Zos3270ManagerException("Terminal '" + terminalId + "' is not connected"); } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270GivenTerminal.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270GivenTerminal.java index 9f9c8255b..97b6e3047 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270GivenTerminal.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270GivenTerminal.java @@ -18,6 +18,7 @@ import dev.galasa.zos3270.Zos3270ManagerException; import dev.galasa.zos3270.common.screens.TerminalSize; import dev.galasa.zos3270.internal.Zos3270ManagerImpl; +import dev.galasa.zos3270.spi.NetworkException; import dev.galasa.zos3270.spi.Zos3270TerminalImpl; public class Gherkin3270GivenTerminal implements IStatementOwner { @@ -41,8 +42,13 @@ public void allocateTerminal(IGherkinExecutable executable, Map t if (terminal == null) { throw new Zos3270ManagerException("Terminal '" + terminalId + "' was not provisioned!"); } + if (!terminal.isConnected()) { - throw new Zos3270ManagerException("Terminal '" + terminalId + "' is not connected to the host system"); + try { + terminal.connect(); + } catch (NetworkException ex ) { + throw new Zos3270ManagerException("Cannot connect terminal to host system.",ex); + } } } @@ -59,6 +65,6 @@ public void provision(IGherkinExecutable executable) throws Zos3270ManagerExcept newTerminal = this.manager.generateTerminal(imageTag, true, terminalSize, alternateSize); this.gerkinCoordinator.registerTerminal(terminalId, newTerminal, imageTag); logger.info("zOS 3270 Terminal id '" + terminalId + "' as been provisioned for image tag '" + imageTag + "'"); - } + } } } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270MoveCursor.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270MoveCursor.java index ef912d55d..9ff65b5ab 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270MoveCursor.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270MoveCursor.java @@ -39,6 +39,9 @@ public void allocateTerminal(IGherkinExecutable executable, Map t Zos3270TerminalImpl terminal = this.gerkinCoordinator.getTerminal(terminalId); + if (terminal == null ) { + throw new Zos3270ManagerException("Unable to get terminal "+terminalId); + } if (!terminal.isConnected()) { throw new Zos3270ManagerException("Terminal '" + terminalId + "' is not connected"); } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270PressBasicKeys.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270PressBasicKeys.java index 55d719212..def0590d7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270PressBasicKeys.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270PressBasicKeys.java @@ -35,6 +35,9 @@ public void pressBasicKey(IGherkinExecutable executable, Map test String key = groups.get(1); Zos3270TerminalImpl terminal = this.gerkinCoordinator.getTerminal(terminalId); + if (terminal == null ) { + throw new Zos3270ManagerException("Unable to get terminal "+terminalId); + } if (!terminal.isConnected()) { throw new Zos3270ManagerException("Terminal '" + terminalId + "' is not connected"); } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270PressPfKeys.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270PressPfKeys.java index 879b3226d..1e5440938 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270PressPfKeys.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270PressPfKeys.java @@ -35,6 +35,9 @@ public void pressPfKey(IGherkinExecutable executable, Map testVar String key = groups.get(1); Zos3270TerminalImpl terminal = this.gerkinCoordinator.getTerminal(terminalId); + if (terminal == null ) { + throw new Zos3270ManagerException("Unable to get terminal "+terminalId); + } if (!terminal.isConnected()) { throw new Zos3270ManagerException("Terminal '" + terminalId + "' is not connected"); } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Type.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Type.java index 645f0b3b7..da92a42f6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Type.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Type.java @@ -32,12 +32,15 @@ public void allocateTerminal(IGherkinExecutable executable, Map t List groups = executable.getRegexGroups(); String terminalId = Gherkin3270Coordinator.defaultTerminaId(groups.get(1)); - String text = groups.get(0); + String text = groups.get(0); if (text.isEmpty()) { return; } Zos3270TerminalImpl terminal = this.gerkinCoordinator.getTerminal(terminalId); + if (terminal == null ) { + throw new Zos3270ManagerException("Unable to get terminal "+terminalId); + } if (!terminal.isConnected()) { throw new Zos3270ManagerException("Terminal '" + terminalId + "' is not connected"); } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270TypeInField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270TypeInField.java index 302bdfbfc..c89408268 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270TypeInField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270TypeInField.java @@ -42,6 +42,9 @@ public void allocateTerminal(IGherkinExecutable executable, Map t } Zos3270TerminalImpl terminal = this.gerkinCoordinator.getTerminal(terminalId); + if (terminal == null ) { + throw new Zos3270ManagerException("Unable to get terminal "+terminalId); + } if (!terminal.isConnected()) { throw new Zos3270ManagerException("Terminal '" + terminalId + "' is not connected"); } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270WaitKeyboard.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270WaitKeyboard.java index 8b4f7e325..1ac70cd70 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270WaitKeyboard.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270WaitKeyboard.java @@ -34,6 +34,9 @@ public void allocateTerminal(IGherkinExecutable executable, Map t String terminalId = Gherkin3270Coordinator.defaultTerminaId(groups.get(0)); Zos3270TerminalImpl terminal = this.gerkinCoordinator.getTerminal(terminalId); + if (terminal == null ) { + throw new Zos3270ManagerException("Unable to get terminal "+terminalId); + } if (!terminal.isConnected()) { throw new Zos3270ManagerException("Terminal '" + terminalId + "' is not connected"); } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270WaitTextField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270WaitTextField.java index 4b192acf3..94a3159bf 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270WaitTextField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270WaitTextField.java @@ -38,6 +38,9 @@ public void allocateTerminal(IGherkinExecutable executable, Map t } Zos3270TerminalImpl terminal = this.gerkinCoordinator.getTerminal(terminalId); + if (terminal == null ) { + throw new Zos3270ManagerException("Unable to get terminal "+terminalId); + } if (!terminal.isConnected()) { throw new Zos3270ManagerException("Terminal '" + terminalId + "' is not connected"); } From 879de8b5c75633046ae3b50375f39b7f7d9d27b0 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Wed, 3 Jul 2024 18:00:43 +0100 Subject: [PATCH 217/263] bump up 3270 manager version Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../dev.galasa.zos3270.manager/build.gradle | 2 +- .../zos3270/internal/gherkin/Gherkin3270Coordinator.java | 6 ------ release.yaml | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle index d600bcbb2..797b95d78 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa zOS 3270 Terminal Manager' -version = '0.34.0' +version = '0.36.0' dependencies { api project(':galasa-managers-zos-parent:dev.galasa.zos3270.common') diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Coordinator.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Coordinator.java index dc38c9a9c..5882f2aaf 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Coordinator.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Coordinator.java @@ -2,15 +2,11 @@ import java.util.*; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import dev.galasa.ManagerException; import dev.galasa.framework.spi.AbstractManager; import dev.galasa.framework.spi.IGherkinExecutable; import dev.galasa.framework.spi.IStatementOwner; import dev.galasa.framework.spi.language.gherkin.GherkinTest; -import dev.galasa.zos3270.TerminalInterruptedException; import dev.galasa.zos3270.Zos3270ManagerException; import dev.galasa.zos3270.internal.Zos3270ManagerImpl; import dev.galasa.zos3270.spi.Zos3270TerminalImpl; @@ -22,8 +18,6 @@ public class Gherkin3270Coordinator { // The gherkin test is essentially a feature. private final GherkinTest feature; - - private final static Log logger = LogFactory.getLog(Gherkin3270Coordinator.class); // This coordinator keeps a reference of the terminals using the id that the gherkin scenario uses, // which is different to the underlying terminal id. diff --git a/release.yaml b/release.yaml index 9cdf00002..1ff6cea59 100644 --- a/release.yaml +++ b/release.yaml @@ -512,7 +512,7 @@ managers: codecoverage: true - artifact: dev.galasa.zos3270.manager - version: 0.34.0 + version: 0.36.0 obr: true javadoc: true bom: true From 64f50b9a53b770e116975fcbedd9f5a9a3cc59d3 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Wed, 10 Jul 2024 15:26:10 +0100 Subject: [PATCH 218/263] Some class name changes Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../internal/gherkin/Gherkin3270Coordinator.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Coordinator.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Coordinator.java index 5882f2aaf..8c6a844d9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Coordinator.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Coordinator.java @@ -6,6 +6,7 @@ import dev.galasa.framework.spi.AbstractManager; import dev.galasa.framework.spi.IGherkinExecutable; import dev.galasa.framework.spi.IStatementOwner; +import dev.galasa.framework.spi.language.gherkin.GherkinMethod; import dev.galasa.framework.spi.language.gherkin.GherkinTest; import dev.galasa.zos3270.Zos3270ManagerException; import dev.galasa.zos3270.internal.Zos3270ManagerImpl; @@ -64,10 +65,16 @@ protected void registerTerminal(String id, Zos3270TerminalImpl terminal, String public void provisionGenerate() throws Zos3270ManagerException { // Provision any terminals that are Given - for(IGherkinExecutable executable : this.feature.getAllExecutables()) { - Object owner = executable.getOwner(); - if (owner instanceof Gherkin3270GivenTerminal) { - ((Gherkin3270GivenTerminal)owner).provision(executable); + List methods = this.feature.getMethods(); + for( GherkinMethod method : methods ) { + + List executables = method.getExecutables(); + for(IGherkinExecutable executable : executables) { + Object owner = executable.getOwner(); + + if (owner instanceof Gherkin3270GivenTerminal) { + ((Gherkin3270GivenTerminal)owner).provision(executable); + } } } } From 7bd61a13686f0a8fd96f5e9367748df521067150 Mon Sep 17 00:00:00 2001 From: dhruv Date: Thu, 11 Jul 2024 20:52:00 +0530 Subject: [PATCH 219/263] added pr and build workflows Signed-off-by: dhruv --- .github/workflows/build.yaml | 44 +++++++++++++++++++++++++++++ .github/workflows/pr-build.yaml | 37 ++++++++++++++++++++++++ galasa-managers-parent/build.gradle | 12 +++++--- 3 files changed, 89 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/build.yaml create mode 100644 .github/workflows/pr-build.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 000000000..ccfb3c037 --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,44 @@ +name: Main build + +on: + workflow_dispatch: + pull_request: + branches: [main] + +env: + NAMESPACE: jaydee029 + +jobs: + build-gradle: + name: build and Test Managers + runs-on: ubuntu-latest + + steps: + - name: Checkout Code + uses: actions/checkout@v4 + + - name: Setup JDK + uses: actions/setup-java@v4 + with: + java-version: '11' + distribution: 'semeru' + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + with: + gradle-version: 6.9.2 + + - name: Build ,Test and Publish Managers + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.GPG_KEY }} + ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_SECRET }} + ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }} + run: | + gradle -b galasa-managers-parent/build.gradle check publish --info \ + -PsourceMaven=https://development.galasa.dev/main/maven-repo/extensions \ + -PcentralMaven=https://repo.maven.apache.org/maven2/ \ + -PtargetMaven=https://maven.pkg.github.com/${{env.NAMESPACE}}/managers/ \ + -PjacocoEnabled=true \ + -PisMainOrRelease=true + \ No newline at end of file diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml new file mode 100644 index 000000000..f7e03d77a --- /dev/null +++ b/.github/workflows/pr-build.yaml @@ -0,0 +1,37 @@ +name: PR build + +on: + workflow_dispatch: + pull_request: + branches: [main] + +env: + NAMESPACE: jaydee029 + +jobs: + build-gradle: + name: build and Test Managers + runs-on: ubuntu-latest + + steps: + - name: Checkout Code + uses: actions/checkout@v4 + + - name: Setup JDK + uses: actions/setup-java@v4 + with: + java-version: '11' + distribution: 'semeru' + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + with: + gradle-version: 6.9.2 + + - name: Test and Build Managers + run: | + gradle -b galasa-managers-parent/build.gradle clean build \ + -PsourceMaven=https://development.galasa.dev/main/maven-repo/extensions \ + -PcentralMaven=https://repo.maven.apache.org/maven2/ \ + -PtargetMaven=https://maven.pkg.github.com/${{env.NAMESPACE}}/managers/ + \ No newline at end of file diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index 0922eb38c..dc93eaa94 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -51,6 +51,10 @@ repositories { } signing { + def signingKeyId = findProperty("signingKeyId") + def signingKey = findProperty("signingKey") + def signingPassword = findProperty("signingPassword") + useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword) sign publishing.publications } @@ -74,8 +78,8 @@ if (jacocoEnabled.toBoolean()) { if ("$targetMaven".startsWith('http')) { credentials { - username System.getenv('MAVENUSERNAME') - password System.getenv('MAVENPASSWORD') + username System.getenv("GITHUB_ACTOR") + password System.getenv("GITHUB_TOKEN") } } } @@ -230,8 +234,8 @@ publishing { if ("$targetMaven".startsWith('http')) { credentials { - username System.getenv('MAVENUSERNAME') - password System.getenv('MAVENPASSWORD') + username System.getenv("GITHUB_ACTOR") + password System.getenv("GITHUB_TOKEN") } } } From 489de62ff73026d210f9144dd2ccd1ba4a2b550f Mon Sep 17 00:00:00 2001 From: dhruv Date: Mon, 15 Jul 2024 13:20:53 +0530 Subject: [PATCH 220/263] edited build.yaml Signed-off-by: dhruv --- .github/workflows/build.yaml | 6 ++---- .github/workflows/pr-build.yaml | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ccfb3c037..250bd9688 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -35,10 +35,8 @@ jobs: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_SECRET }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }} run: | - gradle -b galasa-managers-parent/build.gradle check publish --info \ + gradle -xmx4096m -b galasa-managers-parent/build.gradle check publish --info \ -PsourceMaven=https://development.galasa.dev/main/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ - -PtargetMaven=https://maven.pkg.github.com/${{env.NAMESPACE}}/managers/ \ - -PjacocoEnabled=true \ - -PisMainOrRelease=true + -PtargetMaven=https://maven.pkg.github.com/${{env.NAMESPACE}}/managers/ -PjacocoEnabled=true -PisMainOrRelease=true \ No newline at end of file diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index f7e03d77a..2bb0786ac 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -30,7 +30,7 @@ jobs: - name: Test and Build Managers run: | - gradle -b galasa-managers-parent/build.gradle clean build \ + gradle -xmx4096m -b galasa-managers-parent/build.gradle clean build \ -PsourceMaven=https://development.galasa.dev/main/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ -PtargetMaven=https://maven.pkg.github.com/${{env.NAMESPACE}}/managers/ From cfae3dd6fbe6ee810f72e5217ad98bd3da4db557 Mon Sep 17 00:00:00 2001 From: dhruv Date: Mon, 15 Jul 2024 13:31:38 +0530 Subject: [PATCH 221/263] edited build.yaml Signed-off-by: dhruv --- .github/workflows/build.yaml | 2 +- .github/workflows/pr-build.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 250bd9688..ec2c4212e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -35,7 +35,7 @@ jobs: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_SECRET }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }} run: | - gradle -xmx4096m -b galasa-managers-parent/build.gradle check publish --info \ + gradle -b galasa-managers-parent/build.gradle check publish -Xmx4096m --info \ -PsourceMaven=https://development.galasa.dev/main/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ -PtargetMaven=https://maven.pkg.github.com/${{env.NAMESPACE}}/managers/ -PjacocoEnabled=true -PisMainOrRelease=true diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 2bb0786ac..81337b0fc 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -30,7 +30,7 @@ jobs: - name: Test and Build Managers run: | - gradle -xmx4096m -b galasa-managers-parent/build.gradle clean build \ + gradle -b galasa-managers-parent/build.gradle clean build -Xmx4096m \ -PsourceMaven=https://development.galasa.dev/main/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ -PtargetMaven=https://maven.pkg.github.com/${{env.NAMESPACE}}/managers/ From 43cad3269cf07b221fca737fc1322094dfbecf8e Mon Sep 17 00:00:00 2001 From: dhruv Date: Mon, 15 Jul 2024 13:42:26 +0530 Subject: [PATCH 222/263] edited build.yaml Signed-off-by: dhruv --- .github/workflows/build.yaml | 3 +++ .github/workflows/pr-build.yaml | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ec2c4212e..726721e89 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -27,6 +27,9 @@ jobs: uses: gradle/actions/setup-gradle@v3 with: gradle-version: 6.9.2 + + - name: Set Heap size + run: echo "JAVA_OPTS=-Xmx4g" >> $GITHUB_ENV - name: Build ,Test and Publish Managers env: diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 81337b0fc..643eec298 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -27,10 +27,12 @@ jobs: uses: gradle/actions/setup-gradle@v3 with: gradle-version: 6.9.2 - + + - name: Set Heap size + run: echo "JAVA_OPTS=-Xmx4g" >> $GITHUB_ENV - name: Test and Build Managers run: | - gradle -b galasa-managers-parent/build.gradle clean build -Xmx4096m \ + gradle -b galasa-managers-parent/build.gradle clean build -Xmx 4096m \ -PsourceMaven=https://development.galasa.dev/main/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ -PtargetMaven=https://maven.pkg.github.com/${{env.NAMESPACE}}/managers/ From 83298c071b18a8fdba4bb0932918c71c2208f6c3 Mon Sep 17 00:00:00 2001 From: dhruv Date: Mon, 15 Jul 2024 13:43:50 +0530 Subject: [PATCH 223/263] edited build.yaml Signed-off-by: dhruv --- .github/workflows/pr-build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 643eec298..8cf360d14 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -30,6 +30,7 @@ jobs: - name: Set Heap size run: echo "JAVA_OPTS=-Xmx4g" >> $GITHUB_ENV + - name: Test and Build Managers run: | gradle -b galasa-managers-parent/build.gradle clean build -Xmx 4096m \ From e7910e845859ea099a1950c71851e5182e099904 Mon Sep 17 00:00:00 2001 From: dhruv Date: Mon, 15 Jul 2024 13:46:10 +0530 Subject: [PATCH 224/263] edited build.yaml Signed-off-by: dhruv --- .github/workflows/build.yaml | 2 +- .github/workflows/pr-build.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 726721e89..664895802 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -38,7 +38,7 @@ jobs: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_SECRET }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }} run: | - gradle -b galasa-managers-parent/build.gradle check publish -Xmx4096m --info \ + gradle -b galasa-managers-parent/build.gradle check publish --info \ -PsourceMaven=https://development.galasa.dev/main/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ -PtargetMaven=https://maven.pkg.github.com/${{env.NAMESPACE}}/managers/ -PjacocoEnabled=true -PisMainOrRelease=true diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 8cf360d14..c096bf52b 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -30,10 +30,10 @@ jobs: - name: Set Heap size run: echo "JAVA_OPTS=-Xmx4g" >> $GITHUB_ENV - + - name: Test and Build Managers run: | - gradle -b galasa-managers-parent/build.gradle clean build -Xmx 4096m \ + gradle -b galasa-managers-parent/build.gradle clean build \ -PsourceMaven=https://development.galasa.dev/main/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ -PtargetMaven=https://maven.pkg.github.com/${{env.NAMESPACE}}/managers/ From 8ccf68bf56fdbb4aaa243dc640c48a25501b911c Mon Sep 17 00:00:00 2001 From: dhruv Date: Mon, 15 Jul 2024 14:05:29 +0530 Subject: [PATCH 225/263] edited build.yaml Signed-off-by: dhruv --- .github/workflows/build.yaml | 4 +--- .github/workflows/pr-build.yaml | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 664895802..c5825bb11 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -27,9 +27,6 @@ jobs: uses: gradle/actions/setup-gradle@v3 with: gradle-version: 6.9.2 - - - name: Set Heap size - run: echo "JAVA_OPTS=-Xmx4g" >> $GITHUB_ENV - name: Build ,Test and Publish Managers env: @@ -39,6 +36,7 @@ jobs: ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }} run: | gradle -b galasa-managers-parent/build.gradle check publish --info \ + -Dorg.gradle.jvmargs=-Xmx4096M \ -PsourceMaven=https://development.galasa.dev/main/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ -PtargetMaven=https://maven.pkg.github.com/${{env.NAMESPACE}}/managers/ -PjacocoEnabled=true -PisMainOrRelease=true diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index c096bf52b..bcc627ff5 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -28,12 +28,10 @@ jobs: with: gradle-version: 6.9.2 - - name: Set Heap size - run: echo "JAVA_OPTS=-Xmx4g" >> $GITHUB_ENV - - name: Test and Build Managers run: | gradle -b galasa-managers-parent/build.gradle clean build \ + -Dorg.gradle.jvmargs=-Xmx4096M \ -PsourceMaven=https://development.galasa.dev/main/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ -PtargetMaven=https://maven.pkg.github.com/${{env.NAMESPACE}}/managers/ From 7d86f58add73f85217023cef1600bf48360e71cf Mon Sep 17 00:00:00 2001 From: Aashir Siddiqui Date: Tue, 23 Jul 2024 11:43:30 +0100 Subject: [PATCH 226/263] Updated comment in root directory's build.gradle file Signed-off-by: Aashir Siddiqui --- galasa-managers-parent/build.gradle | 20 ++++++++++ .../main/java/dev/galasa/cicsts/ICeci.java | 17 ++++---- .../main/java/dev/galasa/cicsts/ICemt.java | 2 +- .../galasa/cicsts/IExecInterfaceBlock.java | 11 +++-- .../cicsts/cicsresource/IJvmserver.java | 11 +++-- .../cloud/internal/CloudManagerImpl.java | 2 +- .../docker/internal/DockerContainerImpl.java | 12 +++--- .../docker/internal/DockerImageImpl.java | 2 +- .../docker/internal/DockerManagerImpl.java | 12 +++--- .../docker/internal/DockerRegistryImpl.java | 11 ++--- .../dev/galasa/http/HttpClientResponse.java | 8 ++-- .../java/dev/galasa/http/IHttpClient.java | 40 +++++++++---------- .../dev/galasa/ipnetwork/ICommandShell.java | 12 +++--- .../galasa/core/manager/ResourceString.java | 4 +- .../core/manager/StoredArtifactRoot.java | 4 +- .../java/dev/galasa/textscan/ILogScanner.java | 30 +++++++------- .../internal/ElasticLogManagerImpl.java | 11 +++-- .../galasaecosystem/IGenericEcosystem.java | 1 - .../dev/galasa/jmeter/IJMeterSession.java | 3 +- .../galasa/sdv/internal/SdvManagerImpl.java | 2 +- .../java/dev/galasa/selenium/IWebPage.java | 1 - .../java/dev/galasa/linux/ILinuxImage.java | 2 +- .../dev/galasa/windows/IWindowsImage.java | 2 +- .../main/java/dev/galasa/zos/IZosImage.java | 12 +++--- .../dev/galasa/zos/spi/IZosManagerSpi.java | 22 +++++----- .../dev/galasa/zosbatch/IZosBatchJob.java | 16 ++++---- .../ZosBatchJobOutputSpoolFileImpl.java | 11 +++-- .../java/dev/galasa/zosfile/IZosDataset.java | 16 ++++---- .../dev/galasa/zosfile/IZosFileHandler.java | 6 +-- .../java/dev/galasa/zosfile/IZosUNIXFile.java | 23 +++++------ .../dev/galasa/zosfile/IZosVSAMDataset.java | 12 +++--- .../dev/galasa/zosfile/spi/IZosFileSpi.java | 6 +-- .../java/dev/galasa/zos3270/ITerminal.java | 3 +- .../galasa/zosliberty/IZosLibertyServer.java | 16 ++++---- .../zosliberty/IZosLibertyServerLog.java | 16 ++++---- .../zosliberty/IZosLibertyServerXml.java | 14 +++---- .../IZosLibertyServerXmlElementList.java | 12 +++--- .../main/java/dev/galasa/zosmf/IZosmf.java | 22 +++++----- .../dev/galasa/zosprogram/ZosProgram.java | 2 +- .../zosprogram/spi/IZosProgramManagerSpi.java | 2 +- .../java/dev/galasa/zosrseapi/IRseapi.java | 29 ++++++++------ .../dev/galasa/zossecurity/IZosSecurity.java | 16 ++++---- .../galasa/zossecurity/KerberosInitiator.java | 14 +++---- .../dev/galasa/zossecurity/ZosUserid.java | 16 ++++---- 44 files changed, 251 insertions(+), 255 deletions(-) diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index 0922eb38c..bf82f749c 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -22,6 +22,26 @@ subprojects { plugins.withId('jacoco') { rootProject.tasks.named('jacocoMerge').get().executionData(tasks.named('test').get()) } + + // Uncomment the block below to get details about deprecations. + +// tasks.withType(JavaCompile) { +// options.compilerArgs << '-Xlint:unchecked' +// options.deprecation = true +// } + + // This task will suppress warnings (only in javadoc) about missing description for (@return, @throws etc..) + /* + Example warning: + + warning: no description for @throws + * @throws SeleniumManagerException + */ + // However, it will not suppress warnings / errors in the code itself + tasks.withType(Javadoc) { + options.addStringOption('Xdoclint:none', '-quiet') + } + } // Define the artifact diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeci.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeci.java index b31024f55..5eb2643a6 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeci.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICeci.java @@ -75,8 +75,8 @@ public interface ICeci { * @param parseOutput parse the command output and store in {@link ICeciResponse}. Setting to false can improve performance on commands * that contain a lot of output fields, e.g. ASSIGN.

      * The following examples shows how to retrieve a specific returned value:
      - * issueCommand(ICicsTerminal, "ASSIGN USERID(&VAR)", false)
      - * retrieveVariableText(ICicsTerminal, "ASSIGN USERID(&VAR)", false) + * issueCommand(ICicsTerminal, "ASSIGN USERID(&VAR)", false)
      + * retrieveVariableText(ICicsTerminal, "ASSIGN USERID(&VAR)", false) *       * @return an {@link ICeciResponse} object containing the command's response. * @throws CeciException @@ -239,7 +239,7 @@ public interface ICeci { /** * Retrieve the content of the current EXEC Interface Block (EIB) - * @param terminal an {@link ICicsTerminal} object logged on to the CICS region and in an active CECI session. + * @param ceciTerminal an {@link ICicsTerminal} object logged on to the CICS region and in an active CECI session. * @return the {@link IExecInterfaceBlock} * @throws CeciException */ @@ -252,7 +252,7 @@ public interface ICeci { * For example, the test could first issue CEOT TRANIDONLY * @param programName the name of the PROGRAM * @param commarea a string representing the COMMAREA. If null, COMMAREA will be omitted from the command. Can be CECI variable name populated with - * (&name set via {@link #defineVariableText(ICicsTerminal, String, String)}) or the actual data. The value of DATALENGTH in the command will be + * (&)name set via {@link #defineVariableText(ICicsTerminal, String, String)}) or the actual data. The value of DATALENGTH in the command will be * be allowed to default. * @param sysid the system name where the CICS region where the link request is to be routed. If null, SYSID will be omitted from the command. * @param transid the name of the mirror transaction on the remote region. If null, TRANSID will be omitted from the command. @@ -263,8 +263,8 @@ public interface ICeci { public ICeciResponse linkProgram(@NotNull ICicsTerminal ceciTerminal, @NotNull String programName, String commarea, String sysid, String transid, boolean synconreturn) throws CeciException; /** - * EXEC CICS LINK to a PROGRAM with a CHANNEL. Use {@link #putContainer(ICicsTerminal, String, String, String)} to create the container(s) on the CHANNEL - * and {@link #getContainer(ICicsTerminal, String, String, String)} to retrieve the content after the LINK. + * EXEC CICS LINK to a PROGRAM with a CHANNEL. Use {@link #putContainer(ICicsTerminal, String, String, String, String, String, String)} to create the container(s) on the CHANNEL + * and {@link #getContainer(ICicsTerminal, String, String, String, String, String)} to retrieve the content after the LINK. * @param ceciTerminal an {@link ICicsTerminal} object logged on to the CICS region and in an active CECI session. * If mixed case is required, the terminal should be presented with no upper case translate status. * For example, the test could first issue CEOT TRANIDONLY @@ -279,7 +279,7 @@ public interface ICeci { * @param ceciTerminal an {@link ICicsTerminal} object logged on to the CICS region and in an active CECI session. * @param channelName the CHANNELNAME * @param containerName the COTAINER name - * @param content a string representing the container contents. Can be CECI variable name populated with (&name set via {@link #defineVariableText(ICicsTerminal, String, String)}) + * @param content a string representing the container contents. Can be CECI variable name populated with (&)name set via {@link #defineVariableText(ICicsTerminal, String, String)}) * or the actual data. The value of FLENGTH in the command will be set to the data length. * @param dataType BIT or CHAR. If null, DATATYPE will be omitted from the command. * @param fromCcsid provides a value for FROMCCSID. If null, will be omitted from the command. @@ -296,8 +296,7 @@ public interface ICeci { * For example, the test could first issue CEOT TRANIDONLY * @param channelName the CHANNELNAME * @param containerName the CONTAINER name - * @param variableName the CECI variable name. Data can be retrieved using {@link #retrieveVariableText(ICicsTerminal, String)} or {@link #retrieveVariableHex(ICicsTerminal, String)} - * @param dataType BIT or CHAR. If null, DATATYPE will be omitted from the command. + * @param variableName the CECI variable name. Data can be retrieved using {@link #retrieveVariableText(ICicsTerminal, String)} * @param intoCcsid provides a value for INTOCCSID. If null, will be omitted from the command. * @param intoCodepage provides a value for INTOCODEPAGE. If null, will be omitted from the command. * @return an {@link ICeciResponse} object containing the command's response. diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICemt.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICemt.java index 2cb9990a8..cdca1d18f 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICemt.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICemt.java @@ -16,7 +16,7 @@ public interface ICemt { /** * Inquire a CEMT resource using the resource type and name. * This does not support inquiries of multiple resources at once. - * Will return {@link null} if the resource is not found. + * Will return null if the resource is not found. * @param cemtTerminal an {@link ITerminal} object logged on to the CICS region and in an active CEMT session. * If mixed case is required, the terminal should be presented with no upper case translate status. * For example, the test could first issue CEOT TRANIDONLY diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/IExecInterfaceBlock.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/IExecInterfaceBlock.java index 9102e2ee6..e30b18096 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/IExecInterfaceBlock.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/IExecInterfaceBlock.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts; /** @@ -51,7 +51,6 @@ public interface IExecInterfaceBlock { /** * Returns the value of the EIBCPOSN field in the EIB. - * @param hex return a char array containing the hex values of the field * @return */ public int getEIBCPOSN(); diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserver.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserver.java index b324a94b9..974c5b35b 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserver.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/IJvmserver.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.cicsresource; import java.util.List; @@ -394,7 +394,6 @@ public enum PurgeType { /** * Delete the JVM server logs - * @param rasPath path in Results Archive Store * @throws CicsJvmserverResourceException */ public void clearJvmLogs() throws CicsJvmserverResourceException; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/CloudManagerImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/CloudManagerImpl.java index 9ee52b4f0..5b86405ae 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/CloudManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/CloudManagerImpl.java @@ -168,7 +168,7 @@ public void provisionGenerate() throws ManagerException, ResourceUnavailableExce * * @param field The test field * @param annotations any annotations with the ecosystem - * @return a {@link IKubernetesEcosystem} ecosystem + * @return a {@link dev.galasa.galasaecosystem.IKubernetesEcosystem} ecosystem * @throws InsufficientResourcesAvailableException * @throws KubernetesManagerException if there is a problem generating a ecosystem */ diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerImpl.java index bd5571d88..44b29aa58 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerImpl.java @@ -417,7 +417,7 @@ public Map> getExposedPorts() throws DockerManag /** * Retrieves the first open socket ` * - * @param exposed port + * @param exposedPort * @return InetSocketAddress */ @Override @@ -432,7 +432,7 @@ public InetSocketAddress getFirstSocketForExposedPort(String exposedPort) { /** * Retrieves a random open socket * - * @param exposed port + * @param exposedPort * @return InetSocketAddress */ @Override @@ -447,7 +447,7 @@ public InetSocketAddress getRandomSocketForExposedPort(String exposedPort) { /** * Submit exec commands to be executed on the docker container. * - * @param String... commands + * @param command * @return IDockerExec */ @Override @@ -460,7 +460,7 @@ public IDockerExec exec(String... command) throws DockerManagerException { * timeout. * * @param timeout - * @param String... commands + * @param command * @return IDockerExec */ @Override @@ -678,8 +678,8 @@ public void discard() throws DockerManagerException { /** * Allows a file to be stored on a running docker container * - * @param path - * @param InputStream + * @param absolutePath + * @param file */ @Override public void storeFile(String absolutePath, InputStream file) throws DockerManagerException { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerImageImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerImageImpl.java index cf9ea85c7..82e5c8f43 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerImageImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerImageImpl.java @@ -43,7 +43,7 @@ public class DockerImageImpl implements IDockerImage { * @param framework * @param dockerManager * @param dockerEngine - * @param imageName + * @param fullImageName */ public DockerImageImpl(IFramework framework, DockerManagerImpl dockerManager, DockerEngineImpl dockerEngine, String fullImageName) { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerImpl.java index cf7273976..f164260cd 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerImpl.java @@ -71,10 +71,10 @@ public class DockerManagerImpl extends AbstractManager implements IDockerManager * * Docker Environment is generated at this stage * - * @param IFramework - the galasa framework - * @param List - list of all the managers - * @param List - list of all the active managers - * @param Class - the test class + * @param framework - the galasa framework + * @param allManagers - list of all the managers + * @param activeManagers - list of all the active managers + * @throws ManagerException */ @Override @@ -104,8 +104,8 @@ public void initialise(@NotNull IFramework framework, @NotNull List al /** * Makes sure that the docker manager is added to the list of active managers, and adds the dependency on http manager. * - * @param List - list of all the managers - * @param List - list of the active managers + * @param allManagers - list of all the managers + * @param activeManagers - list of the active managers * @throws ManagerException */ @Override diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerRegistryImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerRegistryImpl.java index 86a4bbeb7..f83c21aa8 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerRegistryImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerRegistryImpl.java @@ -65,7 +65,7 @@ public class DockerRegistryImpl { * * @param framework * @param dockerManager - * @param registryUrl + * @param registryId * @throws DockerManagerException */ public DockerRegistryImpl(IFramework framework, DockerManagerImpl dockerManager, String registryId) @@ -95,9 +95,7 @@ public DockerRegistryImpl(IFramework framework, DockerManagerImpl dockerManager, /** * Checks the registry for and image. * - * @param namespace - * @param repository - * @param tag + * @param image * @return true/false */ public boolean doYouHave(DockerImageImpl image) { @@ -130,8 +128,7 @@ public boolean doYouHave(DockerImageImpl image) { /** * Registry authentication * - * @param namespace - * @param repository + * @param image * @throws DockerManagerException */ public void registryAuthenticate(DockerImageImpl image) throws DockerManagerException { @@ -155,7 +152,6 @@ public void registryAuthenticate(DockerImageImpl image) throws DockerManagerExce * Attempts to gain a bearer token from realm, if unauthorized tries basic credentials login * retreive token * - * @param client * @return String token * @throws DockerManagerException */ @@ -191,7 +187,6 @@ public String retrieveBearerToken() throws DockerManagerException { /** * Uses basic crednetials to gain a basic auth token. * - * @param client * @return String token * @throws DockerManagerException */ diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java index c4e4ccf8c..192a4de9d 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java @@ -240,11 +240,11 @@ public static HttpClientResponse textResponse(CloseableHttpResponse http } /** - * Create an {@link HttpClientResponse} with a {@link JSONObject} content type + * Create an {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type * from an {@link HttpResponse}. * * @param httpResponse - * @return - {@link HttpClientResponse} with a {@link JSONObject} content type + * @return - {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type * @throws HttpClientException */ public static HttpClientResponse jsonResponse(CloseableHttpResponse httpResponse) @@ -253,14 +253,14 @@ public static HttpClientResponse jsonResponse(CloseableHttpResponse } /** - * Create an {@link HttpClientResponse} with a {@link JSONObject} content type + * Create an {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type * from an {@link HttpResponse}. If contentOnBadResponse is true, an attempt * will be made to retrieve the content even on a non 200 status code, otherwise * the content will be null in such an instance. * * @param httpResponse * @param contentOnBadResponse - * @return - {@link HttpClientResponse} with a {@link JSONObject} content type + * @return - {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type * @throws HttpClientException */ public static HttpClientResponse jsonResponse(CloseableHttpResponse httpResponse, diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpClient.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpClient.java index 735e64a76..bcd53f1ea 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpClient.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpClient.java @@ -122,54 +122,54 @@ HttpClientResponse postXML(String url, String xml) throws HttpClientException; /** - * Issue an HTTP GET to the provided URL, receiving a {@link JSONObject} in the + * Issue an HTTP GET to the provided URL, receiving a <com.google.gson.JsonObject> in the * response. * * @param url - * @return - {@link HttpClientResponse} with a {@link JSONObject} content type + * @return - {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type * @throws HttpClientException */ HttpClientResponse getJson(String url) throws HttpClientException; /** * Issue an HTTP POST to the provided URL, sending the provided - * {@link JSONObject} and receiving a {@link JSONObject} in the response. + * <com.google.gson.JsonObject> and receiving a <com.google.gson.JsonObject> in the response. * * @param url * @param json - * @return - {@link HttpClientResponse} with a {@link JSONObject} content type + * @return - {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type * @throws HttpClientException */ HttpClientResponse postJson(String url, JsonObject json) throws HttpClientException; /** * Issue an HTTP PUT to the provided URL, sending the provided - * {@link JSONObject} and receiving a {@link JSONObject} in the response. + * com.google.gson.JSONObject and receiving a com.google.gson.JSONObject in the response. * * @param url * @param json - * @return - {@link HttpClientResponse} with a {@link JSONObject} content type + * @return - {@link HttpClientResponse} with a com.google.gson.JSONObject content type * @throws HttpClientException */ HttpClientResponse putJson(String url, JsonObject json) throws HttpClientException; /** - * Issue an HTTP DELETE to the provided URL, receiving a {@link JSONObject} in + * Issue an HTTP DELETE to the provided URL, receiving a <com.google.gson.JsonObject> in * the response. * * @param url - * @return - {@link HttpClientResponse} with a {@link JSONObject} content type + * @return - {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type * @throws HttpClientException */ HttpClientResponse deleteJson(String url) throws HttpClientException; /** - * Issue an HTTP DELETE to the provided URL, receiving a {@link JSONObject} in + * Issue an HTTP DELETE to the provided URL, receiving a <com.google.gson.JsonObject> in * the response. * * @param url * @param json - * @return - {@link HttpClientResponse} with a {@link JSONObject} content type + * @return - {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type * @throws HttpClientException */ HttpClientResponse deleteJson(String url, JsonObject json) throws HttpClientException; @@ -222,7 +222,7 @@ HttpClientResponse postXML(String url, String xml) * * @param url * @param binary - * @return - {@link HttpClientResponse} with a {@link JSONObject} content type + * @return - {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type * @throws HttpClientException */ HttpClientResponse putBinary(String url, byte[] binary) throws HttpClientException; @@ -233,7 +233,7 @@ HttpClientResponse postXML(String url, String xml) * * @param url * @param binary - * @return - {@link HttpClientResponse} with a {@link JSONObject} content type + * @return - {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type * @throws HttpClientException */ HttpClientResponse getBinary(String url, byte[] binary) throws HttpClientException; @@ -244,7 +244,7 @@ HttpClientResponse postXML(String url, String xml) * * @param url * @param binary - * @return - {@link HttpClientResponse} with a {@link JSONObject} content type + * @return - {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type * @throws HttpClientException */ HttpClientResponse postBinary(String url, byte[] binary) throws HttpClientException; @@ -255,7 +255,7 @@ HttpClientResponse postXML(String url, String xml) * * @param url * @param binary - * @return - {@link HttpClientResponse} with a {@link JSONObject} content type + * @return - {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type * @throws HttpClientException */ HttpClientResponse deleteBinary(String url, byte[] binary) throws HttpClientException; @@ -263,25 +263,23 @@ HttpClientResponse postXML(String url, String xml) /** * Download a file from a specified location to a specified destination on local host. * - * @param Path destination - local location - * @param String path = URL path + * @param path = URL path */ CloseableHttpResponse getFile(String path) throws HttpClientException; /** * Download a file from a specified location to a specified destination on local host. * - * @param Path destination - local location - * @Param Content Types - * @param String path = URL path + * @param acceptTypes + * @param path - URL path */ CloseableHttpResponse getFile(String path, ContentType... acceptTypes) throws HttpClientException; /** * Send a compressed (tar) file from a local location to a specified destination on a host. * - * @param Sting path - URL path - * @param File file - tar archive file + * @param path - URL path + * @param file - tar archive file */ void putFile(String path, InputStream file); diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/ICommandShell.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/ICommandShell.java index b9a9b7679..b3c442d8d 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/ICommandShell.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/ICommandShell.java @@ -10,8 +10,8 @@ public interface ICommandShell { public String issueCommand(String command) throws IpNetworkManagerException; /** - * Issue a command using SSH. Equivalent to {@link #issueCommand(String, false, - * long)} + * Issue a command using SSH. Equivalent to {@link #issueCommand(String, boolean, long)} + * * @param command - command to issue * @param timeout - time (in milliseconds) to wait with no new output appearing @@ -23,7 +23,7 @@ public interface ICommandShell { /** * Issue a command using SSH. Equivalent to - * {@link #issueCommand(String, boolean, defaultTimeout)} + * {@link #issueCommand(String, boolean, long)} * * @param command - command to issue * @param newShell - if true will start a new @@ -61,7 +61,7 @@ public interface ICommandShell { * Issue a command using SSH shell. * * Equivalent to - * {@link #issueCommandToShell(String, false, defaultTimeout)} - not valid for + * {@link #issueCommandToShell(String, boolean, long)} - not valid for * Rexec implementation - equivalent to * {@link #issueCommand(String, long)} for Telnet implementation * @@ -73,7 +73,7 @@ public interface ICommandShell { /** * Issue a command using SSH shell. Equivalent to - * {@link #issueCommandToShell(String, false, long)} - not valid for Rexec + * {@link #issueCommandToShell(String, boolean, long)} - not valid for Rexec * implementation - equivalent to {@link #issueCommand(String, long)} * for Telnet implementation * @@ -85,7 +85,7 @@ public interface ICommandShell { /** * Issue a command using SSH shell. Equivalent to - * {@link #issueCommandToShell(String, boolean, defaultTimeout)} - not valid for + * {@link #issueCommandToShell(String, boolean, long)} - not valid for * Rexec implementation - equivalent to * {@link #issueCommand(String, long)} for Telnet implementation * diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ResourceString.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ResourceString.java index dc98d9971..dfca8b648 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ResourceString.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ResourceString.java @@ -19,7 +19,7 @@ * The CPS property core.resource.string.[length].pattern determines the make up of the random string. *

      *

      - * Will only populate public {@link java.lang.Stringdev.galasa.core.manager.IResourceString} fields. + * Will only populate public {@link dev.galasa.core.manager.IResourceString} fields. *

      * * @author Michael Baylis @@ -37,7 +37,7 @@ * * The tag must be provided as there is no default for this resource. * - * The {@link java.lang.Stringdev.galasa.core.manager.IResourceString} object is keyed on the tag, so if the tag is referred to in multiple + * The {@link dev.galasa.core.manager.IResourceString} object is keyed on the tag, so if the tag is referred to in multiple * super classes, then the lengths must be identical otherwise an exception will be thrown. */ String tag(); diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/StoredArtifactRoot.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/StoredArtifactRoot.java index 90d7294b3..81b656792 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/StoredArtifactRoot.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/StoredArtifactRoot.java @@ -18,9 +18,9 @@ * Fill this field Root path of the Stored Artifacts for this Test Run. This can * be used to record test logs, job output, trace files etc. * - * Will only populate public {@link java.nio.files.Path} fields. + * Will only populate public {@link java.nio.file.Path} fields. * - * @see java.nio.files.Path + * @see java.nio.file.Path */ @Retention(RUNTIME) @Target(FIELD) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ILogScanner.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ILogScanner.java index 981632a97..32e94d4eb 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ILogScanner.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ILogScanner.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.textscan; import java.util.regex.Pattern; @@ -96,8 +96,8 @@ public interface ILogScanner { /** * Convenience method for scan(Pattern.Compile("\Q" + searchString + "\E"), Pattern.Compile("\Q" + failString + "\E"), count) * - * @param searchText The text to search for - * @param failText Failure text to search for, can be null meaning no fail search + * @param searchString The text to search for + * @param failString Failure text to search for, can be null meaning no fail search * @param count at least how many occurrences of the searchText must exist * @return This log scanner for fluent calls * @throws FailTextFoundException If the failText was found @@ -144,7 +144,7 @@ public interface ILogScanner { * * @param searchPattern The regex to search for * @param failPattern Failure regex to search for, can be null meaning no fail search - * @param occurrence The occurrence to be returned + * @param occurrance The occurrence to be returned * @return The text of the searchPattern found * @throws MissingTextException The searchPattern was not found at all * @throws IncorrectOccurrencesException If the specified occurrence was not found @@ -155,9 +155,9 @@ public interface ILogScanner { /** * Convenience method for scanForMatch(Pattern.Compile("\Q" + searchString + "\E"), Pattern.Compile("\Q" + searchString + "\E"), occurrence) * - * @param searchText The text to search for - * @param failText Failure text to search for, can be null meaning no fail search - * @param occurrence The occurrence to be returned + * @param searchString The text to search for + * @param failString Failure text to search for, can be null meaning no fail search + * @param occurrance The occurrence to be returned * @return The text of the searchPattern found * @throws MissingTextException The searchPattern was not found at all * @throws IncorrectOccurrencesException If the specified occurrence was not found @@ -172,7 +172,7 @@ public interface ILogScanner { * * @param searchPattern The regex to search for * @param failPattern Failure regex to search for, can be null meaning no fail search - * @param occurrence The occurrence to be returned + * @param occurrance The occurrence to be returned * @return The text of the searchPattern found * @throws MissingTextException The searchPattern was not found at all * @throws IncorrectOccurrencesException If the specified occurrence was not found @@ -183,9 +183,9 @@ public interface ILogScanner { /** * Convenience method for scanForMatchSinceCheckpoint(Pattern.Compile("\Q" + searchString + "\E"), Pattern.Compile("\Q" + searchString + "\E"), occurrence) * - * @param searchText The text to search for - * @param failText Failure text to search for, can be null meaning no fail search - * @param occurrence The occurrence to be returned + * @param searchString The text to search for + * @param failString Failure text to search for, can be null meaning no fail search + * @param occurrance The occurrence to be returned * @return The text of the searchPattern found * @throws MissingTextException The searchString was not found at all * @throws IncorrectOccurrencesException If the specified occurrence was not found diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/ElasticLogManagerImpl.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/ElasticLogManagerImpl.java index a818d7ea9..73ab1a4ca 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/ElasticLogManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/ElasticLogManagerImpl.java @@ -71,10 +71,9 @@ public class ElasticLogManagerImpl extends AbstractManager { /** * Initialise the ElasticLogManager, adding a pointer to the other active managers * - * @param IFramework - the galasa framework - * @param List - list of all the managers - * @param List - list of all the active managers - * @param Class - the test class + * @param framework - the galasa framework + * @param allManagers - list of all the managers + * @param activeManagers - list of all the active managers * @throws ManagerException */ @Override @@ -101,8 +100,8 @@ public void initialise(@NotNull IFramework framework, @NotNull List al /** * Makes sure that the elastic log manager is added to the list of active managers, and adds the dependency on http manager. * - * @param List - list of all the managers - * @param List - list of the active managers + * @param allManagers - list of all the managers + * @param activeManagers - list of the active managers * @throws ManagerException */ @Override diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IGenericEcosystem.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IGenericEcosystem.java index ebe673f08..bc744e6d0 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IGenericEcosystem.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IGenericEcosystem.java @@ -34,7 +34,6 @@ public interface IGenericEcosystem { * Retrieve a CPS property from the host ecosystem * * @param namespace The namespace of the CPS - * @param property The property to retrieve * @return the value of the property or null if not found * @throws GalasaEcosystemManagerException if there is a problem accessing the CPS */ diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/IJMeterSession.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/IJMeterSession.java index 05e5985f0..6815c2aa6 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/IJMeterSession.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/IJMeterSession.java @@ -60,7 +60,7 @@ public interface IJMeterSession { * JMX-files have to be prepared for this by replacing ALL the $P__VARIABLE notations with $VARIABLE notations * Then by adding neccesary parameters inside a HashMap with it, it is possible to change the target of a test dynamically inside the test * Example: - * HashMap map = new HashMap(); + * HashMap<String,Object> map = new HashMap<String,Object>(); * map.put("HOST", "galasa.dev"); * session.setChangedParametersJmxFile(jmxStream, map); * @param jmxStream @@ -107,7 +107,6 @@ public interface IJMeterSession { /** * Giving jmeter instance a shutdown signal to finish and clean up all running tests - * @param timeout specifying a timeout in milliseconds * @throws JMeterManagerException */ public void stopTest() throws JMeterManagerException; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvManagerImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvManagerImpl.java index 361173f9b..3f4e73f9c 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/main/java/dev/galasa/sdv/internal/SdvManagerImpl.java @@ -60,7 +60,7 @@ * *

      It initialises the SDV manager, gathers all required * config, assess which regions to record and what users, and - * intercepts and implements behaviour for test creation & + * intercepts and implements behaviour for test creation and * teardown. * */ diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IWebPage.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IWebPage.java index b82c2f873..ab7bc6ebb 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IWebPage.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IWebPage.java @@ -29,7 +29,6 @@ public interface IWebPage { /** * Clears the Element specified by a Class Name * @param className The Object used to specify the Element - * @param secondsTimeout The wait timeout in seconds * @return The WebPage after the Element is cleared */ public IWebPage clearElementByClassName(String className); diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/ILinuxImage.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/ILinuxImage.java index a77e55ad3..f573f55ed 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/ILinuxImage.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/ILinuxImage.java @@ -47,7 +47,7 @@ public interface ILinuxImage { * Retrieve the default credentials for the Image. * * @return The default credentials - see - * {@link dev.galasa.framework.spi.creds.ICredentials} + * {@link dev.galasa.ICredentials} * @throws LinuxManagerException if the credentials are missing or there is a * problem with the credentials store */ diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/IWindowsImage.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/IWindowsImage.java index 3a9f1eb72..395481a36 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/IWindowsImage.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/IWindowsImage.java @@ -47,7 +47,7 @@ public interface IWindowsImage { * Retrieve the default credentials for the Image. * * @return The default credentials - see - * {@link dev.galasa.framework.spi.creds.ICredentials} + * {@link dev.galasa.ICredentials} * @throws WindowsManagerException if the credentials are missing or there is a * problem with the credentials store */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosImage.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosImage.java index 91e1354dd..2a0b3177f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosImage.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosImage.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos; import java.nio.charset.Charset; @@ -73,7 +73,7 @@ public interface IZosImage { /** * Retrieve the default credentials for the zOS Image. * - * @return The default credentials - see {@link dev.galasa.framework.spi.creds.ICredentials} + * @return The default credentials - see {@link dev.galasa.ICredentials} * @throws ZosManagerException if the credentials are missing or there is a problem with the credentials store */ @NotNull diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/spi/IZosManagerSpi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/spi/IZosManagerSpi.java index 21247dc0d..33c8ea892 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/spi/IZosManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/spi/IZosManagerSpi.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos.spi; import java.nio.file.Path; @@ -46,7 +46,7 @@ public interface IZosManagerSpi extends IZosManager { /** * Returns a zOS Image for the specified image ID - * @param image the ID of the image + * @param imageId the ID of the image * @return the image, never null * @throws ZosManagerException */ @@ -55,7 +55,7 @@ public interface IZosManagerSpi extends IZosManager { /** * Returns a zOS Image for the specified image that may not have been provisioned so far - * @param image the ID of the image + * @param imageId the ID of the image * @return the image, never null * @throws ZosManagerException if there is no image defined */ @@ -64,7 +64,7 @@ public interface IZosManagerSpi extends IZosManager { /** * Returns the data set HLQ(s) for temporary data sets for the specified image - * @param the image + * @param image * @return the image, never null * @throws ZosManagerException */ @@ -73,7 +73,7 @@ public interface IZosManagerSpi extends IZosManager { /** * Returns the zOS UNIX path prefix for temporary file for the specified image - * @param the image + * @param image * @return the image, never null * @throws ZosManagerException */ @@ -114,7 +114,7 @@ public interface IZosManagerSpi extends IZosManager { /** * Provides other managers a {@link IZosBatchJobname} with a prefix defined by the zOS Batch {@code zosbatch.jobname.[imageid].prefix} property - * @param imageId + * @param image * @return * @throws ZosBatchException */ @@ -162,7 +162,7 @@ public interface IZosManagerSpi extends IZosManager { /** * Store an artifact in the results archive on behalf of another manager - * @param archivePath + * @param artifactPath * @param content * @param type */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJob.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJob.java index 08c85efd7..c3ff97eac 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJob.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJob.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch; /** @@ -92,7 +92,7 @@ public static JobStatus valueOfLabel(String jobStatus) { /** * The batch job completion return code, e.g.
      - * CC 0000, CC 0020, JCL ERROR, ABEND S0C4/code> etc.
      + * <code>CC 0000</code>, <code>CC 0020</code>, <code>JCL ERROR</code>, <code>ABEND S0C4</code> etc.<br> * Returns "????" if the job has not been submitted * * @return @@ -101,7 +101,7 @@ public static JobStatus valueOfLabel(String jobStatus) { /** * Wait for a job to complete. Return the highest return code for the job. The method will wait for the default - * resource wait time before timing out. Returns {@link Integer.MIN_VALUE} if return code is non numeric. + * resource wait time before timing out. Returns {@link Integer#MIN_VALUE} if return code is non numeric. * Use {@link #getRetcode()} to get the {@link String} value * * @return highest CC @@ -111,7 +111,7 @@ public static JobStatus valueOfLabel(String jobStatus) { /** * Wait for a job to complete. Return the highest return code for the job. The method will wait for the default - * resource wait time before timing out. Returns {@link Integer.MIN_VALUE} if return code is non numeric. + * resource wait time before timing out. Returns {@link Integer#MIN_VALUE} if return code is non numeric. * Use {@link #getRetcode()} to get the {@link String} value * * @param timeout in seconds diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputSpoolFileImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputSpoolFileImpl.java index 569c5ee8a..cdab7602e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputSpoolFileImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/internal/ZosBatchJobOutputSpoolFileImpl.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosbatch.internal; import dev.galasa.zosbatch.IZosBatchJob; @@ -27,7 +27,6 @@ public class ZosBatchJobOutputSpoolFileImpl implements IZosBatchJobOutputSpoolFi /** * Constructor for creating spool file - * @param spoolFile * @param records * @param jobname * @param jobid diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosDataset.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosDataset.java index dff4872cf..002233313 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosDataset.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosDataset.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile; import java.util.Collection; @@ -376,7 +376,7 @@ public static DatasetDataType valueOfLabel(String label) { * primary and secondary extents to allocate. * * @param spaceUnit - * @param primaryExtent + * @param primaryExtents * @param secondaryExtents */ public void setSpace(SpaceUnit spaceUnit, int primaryExtents, int secondaryExtents); @@ -416,13 +416,13 @@ public static DatasetDataType valueOfLabel(String label) { /** * Set the storage class of the data set - * @param managementClass + * @param storageClass */ public void setStorageClass(String storageClass); /** * Set the data class of the data set - * @param managementClass + * @param dataClass */ public void setDataClass(String dataClass); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosFileHandler.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosFileHandler.java index 0640a0582..ed183d4da 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosFileHandler.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosFileHandler.java @@ -22,7 +22,7 @@ *

    • IVSAMDataset
      • *
    * Typical usage would be to instantiate one of these using the newXXX(...) - * methods (e.g.: {@link #newDataset(String)}), then to call methods on that + * methods (e.g.: {@link #newDataset(String, IZosImage)}), then to call methods on that * object to configure it, and then to call methods on this manager to * manipulate it. *

    @@ -57,9 +57,7 @@ public interface IZosFileHandler { /** * Instantiate a new {@link IZosVSAMDataset} object with the given name. The * object returned is a 'blank-slate' and will require configuring before it - * can be defined or stored. See {@link #newESDS(String)}, - * {@link #newKSDS(String)} or {@link #newRRDS(String)} for pre-configured - * VSAM objects. + * can be defined or stored. * * @param dsname * @return diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosUNIXFile.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosUNIXFile.java index 4311590e9..c312d8ffb 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosUNIXFile.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosUNIXFile.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile; import java.nio.file.attribute.PosixFilePermission; @@ -125,7 +125,7 @@ public String toString() { /** * Write content to the zOS UNIX file on the zOS image in Binary mode - *

    See {@link #setDataType(DatasetDataType)} + *

    See {@link #setDataType(UNIXFileDataType)} * @param content * @throws ZosUNIXFileException */ @@ -133,14 +133,14 @@ public String toString() { /** * Retrieve the content of the zOS UNIX file from the zOS image in Text mode - *

    See {@link #setDataType(DatasetDataType)} + *

    See {@link #setDataType(UNIXFileDataType)} * @throws ZosUNIXFileException */ public String retrieveAsText() throws ZosUNIXFileException; /** * Retrieve content of the zOS UNIX file from the zOS image in Binary mode - *

    See {@link #setDataType(DatasetDataType)} + *

    See {@link #setDataType(UNIXFileDataType)} * @return data set content * @throws ZosUNIXFileException */ @@ -176,7 +176,7 @@ public String toString() { /** * Set the data type ({@link UNIXFileDataType}) for store and retrieve of the zOS UNIX file content - * @param fileType + * @param dataType */ public void setDataType(UNIXFileDataType dataType); @@ -191,19 +191,16 @@ public String toString() { /** * Return the zOS UNIX file type ({@link UNIXFileType}) - * @param fileType */ public UNIXFileType getFileType(); /** * Return the data type ({@link UNIXFileDataType}) for store and retrieve of the zOS UNIX file content - * @param fileType */ public UNIXFileDataType getDataType(); /** * Return the path of the zOS UNIX file or directory - * @param fileType */ public String getUnixPath(); @@ -263,7 +260,7 @@ public String toString() { public boolean shouldCleanup(); /** - * Convert {@link Set}<{@link PosixFilePermission}> to Symbolic Notation (e.g. rwxwrxrwx) + * Convert {@link Set}<{@link PosixFilePermission}> to Symbolic Notation (e.g. rwxwrxrwx) * @param accessPermissions * @return a {@link String} containing the file permissions in Symbolic Notation */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosVSAMDataset.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosVSAMDataset.java index 327e2c056..638a3d5fe 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosVSAMDataset.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/IZosVSAMDataset.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosfile; import javax.validation.constraints.NotNull; @@ -685,7 +685,7 @@ public enum WriteCheckOption { /** * Get the IDCAMS REPRO command - * @param infile + * @param indatasetName * @return * @throws ZosVSAMDatasetException */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/spi/IZosFileSpi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/spi/IZosFileSpi.java index 58d67574b..8f7fa9488 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/spi/IZosFileSpi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosfile/spi/IZosFileSpi.java @@ -10,14 +10,12 @@ import dev.galasa.zosfile.IZosFileHandler; import dev.galasa.zosfile.ZosFileManagerException; -/** - * SPI interface to {@link IZosFile} - */ + public interface IZosFileSpi { /** * Returns a zOS File Handler instance - * @return an {@link IZosFileHandler} implementation instance + * @return an {@link dev.galasa.zosfile.IZosFileHandler} implementation instance */ @NotNull public IZosFileHandler getZosFileHandler() throws ZosFileManagerException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/ITerminal.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/ITerminal.java index ae55aa292..5507b07cd 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/ITerminal.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/ITerminal.java @@ -60,7 +60,7 @@ ITerminal positionCursorToFieldContaining(@NotNull String searchText) * The returned boolean will depend on if the amount of occurrences is found. * * @param text - * @param occurances + * @param occurrences * @return if the text was found */ boolean searchText(String text, int occurrences); @@ -271,7 +271,6 @@ ITerminal reportExtendedScreen(boolean printCursor, boolean printColour, boolean * If there are not enough characters on the row to satisfy the length requirement, the retrieve will wrap to the next * row, unless it is the last row, in which case an exception will be thrown. * - * @param length * @param length - The number of characters to extract * @return The contents extracted * @throws Zos3270Exception - If the length causes the extract to overflow the end of the screen buffer diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServer.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServer.java index edf7cad86..ea8cbc58f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServer.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServer.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty; import java.util.List; @@ -376,11 +376,11 @@ public String toString() { /** * Deploy an application to the Liberty server. This method copies the application archive file to the zOS UNIX file system and * creates an application element in the server.xml. - * @param testClass a {@link class} in the same bundle containing the application archive file, use this.getClass() + * @param testClass a class in the same bundle containing the application archive file, use this.getClass() * @param path the path in the bundle to the application archive file * @param targetLocation the location on the zOS UNIX file system to store the application archive file. If the value is null, * ${shared.app.dir}/fileName will be used - * @param type the application type {@see ApplicationType} + * @param type the application type {@link dev.galasa.zosliberty.IZosLibertyServer.ApplicationType} * @param name the name of the application * @param contextRoot the application context-root. Can be null * @throws ZosLibertyServerException @@ -389,7 +389,7 @@ public String toString() { /** * Deploy an application to the Liberty server dropins directory. This method copies the application archive file to the Liberty server dropins directory - * @param testClass a {@link class} in the same bundle containing the application archive file, use this.getClass() + * @param testClass a class in the same bundle containing the application archive file, use this.getClass() * @param path the path in the bundle to the application archive file * @throws ZosLibertyServerException */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerLog.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerLog.java index 052f4484a..807910245 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerLog.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerLog.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty; import java.io.OutputStream; @@ -137,7 +137,7 @@ public interface IZosLibertyServerLog { *

  • the failText is found;
    • *
  • the specified timeout is reached.
    • * - * @param searchString the text to search + * @param searchText the text to search * @param timeout timeout value in seconds * @return the string found or null * @throws ZosLibertyServerException @@ -151,8 +151,8 @@ public interface IZosLibertyServerLog { *
  • the failText is found;
    • *
  • the specified timeout is reached.
    • * - * @param searchString the text to search - * @param failString the failure text to search + * @param searchText the text to search + * @param failText the failure text to search * @param timeout timeout value in seconds * @return the string found or null * @throws ZosLibertyServerException diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerXml.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerXml.java index c58cab937..4de563721 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerXml.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerXml.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty; import java.util.List; @@ -72,7 +72,7 @@ public interface IZosLibertyServerXml { public void store() throws ZosLibertyServerException; /** - * Update the content of the {@link IZosLibertyServerXml) with the content of the server.xml file from the zOS UNIX file system + * Update the content of the {@link IZosLibertyServerXml} with the content of the server.xml file from the zOS UNIX file system * @throws ZosLibertyServerException */ public void loadFromFileSystem() throws ZosLibertyServerException; @@ -177,7 +177,7 @@ public interface IZosLibertyServerXml { /** * Remove all XML elements with specified name and id from the Liberty server.xml Document object * @param elementName the XML element name - * @param elementId the XML element id + * @param id the XML element id * @throws ZosLibertyServerException */ public void removeElementsById(String elementName, String id) throws ZosLibertyServerException; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerXmlElementList.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerXmlElementList.java index 36bbf9892..180da00e1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerXmlElementList.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerXmlElementList.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosliberty; import java.util.Collection; @@ -17,7 +17,7 @@ public interface IZosLibertyServerXmlElementList /** * Put an XML element in the element list * @param elementName - The name of the element to add - * @param attributes - A HashMap of attributes + * @param attributes - A HashMap<String, String> of attributes */ public void add(String elementName, Map attributes); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmf.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmf.java index ea7a7a734..be965eb12 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmf.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosmf.manager/src/main/java/dev/galasa/zosmf/IZosmf.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosmf; import java.util.List; @@ -134,7 +134,7 @@ public String toString() { * Issue an HTTP PUT request to the zOSMF server with no request body * * @param path identifies the zOSMF REST API - * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus.HttpStatus.SC_OK} when null + * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus#SC_OK} when null * @param convert is a data conversion required. If true, data will be converted betwen EBCDIC to ISO8859-1. If false, no data conversion will take place. * @return the zOSMF server response * @throws ZosmfException @@ -146,7 +146,7 @@ public String toString() { * * @param path identifies the zOSMF REST API * @param requestBody the request body - * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus.HttpStatus.SC_OK} when null + * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus#SC_OK} when null * @return the zOSMF server response * @throws ZosmfException */ @@ -157,7 +157,7 @@ public String toString() { * * @param path identifies the zOSMF REST API * @param requestBody the request body - * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus.SC_OK} when null + * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus#SC_OK} when null * @return the zOSMF server response * @throws ZosmfException */ @@ -168,7 +168,7 @@ public String toString() { * * @param path identifies the zOSMF REST API * @param body the request body - * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus.HttpStatus.SC_OK} when null + * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus#SC_OK} when null * @return the zOSMF server response * @throws ZosmfException */ @@ -179,7 +179,7 @@ public String toString() { * * @param path identifies the zOSMF REST API * @param body the request body - * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus.HttpStatus.SC_OK} when null + * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus#SC_OK} when null * @return the zOSMF server response * @throws ZosmfException */ @@ -189,7 +189,7 @@ public String toString() { * Issue an HTTP DELETE request to the zOSMF server with no request body * * @param path identifies the zOSMF REST API - * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus.HttpStatus.SC_OK} when null + * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus#SC_OK} when null * @return the zOSMF server response * @throws ZosmfException */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgram.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgram.java index fe2ccc210..174f3d7f1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgram.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgram.java @@ -96,7 +96,7 @@ public enum Language { */ PL1(".pl1"), /** - * Assembler program with .asm<\code> file extension + * Assembler program with <code>.asm<\code> file extension */ ASSEMBLER(".asm"), /** diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/spi/IZosProgramManagerSpi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/spi/IZosProgramManagerSpi.java index 27a699410..38770f420 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/spi/IZosProgramManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/spi/IZosProgramManagerSpi.java @@ -22,7 +22,7 @@ public interface IZosProgramManagerSpi { * Returns a new zOS Program * @param image The zOS Image * @param name The program name - * @param programSource The program source in the bundle + * @param source The program source in the bundle * @param language The programming language. See {@link ZosProgram.Language} * @param cics Is a CICS program. * @param loadlib The load module data set name diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapi.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapi.java index 2bcb7d557..5d4713256 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapi.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosrseapi.manager/src/main/java/dev/galasa/zosrseapi/IRseapi.java @@ -1,14 +1,16 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zosrseapi; import java.util.List; import javax.validation.constraints.NotNull; +import java.net.HttpURLConnection; + import org.apache.http.HttpStatus; import com.google.gson.JsonObject; @@ -21,6 +23,8 @@ */ public interface IRseapi { + + /** * Enumeration of RSE API request types */ @@ -79,7 +83,7 @@ public String getRequestType() { * Issue an HTTP PUT request to the RSE API server with no request body * * @param path identifies the RSE API REST API server - * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus.HttpStatus.SC_OK} when null + * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus#SC_OK} when null * @param convert is a data conversion required. If true, data will be converted betwen EBCDIC to ISO8859-1. If false, no data conversion will take place. * @return the RSE API server response * @throws RseapiException @@ -91,7 +95,7 @@ public String getRequestType() { * * @param path identifies the RSE API REST API server * @param body the request body - * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus.HttpStatus.SC_OK} when null + * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus#SC_OK} when null * @return the RSE API server response * @throws RseapiException */ @@ -102,7 +106,7 @@ public String getRequestType() { * * @param path identifies the RSE API REST API server * @param body the request body - * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus.HttpStatus.SC_OK} when null + * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus#SC_OK} when null * @return the RSE API server response * @throws RseapiException */ @@ -113,7 +117,7 @@ public String getRequestType() { * * @param path identifies the RSE API REST API server * @param body the request body - * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus.HttpStatus.SC_OK} when null + * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus#SC_OK} when null * @return the RSE API server response * @throws RseapiException */ @@ -123,8 +127,7 @@ public String getRequestType() { * Issue an HTTP POST request to the RSE API server with no request body * * @param path identifies the RSE API REST API server - * @param requestBody the request body - * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus.HttpStatus.SC_OK} when null + * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus#SC_OK} when null * @return the RSE API server response * @throws RseapiException */ @@ -135,7 +138,7 @@ public String getRequestType() { * * @param path identifies the RSE API REST API server * @param requestBody the request body - * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus.HttpStatus.SC_OK} when null + * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus#SC_OK} when null * @return the RSE API server response * @throws RseapiException */ @@ -145,7 +148,7 @@ public String getRequestType() { * Issue an HTTP DELETE request to the RSE API server with no request body * * @param path identifies the RSE API REST API server - * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus.HttpStatus.SC_OK} when null + * @param validStatusCodes a {@link List} of acceptable HTTP Status codes. Default to {@link HttpStatus#SC_OK} when null * @return the RSE API server response * @throws RseapiException */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosSecurity.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosSecurity.java index 8639c4d3e..626e94fb0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosSecurity.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosSecurity.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import java.security.KeyStore; @@ -86,7 +86,6 @@ public interface IZosSecurity { /** * Create a new profile on the specified image/sysplex. * @param className - * @param image - The image/sysplex * @param name - The name of the profiles * @param uacc - The uacc to assign, or null * @param refresh - issue SETROPTS REFRESH @@ -521,7 +520,7 @@ public KeyStore generateSelfSignedCertificate(String alias, String distinguished /** * Create a Kerberos client principal. This will create the kerbname and the * required association with the passed in service principal (see - * {@link #createKerberosPrincipal(IZosUserid, IZosImage, String)} fr the passed + * {@link #createKerberosPrincipal(IZosUserid, String)} fr the passed * userid. * * @param servicePrincipal - service principal with which to associate this @@ -538,7 +537,8 @@ public KeyStore generateSelfSignedCertificate(String alias, String distinguished * * @param serviceUserid - zOS Userid for this principal * @param realm - realm to use, see - * {@link #getDefaultKerberosRealm(IZosImage)} + * {@link #getDefaultKerberosRealm()} + * * @return * @throws ZosSecurityManagerException */ diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/KerberosInitiator.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/KerberosInitiator.java index 4425f00ee..d8bddff33 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/KerberosInitiator.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/KerberosInitiator.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import jakarta.xml.bind.DatatypeConverter; @@ -20,9 +20,6 @@ * {@link #create()} to create the security context. {@link #initiate()} will * then be called, (and potentially {@link #initiate(KerberosToken)} if further * initiation is required). - * - * @author James Bartlett - * */ public class KerberosInitiator { @@ -42,7 +39,6 @@ public class KerberosInitiator { /** * Construct with service client and kdc * - * @param logRepo * @param service * @param client * @param kdc diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosUserid.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosUserid.java index daa0f02b8..0b0f9564b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosUserid.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosUserid.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import java.lang.annotation.ElementType; @@ -17,7 +17,7 @@ * Requests a zOS Userid. Will not have any groups attached, a default password * set, no passphrase and no access to any resources. * - * @author Michael Baylis + * */ @Retention(RetentionPolicy.RUNTIME) @@ -46,8 +46,8 @@ public boolean runUser() default false; /** - * Set tag of {@link EnsZosClient} where user will be created. - * + + * @see #ensZosClient() * @return - the set symbolic */ public String ensZosClient() default ""; From 2fc79cd1fa1bbb33f1ea1e43ecfc8ab69012bcb5 Mon Sep 17 00:00:00 2001 From: Aashir Siddiqui Date: Tue, 23 Jul 2024 15:18:40 +0100 Subject: [PATCH 227/263] Changes made as requested Issue #1249 Signed-off-by: Aashir Siddiqui --- .../main/java/dev/galasa/cicsts/ICemt.java | 2 +- .../galasa/cicsts/IExecInterfaceBlock.java | 119 +++++++++--------- .../dev/galasa/http/HttpClientResponse.java | 8 +- .../java/dev/galasa/http/IHttpClient.java | 28 ++--- .../dev/galasa/jmeter/IJMeterSession.java | 8 +- .../dev/galasa/zosbatch/IZosBatchJob.java | 6 +- .../IZosLibertyServerXmlElementList.java | 2 +- .../dev/galasa/zosprogram/ZosProgram.java | 8 +- 8 files changed, 91 insertions(+), 90 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICemt.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICemt.java index cdca1d18f..2dbf3646d 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICemt.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICemt.java @@ -16,7 +16,7 @@ public interface ICemt { /** * Inquire a CEMT resource using the resource type and name. * This does not support inquiries of multiple resources at once. - * Will return null if the resource is not found. + * @return null if the resource is not found. * @param cemtTerminal an {@link ITerminal} object logged on to the CICS region and in an active CEMT session. * If mixed case is required, the terminal should be presented with no upper case translate status. * For example, the test could first issue CEOT TRANIDONLY diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/IExecInterfaceBlock.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/IExecInterfaceBlock.java index e30b18096..6be5e8910 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/IExecInterfaceBlock.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/IExecInterfaceBlock.java @@ -12,187 +12,186 @@ public interface IExecInterfaceBlock { /** - * Returns a {@link String} representation of the EIBRESP field if available - * @return + * @return a {@link String} representation of the EIBRESP field if available */ public String getResponse(); /** - * Returns the value of the EIBTIME field in the EIB. - * @return + * @return the value of the EIBTIME field in the EIB. + * */ public int getEIBTIME(); /** - * Returns the value of the EIBDATE field in the EIB. - * @return + * @return the value of the EIBDATE field in the EIB. + * */ public int getEIBDATE(); /** - * Returns the value of the EIBTRNID field in the EIB. + * @return the value of the EIBTRNID field in the EIB. * @param hex return a char array containing the hex values of the field - * @return + * */ public String getEIBTRNID(boolean hex); /** - * Returns the value of the EIBTASKN field in the EIB. - * @return + * @return the value of the EIBTASKN field in the EIB. + * */ public int getEIBTASKN(); /** - * Returns the value of the EIBTRMID field in the EIB. + * @return the value of the EIBTRMID field in the EIB. * @param hex return a char array containing the hex values of the field - * @return + * */ public String getEIBTRMID(boolean hex); /** - * Returns the value of the EIBCPOSN field in the EIB. - * @return + * @return the value of the EIBCPOSN field in the EIB. + * */ public int getEIBCPOSN(); /** - * Returns the value of the EIBCALEN field in the EIB. - * @return + * @return the value of the EIBCALEN field in the EIB. + * */ public int getEIBCALEN(); /** - * Returns the value of the EIBAID field in the EIB. - * @return + * @return the value of the EIBAID field in the EIB. + * */ public char getEIBAID(); /** - * Returns the value of the EIBFN field in the EIB. - * @return + * @return the value of the EIBFN field in the EIB. + * */ public char[] getEIBFN(); /** - * Returns the value of the EIBRCODE field in the EIB. - * @return + * @return the value of the EIBRCODE field in the EIB. + * */ public char[] getEIBRCODE(); /** - * Returns the value of the EIBDS field in the EIB. + * @return the value of the EIBDS field in the EIB. * @param hex return a char array containing the hex values of the field - * @return + * */ public String getEIBDS(boolean hex); /** - * Returns the value of the EIBREQID field in the EIB. + * @return the value of the EIBREQID field in the EIB. * @param hex return a char array containing the hex values of the field - * @return + * */ public String getEIBREQID(boolean hex); /** - * Returns the value of the EIBRSRCE field in the EIB. + * @return the value of the EIBRSRCE field in the EIB. * @param hex return a char array containing the hex values of the field - * @return + * */ public String getEIBRSRCE(boolean hex); /** - * Returns the value of the EIBSYNC field in the EIB. - * @return + * @return the value of the EIBSYNC field in the EIB. + * */ public char getEIBSYNC(); /** - * Returns the value of the EIBFREE field in the EIB. - * @return + * @return the value of the EIBFREE field in the EIB. + * */ public char getEIBFREE(); /** - * Returns the value of the EIBRECV field in the EIB. - * @return + * @return the value of the EIBRECV field in the EIB. + * */ public char getEIBRECV(); /** - * Returns the value of the EIBATT field in the EIB. - * @return + * @return the value of the EIBATT field in the EIB. + * */ public char getEIBATT(); /** - * Returns the value of the EIBEOC field in the EIB. - * @return + * @return the value of the EIBEOC field in the EIB. + * */ public char getEIBEOC(); /** - * Returns the value of the field in the EIB. - * @return + * @return the value of the field in the EIB. + * */ public char getEIBFMH(); /** - * Returns the value of the EIBCOMPL field in the EIB. - * @return + * @return the value of the EIBCOMPL field in the EIB. + * */ public char getEIBCOMPL(); /** - * Returns the value of the EIBSIG field in the EIB. - * @return + * @return the value of the EIBSIG field in the EIB. + * */ public char getEIBSIG(); /** - * Returns the value of the EIBCONF field in the EIB. - * @return + * @return the value of the EIBCONF field in the EIB. + * */ public char getEIBCONF(); /** - * Returns the value of the EIBERR field in the EIB. - * @return + * @return the value of the EIBERR field in the EIB. + * */ public char getEIBERR(); /** - * Returns the value of the EIBERRCD field in the EIB. - * @return + * @return the value of the EIBERRCD field in the EIB. + * */ public char[] getEIBERRCD(); /** - * Returns the value of the EIBSYNRB field in the EIB. - * @return + * @return the value of the EIBSYNRB field in the EIB. + * */ public char getEIBSYNRB(); /** - * Returns the value of the EIBNODAT field in the EIB. - * @return + * @return the value of the EIBNODAT field in the EIB. + * */ public char getEIBNODAT(); /** - * Returns the value of the EIBRESP field in the EIB. - * @return + * @return the value of the EIBRESP field in the EIB. + * */ public int getEIBRESP(); /** - * Returns the value of the EIBRESP2 field in the EIB. - * @return + * @return the value of the EIBRESP2 field in the EIB. + * */ public int getEIBRESP2(); /** - * Returns the value of the EIBRLDBK field in the EIB. - * @return + * @return the value of the EIBRLDBK field in the EIB. + * */ public char getEIBRLDBK(); } diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java index 192a4de9d..7cc1a0d5b 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java @@ -240,11 +240,11 @@ public static HttpClientResponse textResponse(CloseableHttpResponse http } /** - * Create an {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type + * Create an {@link HttpClientResponse} with a com.google.gson.JsonObject content type * from an {@link HttpResponse}. * * @param httpResponse - * @return - {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type + * @return - {@link HttpClientResponse} with a com.google.gson.JsonObject content type * @throws HttpClientException */ public static HttpClientResponse jsonResponse(CloseableHttpResponse httpResponse) @@ -253,14 +253,14 @@ public static HttpClientResponse jsonResponse(CloseableHttpResponse } /** - * Create an {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type + * Create an {@link HttpClientResponse} with a com.google.gson.JsonObject content type * from an {@link HttpResponse}. If contentOnBadResponse is true, an attempt * will be made to retrieve the content even on a non 200 status code, otherwise * the content will be null in such an instance. * * @param httpResponse * @param contentOnBadResponse - * @return - {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type + * @return - {@link HttpClientResponse} with a com.google.gson.JsonObject content type * @throws HttpClientException */ public static HttpClientResponse jsonResponse(CloseableHttpResponse httpResponse, diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpClient.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpClient.java index bcd53f1ea..06438fb4f 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpClient.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpClient.java @@ -122,54 +122,54 @@ HttpClientResponse postXML(String url, String xml) throws HttpClientException; /** - * Issue an HTTP GET to the provided URL, receiving a <com.google.gson.JsonObject> in the + * Issue an HTTP GET to the provided URL, receiving a com.google.gson.JsonObject in the * response. * * @param url - * @return - {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type + * @return - {@link HttpClientResponse} with a com.google.gson.JsonObject content type * @throws HttpClientException */ HttpClientResponse getJson(String url) throws HttpClientException; /** * Issue an HTTP POST to the provided URL, sending the provided - * <com.google.gson.JsonObject> and receiving a <com.google.gson.JsonObject> in the response. + * com.google.gson.JsonObject and receiving a com.google.gson.JsonObject in the response. * * @param url * @param json - * @return - {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type + * @return - {@link HttpClientResponse} with a com.google.gson.JsonObject content type * @throws HttpClientException */ HttpClientResponse postJson(String url, JsonObject json) throws HttpClientException; /** * Issue an HTTP PUT to the provided URL, sending the provided - * com.google.gson.JSONObject and receiving a com.google.gson.JSONObject in the response. + * com.google.gson.JsonObject and receiving a com.google.gson.JsonObject in the response. * * @param url * @param json - * @return - {@link HttpClientResponse} with a com.google.gson.JSONObject content type + * @return - {@link HttpClientResponse} with a com.google.gson.JsonObject content type * @throws HttpClientException */ HttpClientResponse putJson(String url, JsonObject json) throws HttpClientException; /** - * Issue an HTTP DELETE to the provided URL, receiving a <com.google.gson.JsonObject> in + * Issue an HTTP DELETE to the provided URL, receiving a com.google.gson.JsonObject in * the response. * * @param url - * @return - {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type + * @return - {@link HttpClientResponse} with a com.google.gson.JsonObject content type * @throws HttpClientException */ HttpClientResponse deleteJson(String url) throws HttpClientException; /** - * Issue an HTTP DELETE to the provided URL, receiving a <com.google.gson.JsonObject> in + * Issue an HTTP DELETE to the provided URL, receiving a com.google.gson.JsonObject in * the response. * * @param url * @param json - * @return - {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type + * @return - {@link HttpClientResponse} with a com.google.gson.JsonObject content type * @throws HttpClientException */ HttpClientResponse deleteJson(String url, JsonObject json) throws HttpClientException; @@ -222,7 +222,7 @@ HttpClientResponse postXML(String url, String xml) * * @param url * @param binary - * @return - {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type + * @return - {@link HttpClientResponse} with a com.google.gson.JsonObject content type * @throws HttpClientException */ HttpClientResponse putBinary(String url, byte[] binary) throws HttpClientException; @@ -233,7 +233,7 @@ HttpClientResponse postXML(String url, String xml) * * @param url * @param binary - * @return - {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type + * @return - {@link HttpClientResponse} with a com.google.gson.JsonObject content type * @throws HttpClientException */ HttpClientResponse getBinary(String url, byte[] binary) throws HttpClientException; @@ -244,7 +244,7 @@ HttpClientResponse postXML(String url, String xml) * * @param url * @param binary - * @return - {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type + * @return - {@link HttpClientResponse} with a com.google.gson.JsonObject content type * @throws HttpClientException */ HttpClientResponse postBinary(String url, byte[] binary) throws HttpClientException; @@ -255,7 +255,7 @@ HttpClientResponse postXML(String url, String xml) * * @param url * @param binary - * @return - {@link HttpClientResponse} with a <com.google.gson.JsonObject> content type + * @return - {@link HttpClientResponse} with a com.google.gson.JsonObject content type * @throws HttpClientException */ HttpClientResponse deleteBinary(String url, byte[] binary) throws HttpClientException; diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/IJMeterSession.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/IJMeterSession.java index 6815c2aa6..c9eba0acd 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/IJMeterSession.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.jmeter.manager/src/main/java/dev/galasa/jmeter/IJMeterSession.java @@ -60,9 +60,11 @@ public interface IJMeterSession { * JMX-files have to be prepared for this by replacing ALL the $P__VARIABLE notations with $VARIABLE notations * Then by adding neccesary parameters inside a HashMap with it, it is possible to change the target of a test dynamically inside the test * Example: - * HashMap<String,Object> map = new HashMap<String,Object>(); - * map.put("HOST", "galasa.dev"); - * session.setChangedParametersJmxFile(jmxStream, map); + * 
    +        HashMap map = new HashMap();
+        map.put("HOST", "galasa.dev");
+        session.setChangedParametersJmxFile(jmxStream, map);
+
    * @param jmxStream * @param parameters * @throws JMeterManagerException diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJob.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJob.java index c3ff97eac..14a32c0f9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJob.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJob.java @@ -66,7 +66,7 @@ public static JobStatus valueOfLabel(String jobStatus) { public String getOwner(); /** - * The type for this Job, i.e. JOB, STC or TSU. Returns "???" if no type has been associated + * The type for this Job, i.e. "JOB", "STC" or "TSU". Returns "???" if no type has been associated * * @return batch job type */ @@ -81,7 +81,7 @@ public static JobStatus valueOfLabel(String jobStatus) { /** * The batch job value as a {@link String}, e.g.
    - * INPUT, ACTIVE, OUTPUT etc.
    + * "INPUT", "ACTIVE", "OUTPUT" etc.
    * Returns "????????" if the job has not been submitted *

    * N.B. Values are implementation dependent @@ -92,7 +92,7 @@ public static JobStatus valueOfLabel(String jobStatus) { /** * The batch job completion return code, e.g.
    - * <code>CC 0000</code>, <code>CC 0020</code>, <code>JCL ERROR</code>, <code>ABEND S0C4</code> etc.<br> + * "CC 0000", "CC 0020", "JCL ERROR", "ABEND S0C4" etc. * Returns "????" if the job has not been submitted * * @return diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerXmlElementList.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerXmlElementList.java index 180da00e1..f4d806266 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerXmlElementList.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosliberty.manager/src/main/java/dev/galasa/zosliberty/IZosLibertyServerXmlElementList.java @@ -17,7 +17,7 @@ public interface IZosLibertyServerXmlElementList /** * Put an XML element in the element list * @param elementName - The name of the element to add - * @param attributes - A HashMap<String, String> of attributes + * @param attributes - A HashMap of attributes */ public void add(String elementName, Map attributes); diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgram.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgram.java index 174f3d7f1..ae9c40b7b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgram.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zosprogram.manager/src/main/java/dev/galasa/zosprogram/ZosProgram.java @@ -84,19 +84,19 @@ */ public enum Language { /** - * COBOL program with .cbl file extension + * COBOL program with ".cbl" file extension */ COBOL(".cbl"), /** - * C program with .c file extension + * C program with ".c" file extension */ C(".c"), /** - * PL1 program with .pl1 file extension + * PL1 program with ".pl1" file extension */ PL1(".pl1"), /** - * Assembler program with <code>.asm<\code> file extension + * Assembler program with ".asm" file extension */ ASSEMBLER(".asm"), /** From 95d7d9615efc3eb8704f55972419ca0623c8feb1 Mon Sep 17 00:00:00 2001 From: dhruv Date: Wed, 24 Jul 2024 17:28:06 +0530 Subject: [PATCH 228/263] added recommended changes Signed-off-by: dhruv --- .github/workflows/build.yaml | 39 +++++++++++++++++++++++++++++---- .github/workflows/pr-build.yaml | 19 ++++++++++++++-- dockerfiles/dockerfile | 6 +++++ 3 files changed, 58 insertions(+), 6 deletions(-) create mode 100644 dockerfiles/dockerfile diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c5825bb11..7a7da1395 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -6,7 +6,9 @@ on: branches: [main] env: - NAMESPACE: jaydee029 + REGISTRY: ghcr.io + NAMESPACE: galasa-dev + IMAGE_TAG: main jobs: build-gradle: @@ -23,6 +25,10 @@ jobs: java-version: '11' distribution: 'semeru' + - name: Print githash + run: | + echo $GITHUB_SHA > ./managers.githash + - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 with: @@ -30,7 +36,8 @@ jobs: - name: Build ,Test and Publish Managers env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_ACTOR: ${{github.actor}} + GITHUB_TOKEN: ${{ github.token }} ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.GPG_KEY }} ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_SECRET }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }} @@ -39,5 +46,29 @@ jobs: -Dorg.gradle.jvmargs=-Xmx4096M \ -PsourceMaven=https://development.galasa.dev/main/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ - -PtargetMaven=https://maven.pkg.github.com/${{env.NAMESPACE}}/managers/ -PjacocoEnabled=true -PisMainOrRelease=true - \ No newline at end of file + -PtargetMaven=${{github.workspace}}/repo -PjacocoEnabled=true -PisMainOrRelease=true + + - name: Extract metadata for Managers image + id: metadata + uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 + with: + images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/managers-maven-artefacts + + - name: Build Managers image for development Maven registry + id: build + uses: docker/build-push-action@v5 + with: + context: . + file: dockerfiles/dockerfile + push: true + tags: ${{ steps.metadata.outputs.tags }} + labels: ${{ steps.metadata.outputs.labels }} + build-args: | + dockerRepository=harbor.galasa.dev + tag=${{ env.IMAGE_TAG }} + + - name: Recycle application in ArgoCD + env: + ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_TOKEN }} + run: | + docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app actions run main-maven-repos restart --kind Deployment --resource-name managers-main --server argocd.galasa.dev \ No newline at end of file diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index bcc627ff5..16f491f11 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -22,6 +22,10 @@ jobs: with: java-version: '11' distribution: 'semeru' + + - name: Print githash + run: | + echo $GITHUB_SHA > ./managers.githash - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 @@ -30,9 +34,20 @@ jobs: - name: Test and Build Managers run: | - gradle -b galasa-managers-parent/build.gradle clean build \ + gradle -b galasa-managers-parent/build.gradle check publish \ -Dorg.gradle.jvmargs=-Xmx4096M \ -PsourceMaven=https://development.galasa.dev/main/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ - -PtargetMaven=https://maven.pkg.github.com/${{env.NAMESPACE}}/managers/ + -PtargetMaven=${{github.workspace}}/repo + + - name: Build managers Image for testing + uses: docker/build-push-action@v5 + with: + context: . + file: dockerfiles/dockerfile + load: true + tags: managers:test + build-args: | + dockerRepository=harbor.galasa.dev + tag=main \ No newline at end of file diff --git a/dockerfiles/dockerfile b/dockerfiles/dockerfile new file mode 100644 index 000000000..a473265ea --- /dev/null +++ b/dockerfiles/dockerfile @@ -0,0 +1,6 @@ +ARG dockerRepository +ARG tag +FROM ${dockerRepository}/galasadev/galasa-extensions:${tag} + +COPY repo/ /usr/local/apache2/htdocs/ +COPY managers.githash /usr/local/apache2/htdocs/managers.githash \ No newline at end of file From 43a2f77734909aea069fdf15be4dfc2b7e61c1b9 Mon Sep 17 00:00:00 2001 From: dhruv Date: Wed, 24 Jul 2024 17:43:37 +0530 Subject: [PATCH 229/263] final changes Signed-off-by: dhruv --- .github/workflows/build.yaml | 5 ++--- .github/workflows/pr-build.yaml | 8 ++------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7a7da1395..501ea277b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,9 +1,8 @@ name: Main build on: - workflow_dispatch: - pull_request: - branches: [main] + push: + branches: [main] env: REGISTRY: ghcr.io diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 16f491f11..e43e93aea 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -1,12 +1,8 @@ name: PR build on: - workflow_dispatch: - pull_request: - branches: [main] - -env: - NAMESPACE: jaydee029 + pull_request: + branches: [main] jobs: build-gradle: From f5ac91c135bf955f6f3e178a09f01f4b743a550e Mon Sep 17 00:00:00 2001 From: dhruv Date: Wed, 24 Jul 2024 17:48:20 +0530 Subject: [PATCH 230/263] final changes Signed-off-by: dhruv --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 501ea277b..c90d8309c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -70,4 +70,4 @@ jobs: env: ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_TOKEN }} run: | - docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app actions run main-maven-repos restart --kind Deployment --resource-name managers-main --server argocd.galasa.dev \ No newline at end of file + docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app actions run gh-maven-repos restart --kind Deployment --resource-name managers-gh --server argocd.galasa.dev \ No newline at end of file From c14b1a59082ef06126fc54362eaa648128793481 Mon Sep 17 00:00:00 2001 From: dhruv Date: Wed, 24 Jul 2024 19:38:08 +0530 Subject: [PATCH 231/263] changed pointing url Signed-off-by: dhruv --- .github/workflows/build.yaml | 2 +- .github/workflows/pr-build.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c90d8309c..98eb93813 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -43,7 +43,7 @@ jobs: run: | gradle -b galasa-managers-parent/build.gradle check publish --info \ -Dorg.gradle.jvmargs=-Xmx4096M \ - -PsourceMaven=https://development.galasa.dev/main/maven-repo/extensions \ + -PsourceMaven=https://development.galasa.dev/gh/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ -PtargetMaven=${{github.workspace}}/repo -PjacocoEnabled=true -PisMainOrRelease=true diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index e43e93aea..fa08b3353 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -32,7 +32,7 @@ jobs: run: | gradle -b galasa-managers-parent/build.gradle check publish \ -Dorg.gradle.jvmargs=-Xmx4096M \ - -PsourceMaven=https://development.galasa.dev/main/maven-repo/extensions \ + -PsourceMaven=https://development.galasa.dev/gh/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ -PtargetMaven=${{github.workspace}}/repo From 31d3d7f87d4287b0c0979385dc7c99bcfdd25165 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Thu, 25 Jul 2024 12:15:46 +0100 Subject: [PATCH 232/263] Minor adjustments to workflow for readability and secret names Signed-off-by: Jade Carino --- .github/workflows/build.yaml | 121 +++++++++++++++++--------------- .github/workflows/pr-build.yaml | 78 ++++++++++---------- 2 files changed, 104 insertions(+), 95 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 98eb93813..8bf199c45 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -10,64 +10,73 @@ env: IMAGE_TAG: main jobs: - build-gradle: - name: build and Test Managers - runs-on: ubuntu-latest + build-managers: + name: Build Managers source code and Docker image for development Maven registry + runs-on: ubuntu-latest - steps: - - name: Checkout Code - uses: actions/checkout@v4 - - - name: Setup JDK - uses: actions/setup-java@v4 - with: - java-version: '11' - distribution: 'semeru' + steps: + - name: Checkout Code + uses: actions/checkout@v4 + + - name: Setup JDK + uses: actions/setup-java@v4 + with: + java-version: '11' + distribution: 'semeru' - - name: Print githash - run: | - echo $GITHUB_SHA > ./managers.githash + - name: Print githash + run: | + echo $GITHUB_SHA > ./managers.githash - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - with: - gradle-version: 6.9.2 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + with: + gradle-version: 6.9.2 - - name: Build ,Test and Publish Managers - env: - GITHUB_ACTOR: ${{github.actor}} - GITHUB_TOKEN: ${{ github.token }} - ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.GPG_KEY }} - ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_SECRET }} - ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }} - run: | - gradle -b galasa-managers-parent/build.gradle check publish --info \ - -Dorg.gradle.jvmargs=-Xmx4096M \ - -PsourceMaven=https://development.galasa.dev/gh/maven-repo/extensions \ - -PcentralMaven=https://repo.maven.apache.org/maven2/ \ - -PtargetMaven=${{github.workspace}}/repo -PjacocoEnabled=true -PisMainOrRelease=true - - - name: Extract metadata for Managers image - id: metadata - uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 - with: - images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/managers-maven-artefacts - - - name: Build Managers image for development Maven registry - id: build - uses: docker/build-push-action@v5 - with: - context: . - file: dockerfiles/dockerfile - push: true - tags: ${{ steps.metadata.outputs.tags }} - labels: ${{ steps.metadata.outputs.labels }} - build-args: | - dockerRepository=harbor.galasa.dev - tag=${{ env.IMAGE_TAG }} + - name: Build Managers source code + env: + GITHUB_ACTOR: ${{ github.actor }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.GPG_KEYID }} + ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_KEY }} + ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }} + run: | + gradle -b galasa-managers-parent/build.gradle check publish \ + -Dorg.gradle.jvmargs=-Xmx4096M \ + -PsourceMaven=https://development.galasa.dev/gh/maven-repo/extensions \ + -PcentralMaven=https://repo.maven.apache.org/maven2/ \ + -PtargetMaven=${{github.workspace}}/repo \ + -PjacocoEnabled=true \ + -PisMainOrRelease=true - - name: Recycle application in ArgoCD - env: - ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_TOKEN }} - run: | - docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app actions run gh-maven-repos restart --kind Deployment --resource-name managers-gh --server argocd.galasa.dev \ No newline at end of file + - name: Login to Github Container Registry + uses: docker/login-action@v3 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata for Managers image + id: metadata + uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 + with: + images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/managers-maven-artefacts + + - name: Build Managers image for development Maven registry + id: build + uses: docker/build-push-action@v5 + with: + context: . + file: dockerfiles/dockerfile + push: true + tags: ${{ steps.metadata.outputs.tags }} + labels: ${{ steps.metadata.outputs.labels }} + build-args: | + dockerRepository=harbor.galasa.dev + tag=${{ env.IMAGE_TAG }} + + - name: Recycle application in ArgoCD + env: + ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_TOKEN }} + run: | + docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app actions run gh-maven-repos restart --kind Deployment --resource-name managers-gh --server argocd.galasa.dev \ No newline at end of file diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index fa08b3353..19fd0aa91 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -5,45 +5,45 @@ on: branches: [main] jobs: - build-gradle: - name: build and Test Managers - runs-on: ubuntu-latest + build-managers: + name: Build Managers source code and Docker image + runs-on: ubuntu-latest - steps: - - name: Checkout Code - uses: actions/checkout@v4 - - - name: Setup JDK - uses: actions/setup-java@v4 - with: - java-version: '11' - distribution: 'semeru' - - - name: Print githash - run: | - echo $GITHUB_SHA > ./managers.githash + steps: + - name: Checkout Code + uses: actions/checkout@v4 + + - name: Setup JDK + uses: actions/setup-java@v4 + with: + java-version: '11' + distribution: 'semeru' + + - name: Print githash + run: | + echo $GITHUB_SHA > ./managers.githash - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - with: - gradle-version: 6.9.2 - - - name: Test and Build Managers - run: | - gradle -b galasa-managers-parent/build.gradle check publish \ - -Dorg.gradle.jvmargs=-Xmx4096M \ - -PsourceMaven=https://development.galasa.dev/gh/maven-repo/extensions \ - -PcentralMaven=https://repo.maven.apache.org/maven2/ \ - -PtargetMaven=${{github.workspace}}/repo + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + with: + gradle-version: 6.9.2 + + - name: Build Managers source code + run: | + gradle -b galasa-managers-parent/build.gradle check publish \ + -Dorg.gradle.jvmargs=-Xmx4096M \ + -PsourceMaven=https://development.galasa.dev/gh/maven-repo/extensions \ + -PcentralMaven=https://repo.maven.apache.org/maven2/ \ + -PtargetMaven=${{github.workspace}}/repo - - name: Build managers Image for testing - uses: docker/build-push-action@v5 - with: - context: . - file: dockerfiles/dockerfile - load: true - tags: managers:test - build-args: | - dockerRepository=harbor.galasa.dev - tag=main - \ No newline at end of file + - name: Build Managers image for testing + uses: docker/build-push-action@v5 + with: + context: . + file: dockerfiles/dockerfile + load: true + tags: managers:test + build-args: | + dockerRepository=harbor.galasa.dev + tag=main + \ No newline at end of file From 9c97099c9ce59ab4ebe4da233d0a4c800da3afe1 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Thu, 25 Jul 2024 14:58:58 +0100 Subject: [PATCH 233/263] Add missing config for GPG signing artefacts Signed-off-by: Jade Carino --- .../buildSrc/src/main/groovy/galasa.java.gradle | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.java.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.java.gradle index bda13eac0..8e8c39865 100644 --- a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.java.gradle +++ b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.java.gradle @@ -58,6 +58,10 @@ repositories { } signing { + def signingKeyId = findProperty("signingKeyId") + def signingKey = findProperty("signingKey") + def signingPassword = findProperty("signingPassword") + useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword) sign publishing.publications } @@ -108,8 +112,8 @@ publishing { if ("$targetMaven".startsWith('http')) { credentials { - username System.getenv('MAVENUSERNAME') - password System.getenv('MAVENPASSWORD') + username System.getenv("GITHUB_ACTOR") + password System.getenv("GITHUB_TOKEN") } } } From c177b46a1a1e190e764fd04dacbb5ac3b4fb2b33 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Thu, 25 Jul 2024 15:00:33 +0100 Subject: [PATCH 234/263] Use new image in GHCR Signed-off-by: Jade Carino --- .github/workflows/build.yaml | 2 +- .github/workflows/pr-build.yaml | 2 +- dockerfiles/dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8bf199c45..f7e4d31e3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -72,7 +72,7 @@ jobs: tags: ${{ steps.metadata.outputs.tags }} labels: ${{ steps.metadata.outputs.labels }} build-args: | - dockerRepository=harbor.galasa.dev + dockerRepository=ghcr.io tag=${{ env.IMAGE_TAG }} - name: Recycle application in ArgoCD diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 19fd0aa91..7fe26321d 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -44,6 +44,6 @@ jobs: load: true tags: managers:test build-args: | - dockerRepository=harbor.galasa.dev + dockerRepository=ghcr.io tag=main \ No newline at end of file diff --git a/dockerfiles/dockerfile b/dockerfiles/dockerfile index a473265ea..2cc63736a 100644 --- a/dockerfiles/dockerfile +++ b/dockerfiles/dockerfile @@ -1,6 +1,6 @@ ARG dockerRepository ARG tag -FROM ${dockerRepository}/galasadev/galasa-extensions:${tag} +FROM ${dockerRepository}/galasa-dev/extensions-maven-artefacts:${tag} COPY repo/ /usr/local/apache2/htdocs/ COPY managers.githash /usr/local/apache2/htdocs/managers.githash \ No newline at end of file From d935353dbd113862c22ee855e68e1372e5905089 Mon Sep 17 00:00:00 2001 From: Aashir Siddiqui Date: Thu, 25 Jul 2024 17:00:33 +0100 Subject: [PATCH 235/263] Removed @auhto tags from javadocs Signed-off-by: Aashir Siddiqui --- .../src/main/java/dev/galasa/cicsts/CicsRegion.java | 2 +- .../main/java/dev/galasa/cicsts/CicsTerminal.java | 2 +- .../java/dev/galasa/cicsts/CicstsManagerField.java | 2 +- .../java/dev/galasa/cloud/CloudManagerField.java | 2 +- .../main/java/dev/galasa/cloud/ICloudContainer.java | 2 +- .../dev/galasa/cloud/internal/CloudManagerImpl.java | 2 +- .../galasa/cloud/spi/ICloudContainerProvider.java | 2 +- .../java/dev/galasa/cloud/spi/ICloudManagerSpi.java | 2 +- .../galasa/docker/manager/ivt/DockerManagerIVT.java | 2 +- .../dev/galasa/docker/IDockerContainerConfig.java | 2 +- .../src/main/java/dev/galasa/docker/IDockerExec.java | 2 +- .../docker/internal/DockerContainerConfigImpl.java | 2 +- .../galasa/docker/internal/DockerContainerImpl.java | 2 +- .../internal/DockerContainerResourceMonitor.java | 2 +- .../galasa/docker/internal/DockerEnvironment.java | 2 +- .../dev/galasa/docker/internal/DockerExecImpl.java | 2 +- .../dev/galasa/docker/internal/DockerImageImpl.java | 2 +- .../galasa/docker/internal/DockerManagerField.java | 2 +- .../galasa/docker/internal/DockerManagerImpl.java | 2 +- .../galasa/docker/internal/DockerRegistryImpl.java | 2 +- .../docker/internal/DockerResourceManagement.java | 2 +- .../dev/galasa/docker/internal/DockerSlotImpl.java | 2 +- .../docker/internal/DockerSlotResourceMonitor.java | 2 +- .../dev/galasa/docker/internal/DockerVolumeImpl.java | 2 +- .../main/java/dev/galasa/kubernetes/IConfigMap.java | 2 +- .../main/java/dev/galasa/kubernetes/IDeployment.java | 2 +- .../dev/galasa/kubernetes/IKubernetesNamespace.java | 2 +- .../galasa/kubernetes/IPersistentVolumeClaim.java | 2 +- .../src/main/java/dev/galasa/kubernetes/IPodLog.java | 2 +- .../main/java/dev/galasa/kubernetes/IReplicaSet.java | 2 +- .../main/java/dev/galasa/kubernetes/IResource.java | 2 +- .../src/main/java/dev/galasa/kubernetes/ISecret.java | 2 +- .../main/java/dev/galasa/kubernetes/IService.java | 2 +- .../java/dev/galasa/kubernetes/IStatefulSet.java | 2 +- .../kubernetes/internal/KubernetesClusterImpl.java | 2 +- .../kubernetes/internal/KubernetesManagerField.java | 2 +- .../kubernetes/internal/KubernetesManagerImpl.java | 2 +- .../kubernetes/internal/KubernetesNamespaceImpl.java | 2 +- .../internal/KubernetesNamespaceResourceMonitor.java | 2 +- .../internal/KubernetesResourceManagement.java | 2 +- .../properties/KubernetesPropertiesSingleton.java | 2 +- .../kubernetes/internal/resources/ConfigMapImpl.java | 2 +- .../internal/resources/DeploymentImpl.java | 2 +- .../resources/PersistentVolumeClaimImpl.java | 2 +- .../kubernetes/internal/resources/PodLogImpl.java | 2 +- .../internal/resources/ReplicaSetHolder.java | 2 +- .../kubernetes/internal/resources/SecretImpl.java | 2 +- .../kubernetes/internal/resources/ServiceImpl.java | 2 +- .../internal/resources/StatefulSetImpl.java | 2 +- .../kubernetes/internal/resources/Utility.java | 2 +- .../galasa/kubernetes/spi/IKubernetesManagerSpi.java | 2 +- .../manager/internal/properties/BuildTimeout.java | 2 +- .../internal/properties/LinuxArchivesDirectory.java | 2 +- .../internal/properties/LinuxAvailablityZone.java | 2 +- .../internal/properties/LinuxCredentials.java | 2 +- .../manager/internal/properties/LinuxFlavor.java | 2 +- .../internal/properties/LinuxImageCapabilities.java | 2 +- .../manager/internal/properties/LinuxImages.java | 2 +- .../manager/internal/properties/LinuxKeyPair.java | 2 +- .../manager/internal/properties/LinuxName.java | 2 +- .../internal/properties/LinuxSecurityGroups.java | 2 +- .../internal/properties/MaximumInstances.java | 2 +- .../manager/internal/properties/NamePool.java | 2 +- .../internal/properties/OpenStackCredentialsId.java | 2 +- .../internal/properties/OpenStackDomainName.java | 2 +- .../internal/properties/OpenStackEnabled.java | 2 +- .../internal/properties/OpenStackIdentityUri.java | 2 +- .../internal/properties/OpenStackLinuxPriority.java | 2 +- .../internal/properties/OpenStackProjectName.java | 2 +- .../internal/properties/WindowsAvailablityZone.java | 2 +- .../internal/properties/WindowsCredentials.java | 2 +- .../manager/internal/properties/WindowsFlavor.java | 2 +- .../properties/WindowsImageCapabilities.java | 2 +- .../manager/internal/properties/WindowsImages.java | 2 +- .../manager/internal/properties/WindowsKeyPair.java | 2 +- .../manager/internal/properties/WindowsName.java | 2 +- .../internal/properties/WindowsSecurityGroups.java | 2 +- .../src/main/java/dev/galasa/http/HttpClient.java | 2 +- .../java/dev/galasa/http/HttpClientResponse.java | 2 +- .../src/main/java/dev/galasa/http/IHttpManager.java | 2 +- .../galasa/http/internal/ClientAuthTrustManager.java | 2 +- .../dev/galasa/http/internal/HttpClientRequest.java | 2 +- .../dev/galasa/http/internal/HttpManagerField.java | 2 +- .../src/main/java/dev/galasa/ipnetwork/IIpHost.java | 2 +- .../src/main/java/dev/galasa/ipnetwork/IIpPort.java | 2 +- .../main/java/dev/galasa/ipnetwork/SSHException.java | 2 +- .../internal/ssh/filesystem/SSHBasicAttributes.java | 2 +- .../ssh/filesystem/SSHBasicAttributesView.java | 2 +- .../internal/ssh/filesystem/SSHByteChannel.java | 2 +- .../ssh/filesystem/SSHFileSystemProvider.java | 2 +- .../java/dev/galasa/ipnetwork/spi/SSHClient.java | 2 +- .../src/main/java/dev/galasa/mq/MqManagerField.java | 2 +- .../java/dev/galasa/artifact/ArtifactManager.java | 2 +- .../dev/galasa/artifact/ArtifactManagerField.java | 2 +- .../java/dev/galasa/artifact/BundleResources.java | 2 +- .../java/dev/galasa/artifact/IArtifactManager.java | 2 +- .../artifact/internal/PlusPlusSkeletonProcessor.java | 6 +++--- .../dev/galasa/core/manager/CoreManagerField.java | 2 +- .../main/java/dev/galasa/core/manager/Logger.java | 2 +- .../java/dev/galasa/core/manager/ResourceString.java | 2 +- .../java/dev/galasa/core/manager/TestProperty.java | 2 +- .../manager/internal/ResourceStringGenerator.java | 2 +- .../core/manager/internal/ResourceStringImpl.java | 2 +- .../resourcemanagement/CoreResourceManagement.java | 2 +- .../ResourceStringResourceManagement.java | 2 +- .../main/java/dev/galasa/textscan/ILogScanner.java | 2 +- .../java/dev/galasa/textscan/ITextScannable.java | 2 +- .../main/java/dev/galasa/textscan/ITextScanner.java | 12 ++++++------ .../dev/galasa/textscan/TextScanManagerField.java | 2 +- .../textscan/internal/AbstractTextScannable.java | 12 ++++++------ .../main/java/dev/galasa/db2/Db2ManagerField.java | 2 +- .../src/main/java/dev/galasa/db2/IDb2Instance.java | 2 +- .../src/main/java/dev/galasa/db2/IDb2Schema.java | 2 +- .../src/main/java/dev/galasa/db2/IResultMap.java | 2 +- .../dev/galasa/db2/internal/Db2InstanceImpl.java | 2 +- .../java/dev/galasa/db2/internal/Db2ManagerImpl.java | 2 +- .../java/dev/galasa/db2/internal/Db2SchemaImpl.java | 2 +- .../main/java/dev/galasa/db2/internal/ResultMap.java | 2 +- .../main/java/dev/galasa/db2/spi/IDb2ManagerSpi.java | 2 +- .../galasa/eclipseruntime/EclipseManagerField.java | 2 +- .../dev/galasa/eclipseruntime/IEclipseInstall.java | 2 +- .../eclipseruntime/ubuntu/EclipseInstallUbuntu.java | 2 +- .../ubuntu/EclipseUbuntuManagerField.java | 2 +- .../eclipseruntime/ubuntu/IEclipseInstallUbuntu.java | 2 +- .../src/main/java/dev/galasa/sem/DoNotBuild.java | 2 +- .../src/main/java/dev/galasa/sem/DoNotStartCICS.java | 2 +- .../main/java/dev/galasa/sem/SemManagerField.java | 2 +- .../src/main/java/dev/galasa/sem/SemTopology.java | 2 +- .../src/main/java/dev/galasa/sem/Sit.java | 2 +- .../src/main/java/dev/galasa/sem/Sits.java | 2 +- .../main/java/dev/galasa/java/JavaManagerField.java | 2 +- .../galasa/java/ubuntu/IJavaUbuntuInstallation.java | 2 +- .../galasa/java/ubuntu/JavaUbuntuInstallation.java | 2 +- .../galasa/java/ubuntu/JavaUbuntuManagerField.java | 2 +- .../java/windows/IJavaWindowsInstallation.java | 2 +- .../galasa/java/windows/JavaWindowsInstallation.java | 2 +- .../galasa/java/windows/JavaWindowsManagerField.java | 2 +- .../elasticlog/internal/ElasticLogManagerImpl.java | 2 +- .../phoenix2/internal/Phoenix2ManagerImpl.java | 2 +- .../galasa/galasaecosystem/EcosystemEndpoint.java | 2 +- .../galasaecosystem/GalasaEcosystemManagerField.java | 2 +- .../galasa/galasaecosystem/IGenericEcosystem.java | 2 +- .../galasa/galasaecosystem/IKubernetesEcosystem.java | 2 +- .../dev/galasa/galasaecosystem/ILocalEcosystem.java | 2 +- .../internal/GalasaEcosystemManagerImpl.java | 2 +- .../internal/KubernetesEcosystemImpl.java | 2 +- .../internal/properties/RunIdPrefix.java | 2 +- .../GalasaEcosystemResourceManagement.java | 2 +- .../resourcemanagement/RunIdPrefixMonitor.java | 2 +- .../resourcemanagement/RunResourceMonitor.java | 2 +- .../src/main/java/dev/galasa/selenium/Browser.java | 2 +- .../java/dev/galasa/selenium/IChromeOptions.java | 2 +- .../main/java/dev/galasa/selenium/IEdgeOptions.java | 2 +- .../java/dev/galasa/selenium/IFirefoxOptions.java | 2 +- .../galasa/selenium/IInternetExplorerOptions.java | 2 +- .../java/dev/galasa/selenium/ISeleniumManager.java | 2 +- .../java/dev/galasa/selenium/SeleniumManager.java | 2 +- .../dev/galasa/selenium/internal/DriverImpl.java | 2 +- .../dev/galasa/selenium/internal/LocalBrowser.java | 2 +- .../galasa/selenium/internal/LocalDriverImpl.java | 2 +- .../selenium/internal/SeleniumEnvironment.java | 2 +- .../internal/SeleniumGridSessionMonitor.java | 2 +- .../internal/SeleniumResourceManagement.java | 2 +- .../internal/SeleniumSlotResourceMonitor.java | 2 +- .../src/main/java/dev/galasa/linux/ILinuxImage.java | 2 +- .../src/main/java/dev/galasa/linux/LinuxImage.java | 2 +- .../src/main/java/dev/galasa/linux/LinuxIpHost.java | 2 +- .../java/dev/galasa/linux/LinuxManagerField.java | 2 +- .../internal/properties/LinuxArchivesDirectory.java | 2 +- .../linux/internal/properties/LinuxCapabilities.java | 2 +- .../internal/properties/LinuxOperatingSystem.java | 2 +- .../linux/internal/properties/MaximumSlots.java | 2 +- .../linux/internal/properties/SharedLinuxImages.java | 2 +- .../internal/properties/SharedLinuxPriority.java | 2 +- .../linux/internal/properties/UsernamePool.java | 2 +- .../main/java/dev/galasa/windows/IWindowsImage.java | 2 +- .../main/java/dev/galasa/windows/WindowsImage.java | 2 +- .../main/java/dev/galasa/windows/WindowsIpHost.java | 2 +- .../java/dev/galasa/windows/WindowsManagerField.java | 2 +- .../java/dev/galasa/githubissue/GitHubIssue.java | 2 +- .../src/main/java/dev/galasa/zos/IZosImage.java | 2 +- .../src/main/java/dev/galasa/zos/IZosManager.java | 2 +- .../src/main/java/dev/galasa/zos/ZosImage.java | 2 +- .../src/main/java/dev/galasa/zos/ZosIpHost.java | 2 +- .../src/main/java/dev/galasa/zos/ZosIpPort.java | 2 +- .../main/java/dev/galasa/zos/ZosManagerField.java | 2 +- .../dev/galasa/zos/spi/ZosImageDependencyField.java | 2 +- .../src/main/java/dev/galasa/zosbatch/IZosBatch.java | 2 +- .../main/java/dev/galasa/zosbatch/IZosBatchJob.java | 2 +- .../java/dev/galasa/zosbatch/IZosBatchJobname.java | 2 +- .../main/java/dev/galasa/zosbatch/ZosBatchField.java | 2 +- .../java/dev/galasa/zosbatch/ZosBatchJobcard.java | 2 +- .../galasa/zos3270/common/screens/FieldContents.java | 2 +- .../dev/galasa/zos3270/common/screens/Terminal.java | 2 +- .../galasa/zos3270/common/screens/TerminalField.java | 2 +- .../galasa/zos3270/common/screens/TerminalImage.java | 2 +- .../galasa/zos3270/common/screens/TerminalSize.java | 2 +- .../java/dev/galasa/zos3270/Zos3270Terminal.java | 2 +- .../galasa/zos3270/internal/Zos3270ManagerField.java | 2 +- .../properties/ApplyConfidentialTextFiltering.java | 2 +- .../zos3270/internal/properties/LiveTerminalUrl.java | 2 +- .../internal/properties/LogConsoleTerminals.java | 2 +- .../internal/properties/TerminalDeviceTypes.java | 2 +- .../dev/galasa/zos3270/spi/BufferStartOfField.java | 2 +- .../src/main/java/dev/galasa/zos3270/spi/Screen.java | 2 +- .../dev/galasa/zos3270/cursor/BackSpaceTest.java | 2 +- .../java/dev/galasa/zos3270/cursor/BackTabTest.java | 2 +- .../dev/galasa/zos3270/cursor/FieldOverflowTest.java | 2 +- .../java/dev/galasa/zos3270/cursor/HomeTest.java | 2 +- .../java/dev/galasa/zos3270/cursor/NewLineTest.java | 2 +- .../test/java/dev/galasa/zos3270/cursor/TabTest.java | 2 +- .../zos3270/orders/EraseAllUnprotectedTest.java | 2 +- .../galasa/zos3270/orders/GraphicsEscapeTest.java | 2 +- .../java/dev/galasa/zossecurity/IZosCertificate.java | 12 ++++++------ .../dev/galasa/zossecurity/IZosCicsClassSet.java | 12 ++++++------ .../main/java/dev/galasa/zossecurity/IZosGroup.java | 12 ++++++------ .../main/java/dev/galasa/zossecurity/IZosIdMap.java | 12 ++++++------ .../galasa/zossecurity/IZosKerberosPrincipal.java | 12 ++++++------ .../java/dev/galasa/zossecurity/IZosKeyring.java | 12 ++++++------ .../galasa/zossecurity/IZosPreDefinedProfile.java | 12 ++++++------ .../java/dev/galasa/zossecurity/IZosProfile.java | 12 ++++++------ .../java/dev/galasa/zossecurity/IZosSecurity.java | 2 +- .../main/java/dev/galasa/zossecurity/IZosUserid.java | 12 ++++++------ .../java/dev/galasa/zossecurity/KerberosToken.java | 12 ++++++------ .../java/dev/galasa/zossecurity/ZosCicsClassSet.java | 12 ++++++------ .../dev/galasa/zossecurity/ZosPreDefinedProfile.java | 12 ++++++------ .../galasa/zossecurity/datatypes/RACFAccessType.java | 12 ++++++------ .../zossecurity/datatypes/ZosCicsClassResource.java | 12 ++++++------ .../zossecurity/datatypes/ZosCicsClassType.java | 12 ++++++------ 229 files changed, 316 insertions(+), 316 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsRegion.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsRegion.java index 6bd645139..c2bf418a8 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsRegion.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsRegion.java @@ -20,7 +20,7 @@ * Used to populate a {@link ICicsRegion} field *

    * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsTerminal.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsTerminal.java index ae1bd2b62..3f6a46eab 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsTerminal.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicsTerminal.java @@ -19,7 +19,7 @@ * Used to populate a {@link ICicsTerminal} field *

    * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicstsManagerField.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicstsManagerField.java index 6c498f2b7..651caf725 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicstsManagerField.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/CicstsManagerField.java @@ -14,7 +14,7 @@ * Used to annotate annotations that are to be used for Test Class fields. To be * populated by the Manager. * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudManagerField.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudManagerField.java index de3ed74f2..dedf4e78c 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudManagerField.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/CloudManagerField.java @@ -13,7 +13,7 @@ /** * Annotation to capture the other cloud related annotations from the test class * - * @author Michael Baylis + * */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE }) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/ICloudContainer.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/ICloudContainer.java index 1f1bcfa02..dbb1e6d5b 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/ICloudContainer.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/ICloudContainer.java @@ -10,7 +10,7 @@ /** * Cloud Container * - * @author Michael Baylis + * * */ public interface ICloudContainer { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/CloudManagerImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/CloudManagerImpl.java index 5b86405ae..2d12a55dd 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/CloudManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/internal/CloudManagerImpl.java @@ -49,7 +49,7 @@ /** * The Cloud Manager * - * @author Michael Baylis + * * */ @Component(service = { IManager.class }) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/spi/ICloudContainerProvider.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/spi/ICloudContainerProvider.java index 548ed7d63..815b0bb37 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/spi/ICloudContainerProvider.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/spi/ICloudContainerProvider.java @@ -17,7 +17,7 @@ /** * Interface from the Cloud Manager to Cloud Container Providers * - * @author Michael Baylis + * * */ public interface ICloudContainerProvider { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/spi/ICloudManagerSpi.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/spi/ICloudManagerSpi.java index 168859536..faf3e4851 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/spi/ICloudManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.cloud.manager/src/main/java/dev/galasa/cloud/spi/ICloudManagerSpi.java @@ -15,7 +15,7 @@ /** * SPI for the Cloud Manager * - * @author Michael Baylis + * * */ public interface ICloudManagerSpi { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/java/dev/galasa/docker/manager/ivt/DockerManagerIVT.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/java/dev/galasa/docker/manager/ivt/DockerManagerIVT.java index 6b32219d9..963f4f8eb 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/java/dev/galasa/docker/manager/ivt/DockerManagerIVT.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager.ivt/src/main/java/dev/galasa/docker/manager/ivt/DockerManagerIVT.java @@ -55,7 +55,7 @@ * 8) Change config and start with ENV's and ensure they are set * 9) Mounts a non created volume to the container and ensure all is created and mounted * - * @author Michael Baylis + * * */ @Test diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainerConfig.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainerConfig.java index 1bdd9e310..7a214621c 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainerConfig.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerContainerConfig.java @@ -11,7 +11,7 @@ /** * An interface for the annotation object that represents the configurations for a container. * - * @author James Davies + * */ public interface IDockerContainerConfig { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerExec.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerExec.java index 2e178ffbf..4899546d9 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerExec.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/IDockerExec.java @@ -12,7 +12,7 @@ * container. *

    * - * @author James Davies + * * */ public interface IDockerExec { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerConfigImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerConfigImpl.java index 9fe740efe..a76703aa1 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerConfigImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerConfigImpl.java @@ -15,7 +15,7 @@ /** * Implementation for the object that represents the container configurations that can be edited for container startup * - * @author James Davies + * */ public class DockerContainerConfigImpl implements IDockerContainerConfig { private List volumes = new ArrayList<>(); diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerImpl.java index 44b29aa58..5084b1056 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerImpl.java @@ -50,7 +50,7 @@ /** * Docker Container implementation used to contain all container configurations. * - * @author James Davies + * */ public class DockerContainerImpl implements IDockerContainer { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerResourceMonitor.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerResourceMonitor.java index 25cb21e3d..9a115a8ac 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerContainerResourceMonitor.java @@ -31,7 +31,7 @@ /** * Resource monitor for cleaning up orphaned containers. * - * @author James Davies + * */ public class DockerContainerResourceMonitor implements Runnable { private final IFramework framework; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerEnvironment.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerEnvironment.java index bdcce9297..fb5f03c1f 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerEnvironment.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerEnvironment.java @@ -31,7 +31,7 @@ * Docker Environment. Manages the flow of both docker containers and slots to a * specified docker engine * - * @author James Davies + * */ public class DockerEnvironment implements IDockerEnvironment { private IFramework framework; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerExecImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerExecImpl.java index c3f9c4ca1..24067f4a7 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerExecImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerExecImpl.java @@ -27,7 +27,7 @@ /** * DockerExecImpl. An object passed back used to monitor and control the exec process on a container. * - * @author James Davies + * */ public class DockerExecImpl implements IDockerExec { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerImageImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerImageImpl.java index 82e5c8f43..9e7aee41d 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerImageImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerImageImpl.java @@ -19,7 +19,7 @@ /** * DockerImageImpl. Allows for the checking of images on registries and pulling of images to the docker engine. * - * @author James Davies + * */ public class DockerImageImpl implements IDockerImage { private final IFramework framework; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerField.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerField.java index 5ed700f13..b08555619 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerField.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerField.java @@ -13,7 +13,7 @@ /** * Annotation to capture the other docker realted annotations from the test class * - * @author James Davies + * */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE }) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerImpl.java index f164260cd..84aa89ddd 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerManagerImpl.java @@ -53,7 +53,7 @@ * @DockerEngine - where the containers will be running, set value in CPS (see properties) * @DockerContainer - define what container is to be run, image names mus be defined, tag can be set * - * @author James Davies + * */ @Component(service = { IManager.class }) public class DockerManagerImpl extends AbstractManager implements IDockerManagerSpi { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerRegistryImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerRegistryImpl.java index f83c21aa8..076a43c2c 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerRegistryImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerRegistryImpl.java @@ -39,7 +39,7 @@ * Docker RegistryImpl. Controls the location of where docker images can be * pulled from * - * @author James Davies + * */ public class DockerRegistryImpl { private IFramework framework; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerResourceManagement.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerResourceManagement.java index 30ba3a5c4..efa6b7266 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerResourceManagement.java @@ -21,7 +21,7 @@ /** * Resource management for the docker slots used to run docker containers * - * @author James Davies + * */ @Component(service = { IResourceManagementProvider.class }) public class DockerResourceManagement implements IResourceManagementProvider { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerSlotImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerSlotImpl.java index 94796a8b0..d364cedbf 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerSlotImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerSlotImpl.java @@ -11,7 +11,7 @@ /** * Docker slot implemtnation to limit the number of concurrently running docker containers. * - * @author James Davies + * */ public class DockerSlotImpl { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerSlotResourceMonitor.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerSlotResourceMonitor.java index 6aad5dd92..6b03780aa 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerSlotResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerSlotResourceMonitor.java @@ -21,7 +21,7 @@ /** * Docker resource monitor * - * @author James Davies + * */ public class DockerSlotResourceMonitor implements Runnable { private final IFramework framework; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerVolumeImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerVolumeImpl.java index ba49967b4..df893934f 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerVolumeImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.docker.manager/src/main/java/dev/galasa/docker/internal/DockerVolumeImpl.java @@ -25,7 +25,7 @@ /** * A implementation of the docker volumes that will be brought up on the engine * - * @author James Davies + * */ public class DockerVolumeImpl implements IDockerVolume { private DockerManagerImpl dockerManager; diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IConfigMap.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IConfigMap.java index 6783d6eb6..5fce0ede2 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IConfigMap.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IConfigMap.java @@ -8,7 +8,7 @@ /** * Represents a ConfigMap resource * - * @author Michael Baylis + * * */ public interface IConfigMap extends IResource { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IDeployment.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IDeployment.java index a5fe8a97f..773d0c7c7 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IDeployment.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IDeployment.java @@ -8,7 +8,7 @@ /** * Represent a Deployment resource * - * @author Michael Baylis + * * */ public interface IDeployment extends IReplicaSet { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IKubernetesNamespace.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IKubernetesNamespace.java index 32150d827..b92672414 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IKubernetesNamespace.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IKubernetesNamespace.java @@ -11,7 +11,7 @@ * This is the main interface to a provisioned Kubernetes namespace on an infrastructure cluster. * Access to the Object is via the {@link KubernetesNamespace} annotation or the SPI. * - * @author Michael Baylis + * * */ public interface IKubernetesNamespace { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IPersistentVolumeClaim.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IPersistentVolumeClaim.java index 5c5765447..5e3c08e0e 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IPersistentVolumeClaim.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IPersistentVolumeClaim.java @@ -8,7 +8,7 @@ /** * Represents a PersistentVolumeClaim * - * @author Michael Baylis + * * */ public interface IPersistentVolumeClaim extends IResource { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IPodLog.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IPodLog.java index 40fae3cd3..6a107f9bf 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IPodLog.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IPodLog.java @@ -9,7 +9,7 @@ /** * Holder for a Pod Log * - * @author Michael Baylis + * * */ public interface IPodLog { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IReplicaSet.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IReplicaSet.java index f00c574c2..6ee846ee4 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IReplicaSet.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IReplicaSet.java @@ -10,7 +10,7 @@ /** * Represents a resource that utilises ReplicatSets, ie Deployment and StatefulSet * - * @author mikebyls + * * */ public interface IReplicaSet extends IResource { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IResource.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IResource.java index 021680749..039bf8915 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IResource.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IResource.java @@ -9,7 +9,7 @@ * Abstracts a Kubernetes Resource, so that the test is not dependent of whatever Kubernetes client the * Kubernetes Manager decides to use. * - * @author Michael Baylis + * * */ public interface IResource { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/ISecret.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/ISecret.java index d25515173..40ff3cdc7 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/ISecret.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/ISecret.java @@ -8,7 +8,7 @@ /** * Represents a Secret resource * - * @author Michael Baylis + * * */ public interface ISecret extends IResource { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IService.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IService.java index 84227c42e..0e175047b 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IService.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IService.java @@ -12,7 +12,7 @@ /** * Represents a Service resource * - * @author Michael Baylis + * * */ public interface IService extends IResource { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IStatefulSet.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IStatefulSet.java index bc842160a..82b13dbcb 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IStatefulSet.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/IStatefulSet.java @@ -8,7 +8,7 @@ /** * Represents a StatefulSet resource * - * @author Michael Baylis + * * */ public interface IStatefulSet extends IReplicaSet { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesClusterImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesClusterImpl.java index 3eebd64f3..bd31c0d6f 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesClusterImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesClusterImpl.java @@ -45,7 +45,7 @@ /** * Represents a Kubernetes Cluster * - * @author Michael Baylis + * * */ public class KubernetesClusterImpl { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesManagerField.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesManagerField.java index 6e3dbe92a..6401563c6 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesManagerField.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesManagerField.java @@ -13,7 +13,7 @@ /** * Annotation to identify manager controlled annotated fields * - * @author Michael Baylis + * */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE }) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesManagerImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesManagerImpl.java index d26ff0df7..d07055be7 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesManagerImpl.java @@ -55,7 +55,7 @@ /** * The Kubernetes Manager implementation * - * @author Michael Baylis + * * */ @Component(service = { IManager.class }) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesNamespaceImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesNamespaceImpl.java index ea2a53705..315941ce5 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesNamespaceImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesNamespaceImpl.java @@ -80,7 +80,7 @@ * * See example scripts in examples/ to see how to create a name space with the necessary rbac. * - * @author Michael Baylis + * * */ public class KubernetesNamespaceImpl implements IKubernetesNamespace { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesNamespaceResourceMonitor.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesNamespaceResourceMonitor.java index 7cb9c47fa..2fac88e36 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesNamespaceResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesNamespaceResourceMonitor.java @@ -21,7 +21,7 @@ /** * Clean up namespaces when a run is finished with it. * - * @author Michael Baylis + * * */ public class KubernetesNamespaceResourceMonitor implements Runnable { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesResourceManagement.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesResourceManagement.java index 42743606c..8d5b051d2 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/KubernetesResourceManagement.java @@ -20,7 +20,7 @@ /** * Initialise the Resource Management routines for the Kubernetes Manager * - * @author Michael Baylis + * * */ @Component(service= {IResourceManagementProvider.class}) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesPropertiesSingleton.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesPropertiesSingleton.java index c0b1a34dc..2d2a0abbc 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesPropertiesSingleton.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/properties/KubernetesPropertiesSingleton.java @@ -15,7 +15,7 @@ /** * Kubernetes Manager CPS singleton * - * @author Michael Baylis + * * */ @Component(service = KubernetesPropertiesSingleton.class, immediate = true) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ConfigMapImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ConfigMapImpl.java index 05626c309..2f02cf20c 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ConfigMapImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ConfigMapImpl.java @@ -14,7 +14,7 @@ /** * ConfigMap implementation * - * @author Michael Baylis + * * */ public class ConfigMapImpl implements IConfigMap { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/DeploymentImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/DeploymentImpl.java index c875a4315..4951f1c78 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/DeploymentImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/DeploymentImpl.java @@ -17,7 +17,7 @@ /** * Deployment Implementation * - * @author Michael Baylis + * * */ public class DeploymentImpl extends ReplicaSetHolder implements IDeployment { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/PersistentVolumeClaimImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/PersistentVolumeClaimImpl.java index 2c8020d7d..649862a8d 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/PersistentVolumeClaimImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/PersistentVolumeClaimImpl.java @@ -14,7 +14,7 @@ /** * PersistentVolumeClaim implementation * - * @author Michael Baylis + * * */ public class PersistentVolumeClaimImpl implements IPersistentVolumeClaim { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/PodLogImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/PodLogImpl.java index 3430b4733..7921c71ac 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/PodLogImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/PodLogImpl.java @@ -10,7 +10,7 @@ /** * A holder for the Pod Log * - * @author Michael Baylis + * * */ public class PodLogImpl implements IPodLog { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ReplicaSetHolder.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ReplicaSetHolder.java index 28e629367..ac4c196a8 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ReplicaSetHolder.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ReplicaSetHolder.java @@ -22,7 +22,7 @@ /** * ReplicaSet type resource implementation, ie Deployment/StatefulSet * - * @author Michael Baylis + * * */ public abstract class ReplicaSetHolder { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/SecretImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/SecretImpl.java index 33b38de15..013d9075d 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/SecretImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/SecretImpl.java @@ -14,7 +14,7 @@ /** * Secret implementation * - * @author Michael Baylis + * * */ public class SecretImpl implements ISecret { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ServiceImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ServiceImpl.java index 484cc8fe4..e62e01339 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ServiceImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/ServiceImpl.java @@ -19,7 +19,7 @@ /** * Service implementations * - * @author Michael Baylis + * * */ public class ServiceImpl implements IService { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/StatefulSetImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/StatefulSetImpl.java index c0b4a31f8..5e1ec14c2 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/StatefulSetImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/StatefulSetImpl.java @@ -18,7 +18,7 @@ /** * StatefulSet implementation * - * @author Michael Baylis + * * */ public class StatefulSetImpl extends ReplicaSetHolder implements IStatefulSet { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/Utility.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/Utility.java index 58b013937..0c7090223 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/Utility.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/internal/resources/Utility.java @@ -16,7 +16,7 @@ /** * Utility class for routines that are missing the kubernetes client * - * @author Michael Baylis + * * */ public class Utility { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/spi/IKubernetesManagerSpi.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/spi/IKubernetesManagerSpi.java index e7c712ec4..c7c00ac07 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/spi/IKubernetesManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.kubernetes.manager/src/main/java/dev/galasa/kubernetes/spi/IKubernetesManagerSpi.java @@ -13,7 +13,7 @@ * Provides the SPI for the Kubernetes Manager for Manager to Manager communication. * Should not be used by Test code * - * @author Michael Baylis + * * */ public interface IKubernetesManagerSpi { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/BuildTimeout.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/BuildTimeout.java index 2ddc012be..4bc5949ee 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/BuildTimeout.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/BuildTimeout.java @@ -23,7 +23,7 @@ * default value is 10 minutes *

    * - * @author Michael Baylis + * * */ public class BuildTimeout extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxArchivesDirectory.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxArchivesDirectory.java index 00a1dcd21..68fabae90 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxArchivesDirectory.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxArchivesDirectory.java @@ -24,7 +24,7 @@ * Default is /opt/archives *

    * - * @author Michael Baylis + * * */ public class LinuxArchivesDirectory extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxAvailablityZone.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxAvailablityZone.java index 3c6c3e152..aebbde5d0 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxAvailablityZone.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxAvailablityZone.java @@ -27,7 +27,7 @@ * The default is nova *

    * - * @author Michael Baylis + * * */ public class LinuxAvailablityZone extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxCredentials.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxCredentials.java index d5e528fb6..2ede2cb77 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxCredentials.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxCredentials.java @@ -28,7 +28,7 @@ * The default is OPENSTACKSSH *

    * - * @author Michael Baylis + * * */ public class LinuxCredentials extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxFlavor.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxFlavor.java index 2856f29b3..abed6f2a0 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxFlavor.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxFlavor.java @@ -27,7 +27,7 @@ * The default is m1.medium *

    * - * @author Michael Baylis + * * */ public class LinuxFlavor extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImageCapabilities.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImageCapabilities.java index ba34338dc..aaec60808 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImageCapabilities.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImageCapabilities.java @@ -33,7 +33,7 @@ * The default is no capabilities *

    * - * @author Michael Baylis + * * */ public class LinuxImageCapabilities extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImages.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImages.java index e1de464dd..f0b38fbdb 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImages.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImages.java @@ -33,7 +33,7 @@ * There are no defaults *

    * - * @author Michael Baylis + * * */ public class LinuxImages extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxKeyPair.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxKeyPair.java index 194017c00..227d67f94 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxKeyPair.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxKeyPair.java @@ -27,7 +27,7 @@ * There is no default *

    * - * @author Michael Baylis + * * */ public class LinuxKeyPair extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxName.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxName.java index 35097ccde..c17b48949 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxName.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxName.java @@ -27,7 +27,7 @@ * The default is the same as the imagename *

    * - * @author Michael Baylis + * * */ public class LinuxName extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxSecurityGroups.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxSecurityGroups.java index 234545f8d..ff6572442 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxSecurityGroups.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxSecurityGroups.java @@ -30,7 +30,7 @@ * There is no default *

    * - * @author James Davies + * * */ public class LinuxSecurityGroups extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/MaximumInstances.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/MaximumInstances.java index c02bf59b2..862a41bdb 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/MaximumInstances.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/MaximumInstances.java @@ -23,7 +23,7 @@ * default value is 2 instaces *

    * - * @author Michael Baylis + * * */ public class MaximumInstances extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/NamePool.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/NamePool.java index f7d5afc4f..2ecf48133 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/NamePool.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/NamePool.java @@ -31,7 +31,7 @@ * default value is GALASA{0-9}{0-9} *

    * - * @author Michael Baylis + * * */ public class NamePool extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackCredentialsId.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackCredentialsId.java index 2548ae994..4df1e9a40 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackCredentialsId.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackCredentialsId.java @@ -24,7 +24,7 @@ * default value is openstack *

    * - * @author Michael Baylis + * * */ public class OpenStackCredentialsId extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackDomainName.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackDomainName.java index 177150713..241a0ad69 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackDomainName.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackDomainName.java @@ -27,7 +27,7 @@ * There is no default *

    * - * @author Michael Baylis + * * */ public class OpenStackDomainName extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackEnabled.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackEnabled.java index 20bf5451d..c32e468b1 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackEnabled.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackEnabled.java @@ -24,7 +24,7 @@ * default value is true *

    * - * @author Michael Baylis + * * */ public class OpenStackEnabled extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackIdentityUri.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackIdentityUri.java index 02e1a4d75..f2bce271d 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackIdentityUri.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackIdentityUri.java @@ -26,7 +26,7 @@ * There is no default *

    * - * @author Michael Baylis + * * */ public class OpenStackIdentityUri extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackLinuxPriority.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackLinuxPriority.java index d9636e65f..680595fa5 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackLinuxPriority.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackLinuxPriority.java @@ -24,7 +24,7 @@ * default value is 1 *

    * - * @author Michael Baylis + * * */ public class OpenStackLinuxPriority extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackProjectName.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackProjectName.java index 7e0613737..3d9c7dcba 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackProjectName.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackProjectName.java @@ -27,7 +27,7 @@ * There is no default *

    * - * @author Michael Baylis + * * */ public class OpenStackProjectName extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsAvailablityZone.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsAvailablityZone.java index 1497b7569..86e278b50 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsAvailablityZone.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsAvailablityZone.java @@ -27,7 +27,7 @@ * The default is nova *

    * - * @author Michael Baylis + * * */ public class WindowsAvailablityZone extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsCredentials.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsCredentials.java index 2466ca93f..5a432e7a1 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsCredentials.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsCredentials.java @@ -28,7 +28,7 @@ * The default is OPENSTACKSSH *

    * - * @author Michael Baylis + * * */ public class WindowsCredentials extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsFlavor.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsFlavor.java index bfccbf9c8..7b67fb6cc 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsFlavor.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsFlavor.java @@ -27,7 +27,7 @@ * The default is m1.medium *

    * - * @author Michael Baylis + * * */ public class WindowsFlavor extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImageCapabilities.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImageCapabilities.java index 9131ee276..60497d2d5 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImageCapabilities.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImageCapabilities.java @@ -33,7 +33,7 @@ * The default is no capabilities *

    * - * @author Michael Baylis + * * */ public class WindowsImageCapabilities extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImages.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImages.java index 102b19746..4842a8ec8 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImages.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImages.java @@ -31,7 +31,7 @@ * There are no defaults *

    * - * @author Michael Baylis + * * */ public class WindowsImages extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsKeyPair.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsKeyPair.java index c25d8e9dd..57da85dfd 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsKeyPair.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsKeyPair.java @@ -27,7 +27,7 @@ * There is no default *

    * - * @author Michael Baylis + * * */ public class WindowsKeyPair extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsName.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsName.java index 98b3e2a49..2ab4c8ee9 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsName.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsName.java @@ -27,7 +27,7 @@ * The default is the same as the imagename *

    * - * @author Michael Baylis + * * */ public class WindowsName extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsSecurityGroups.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsSecurityGroups.java index e21e5b980..7f2a6d4c5 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsSecurityGroups.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsSecurityGroups.java @@ -29,7 +29,7 @@ * There is no default *

    * - * @author James Davies + * * */ public class WindowsSecurityGroups extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClient.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClient.java index c083e0508..2a623fbef 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClient.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClient.java @@ -17,7 +17,7 @@ * Used to annotate annotations that are to be used for Test Class fields. To be * populated by the Manager. * - * @author William Yates + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java index 7cc1a0d5b..a6ae2421f 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/HttpClientResponse.java @@ -37,7 +37,7 @@ * describes the content type of the response. Use the static methods to create * instances from an {@link HttpResponse}. * - * @author James Bartlett + * * * @param Class describing the content type of the response */ diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpManager.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpManager.java index f0fc54e23..28eed51c6 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpManager.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpManager.java @@ -8,7 +8,7 @@ /** * Provides test code access to HTTP Manager to execute HTTP requests * - * @author Will Yates + * */ public interface IHttpManager { diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/ClientAuthTrustManager.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/ClientAuthTrustManager.java index b905fe774..e966a13f9 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/ClientAuthTrustManager.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/ClientAuthTrustManager.java @@ -15,7 +15,7 @@ /** * Client Authentication Trust Manager * - * @author James Bartlett + * * */ public class ClientAuthTrustManager implements X509TrustManager { diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientRequest.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientRequest.java index b9d3c6957..e12492044 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientRequest.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientRequest.java @@ -42,7 +42,7 @@ * {@link #setUrl(String)} must be called before use, as well as one of the * setBody(...) methods if this is a PUT or POST request * - * @author Will Yates + * * */ public class HttpClientRequest { diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpManagerField.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpManagerField.java index 77ae17507..85221329c 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpManagerField.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpManagerField.java @@ -14,7 +14,7 @@ * Used to annotate annotations that are to be used for Test Class fields. To be * populated by the Manager. * - * @author William Yates + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IIpHost.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IIpHost.java index eafe4d00a..807aee8d3 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IIpHost.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IIpHost.java @@ -18,7 +18,7 @@ * Use the appropriate host manager annotation to obtain an object *

    * - * @author Michael Baylis + * * */ public interface IIpHost { diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IIpPort.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IIpPort.java index 78a181fde..761106e95 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IIpPort.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/IIpPort.java @@ -14,7 +14,7 @@ * Use the appropriate host manager annotation to obtain an object *

    * - * @author Michael Baylis + * * */ public interface IIpPort { diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/SSHException.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/SSHException.java index c30633321..cbe3af4f6 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/SSHException.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/SSHException.java @@ -8,7 +8,7 @@ /** * zOS Command exception indicating an error in SSH * - * @author James Bartlett + * * */ public class SSHException extends IpNetworkManagerException { diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHBasicAttributes.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHBasicAttributes.java index e94a0aec3..b77376bd0 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHBasicAttributes.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHBasicAttributes.java @@ -11,7 +11,7 @@ /** * For use with the dummy RAS file system * - * @author Michael Baylis + * * */ public class SSHBasicAttributes implements BasicFileAttributes { diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHBasicAttributesView.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHBasicAttributesView.java index f57790cf7..adc93c2dc 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHBasicAttributesView.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHBasicAttributesView.java @@ -13,7 +13,7 @@ /** * For use with the dummy RAS file system * - * @author Michael Baylis + * * */ public class SSHBasicAttributesView implements BasicFileAttributeView { diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHByteChannel.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHByteChannel.java index d39c0fa28..5cb9ed0c8 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHByteChannel.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHByteChannel.java @@ -25,7 +25,7 @@ /** * Dummy Byte Channel for a null Result Archive Store * - * @author Michael Baylis + * * */ public class SSHByteChannel implements SeekableByteChannel { diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHFileSystemProvider.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHFileSystemProvider.java index 7a4a3b1a3..745c33919 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHFileSystemProvider.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/internal/ssh/filesystem/SSHFileSystemProvider.java @@ -43,7 +43,7 @@ /** * SSH FileStore for Galasa * - * @author Michael Baylis + * * */ public class SSHFileSystemProvider extends FileSystemProvider { diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/SSHClient.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/SSHClient.java index 89f38c60b..17526cb47 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/SSHClient.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.ipnetwork.manager/src/main/java/dev/galasa/ipnetwork/spi/SSHClient.java @@ -39,7 +39,7 @@ /** * SSH client for Galasa * - * @author James Bartlett + * * */ public class SSHClient implements ICommandShell { diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/MqManagerField.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/MqManagerField.java index 6bdd3a02c..400449f6b 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/MqManagerField.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.mq.manager/src/main/java/dev/galasa/mq/MqManagerField.java @@ -14,7 +14,7 @@ * Used to annotate annotations that are to be used for Test Class fields. To be * populated by the Manager. * - * @author William Yates + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManager.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManager.java index 9a1f81261..038127971 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManager.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManager.java @@ -16,7 +16,7 @@ * Used to annotate annotations that are to be used for Test Class fields. To be * populated by the Manager. * - * @author William Yates + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManagerField.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManagerField.java index a705994c4..7ff5535ba 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManagerField.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/ArtifactManagerField.java @@ -14,7 +14,7 @@ * Used to annotate annotations that are to be used for Test Class fields. To be * populated by the Manager. * - * @author Will Yates + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/BundleResources.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/BundleResources.java index 59a321960..df31cdba8 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/BundleResources.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/BundleResources.java @@ -15,7 +15,7 @@ /** * Obtain a {@link IBundleResources} object for this test class * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IArtifactManager.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IArtifactManager.java index a51e27d90..f67d3e37a 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IArtifactManager.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/IArtifactManager.java @@ -12,7 +12,7 @@ * retrieving artifacts/resources from the 'resources' directory in your test * bundle, and manipulating those resources * - * @author James Bartlett + * * */ public interface IArtifactManager { diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/PlusPlusSkeletonProcessor.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/PlusPlusSkeletonProcessor.java index 21de0840d..92aaf659a 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/PlusPlusSkeletonProcessor.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.artifact.manager/src/main/java/dev/galasa/artifact/internal/PlusPlusSkeletonProcessor.java @@ -26,7 +26,7 @@ /** * A simple skeleton processor to replace velocity * - * @author James Bartlett + * * */ public class PlusPlusSkeletonProcessor implements ISkeletonProcessor { @@ -199,7 +199,7 @@ public String purgeUnusedMarkers(String skeletonContent) { /** * Describes a known form of delimiting a value to be substituted * - * @author root + * * */ private class Delimiter { @@ -277,7 +277,7 @@ public String substitute(String input, String key, String value) { * Describes a known way of describing a substitution for each member of some * collection * - * @author root + * * */ private class LoopForm { diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/CoreManagerField.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/CoreManagerField.java index 86f5f88ea..82516f544 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/CoreManagerField.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/CoreManagerField.java @@ -14,7 +14,7 @@ * Used to annotate annotations that are to be used for Test Class fields. To be * populated by the Manager. * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/Logger.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/Logger.java index 3f990d571..cba8e5f8c 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/Logger.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/Logger.java @@ -24,7 +24,7 @@ *

    * * @see {@link org.apache.commons.logging.Log} - * @author Michael Baylis + * * */ @Retention(RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ResourceString.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ResourceString.java index dfca8b648..913b7aa71 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ResourceString.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/ResourceString.java @@ -22,7 +22,7 @@ * Will only populate public {@link dev.galasa.core.manager.IResourceString} fields. *

    * - * @author Michael Baylis + * * */ @Retention(RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/TestProperty.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/TestProperty.java index 468d8ee86..536390407 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/TestProperty.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/TestProperty.java @@ -22,7 +22,7 @@ *

    * * @see {@link String} - * @author Michael Baylis + * * */ @Retention(RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/ResourceStringGenerator.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/ResourceStringGenerator.java index 796de6181..f47a48c1f 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/ResourceStringGenerator.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/ResourceStringGenerator.java @@ -30,7 +30,7 @@ * Generate Resource Strings using random letters * * - * @author Michael Baylis + * * */ public class ResourceStringGenerator { diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/ResourceStringImpl.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/ResourceStringImpl.java index cd29a446e..9691129c0 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/ResourceStringImpl.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/ResourceStringImpl.java @@ -11,7 +11,7 @@ * Basic holder of a Resource String. * Not strictly necessary, but future proofing * - * @author Michael Baylis + * * */ public class ResourceStringImpl implements IResourceString { diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/resourcemanagement/CoreResourceManagement.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/resourcemanagement/CoreResourceManagement.java index bdaa48eca..75a1f64d7 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/resourcemanagement/CoreResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/resourcemanagement/CoreResourceManagement.java @@ -23,7 +23,7 @@ * resources after a test has been terminated * * - * @author Michael Baylis + * * */ @Component(service = { IResourceManagementProvider.class }) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/resourcemanagement/ResourceStringResourceManagement.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/resourcemanagement/ResourceStringResourceManagement.java index 621a0934b..250182f94 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/resourcemanagement/ResourceStringResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.core.manager/src/main/java/dev/galasa/core/manager/internal/resourcemanagement/ResourceStringResourceManagement.java @@ -22,7 +22,7 @@ /** * Core Resource String Resource Management * - * @author Michael Baylis + * * */ public class ResourceStringResourceManagement implements Runnable { diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ILogScanner.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ILogScanner.java index 32e94d4eb..a99c09e32 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ILogScanner.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ILogScanner.java @@ -15,7 +15,7 @@ * You can obtain an implementation of this interface using the {@link LogScanner} annotation. * You will need a separate object per log you will be scanning. * - * @author Michael Baylis + * * */ public interface ILogScanner { diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ITextScannable.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ITextScannable.java index a205fabd0..788d81258 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ITextScannable.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ITextScannable.java @@ -12,7 +12,7 @@ * Examples with be a running batch job, docker container log or a linux server log. * * It is the intention that other Managers will provide IScannable objects for use within the Text Scan Manager - * @author Michael Baylis + * * */ public interface ITextScannable { diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ITextScanner.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ITextScanner.java index 652275c8a..3cda91c94 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ITextScanner.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/ITextScanner.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.textscan; import java.io.InputStream; @@ -20,7 +20,7 @@ *
    * You can obtain an implementation of this interface using the {@link TextScanner} annotation. * - * @author Michael Baylis + * * */ public interface ITextScanner { diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanManagerField.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanManagerField.java index 6add8e685..90af2ce3e 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanManagerField.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/TextScanManagerField.java @@ -14,7 +14,7 @@ * Used to annotate annotations that are to be used for Test Class fields. To be * populated by the Manager. * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/AbstractTextScannable.java b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/AbstractTextScannable.java index 74568873e..ec6f2f779 100644 --- a/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/AbstractTextScannable.java +++ b/galasa-managers-parent/galasa-managers-core-parent/dev.galasa.textscan.manager/src/main/java/dev/galasa/textscan/internal/AbstractTextScannable.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.textscan.internal; import java.io.InputStream; @@ -13,7 +13,7 @@ /** * Abstract Text Scannable * - * @author Michael Baylis + * * */ public class AbstractTextScannable implements ITextScannable { diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/Db2ManagerField.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/Db2ManagerField.java index f81c4f14b..265939cc4 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/Db2ManagerField.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/Db2ManagerField.java @@ -13,7 +13,7 @@ /** * Annotation to capture the other db2 realted annotations from the test class * - * @author James Davies + * */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE }) diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IDb2Instance.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IDb2Instance.java index 5c2f7a7b6..40ee8cf4d 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IDb2Instance.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IDb2Instance.java @@ -13,7 +13,7 @@ * * This connection must be established to connected a IDb2Schema to this database. * - * @author jamesdavies + * * */ public interface IDb2Instance { diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IDb2Schema.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IDb2Schema.java index fa68fde93..5607c85d6 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IDb2Schema.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IDb2Schema.java @@ -14,7 +14,7 @@ * * Allows users to submit statements as string, or as a batch of statements from a file. * - * @author jamesdavies + * * */ public interface IDb2Schema { diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IResultMap.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IResultMap.java index 2a3d09b9d..a36bc8442 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IResultMap.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/IResultMap.java @@ -14,7 +14,7 @@ /** * A simple interface to provide easy access to multiple types of returns. * - * @author jamesdavies + * * */ public interface IResultMap { diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2InstanceImpl.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2InstanceImpl.java index ff419efa7..9462d789a 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2InstanceImpl.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2InstanceImpl.java @@ -40,7 +40,7 @@ * This instance also provides the connection itself back to the tester for any complex usecases not * covered by the methods inside this manager. * - * @author jamesdavies + * * */ public class Db2InstanceImpl implements IDb2Instance{ diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2ManagerImpl.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2ManagerImpl.java index 43f0c384d..ed1550f96 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2ManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2ManagerImpl.java @@ -44,7 +44,7 @@ * Provides two annotations, one for a Db2 Instance connections and one for * a Schema impl * - * @author jamesdavies + * * */ @Component(service = { IManager.class }) diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2SchemaImpl.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2SchemaImpl.java index 7814e320d..98fb58927 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2SchemaImpl.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/Db2SchemaImpl.java @@ -58,7 +58,7 @@ * For any unsupported object types please gain a standard * sql connection from the IDb2Instance * - * @author jamesdavies + * * */ public class Db2SchemaImpl implements IDb2Schema{ diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/ResultMap.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/ResultMap.java index de379d47c..83b9ed5a0 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/ResultMap.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/internal/ResultMap.java @@ -19,7 +19,7 @@ * Result Map is a basic object for simple SQL statements returns. * * - * @author jamesdavies + * * */ public class ResultMap implements IResultMap{ diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/spi/IDb2ManagerSpi.java b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/spi/IDb2ManagerSpi.java index 7f28e5112..44cb345ca 100644 --- a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/spi/IDb2ManagerSpi.java +++ b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/src/main/java/dev/galasa/db2/spi/IDb2ManagerSpi.java @@ -16,7 +16,7 @@ * too before requesting a schema from that database, the connection will be initialised. * * - * @author jamesdavies + * * */ public interface IDb2ManagerSpi { diff --git a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/EclipseManagerField.java b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/EclipseManagerField.java index 882ec9168..4aa1a8989 100644 --- a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/EclipseManagerField.java +++ b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/EclipseManagerField.java @@ -14,7 +14,7 @@ * Used to annotate annotations that are to be used for Test Class fields. To be * populated by the Manager. * - * @author Reece Williams + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/IEclipseInstall.java b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/IEclipseInstall.java index 70d2f41cd..07c0bbbf3 100644 --- a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/IEclipseInstall.java +++ b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.manager/src/main/java/dev/galasa/eclipseruntime/IEclipseInstall.java @@ -9,7 +9,7 @@ /** * - * @author Reece Williams + * * */ public interface IEclipseInstall { diff --git a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/EclipseInstallUbuntu.java b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/EclipseInstallUbuntu.java index 7e6495133..578bc4e07 100644 --- a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/EclipseInstallUbuntu.java +++ b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/EclipseInstallUbuntu.java @@ -23,7 +23,7 @@ * Used to populate a {@link IEclipseInstallUbuntu} field *

    * - * @author Reece Williams + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/EclipseUbuntuManagerField.java b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/EclipseUbuntuManagerField.java index 39ecfc8c6..766f573a2 100644 --- a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/EclipseUbuntuManagerField.java +++ b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/EclipseUbuntuManagerField.java @@ -14,7 +14,7 @@ * Used to annotate annotations that are to be used for Test Class fields. To be * populated by the Manager. * - * @author Reece Williams + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/IEclipseInstallUbuntu.java b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/IEclipseInstallUbuntu.java index e82c2169a..c80f7b2b5 100644 --- a/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/IEclipseInstallUbuntu.java +++ b/galasa-managers-parent/galasa-managers-ides-parent/dev.galasa.eclipseruntime.ubuntu.manager/src/main/java/dev/galasa/eclipseruntime/ubuntu/IEclipseInstallUbuntu.java @@ -16,7 +16,7 @@ * Use a {@link EclipseInstallUbuntu} annotation to populate this field with *

    * - * @author Reece Williams + * * */ diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/DoNotBuild.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/DoNotBuild.java index e2d8a3f50..aa80fe201 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/DoNotBuild.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/DoNotBuild.java @@ -14,7 +14,7 @@ * Requests that SEM does not build the Complex, used if the test wants to * build the CICS Regions itself * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/DoNotStartCICS.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/DoNotStartCICS.java index 83934ec20..457809f7c 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/DoNotStartCICS.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/DoNotStartCICS.java @@ -14,7 +14,7 @@ * This annotation will inform the provisioning system (SEM) * not to start any CICS regions. * - * @author Ross Henderson + * */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/SemManagerField.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/SemManagerField.java index a6a47a791..f1290f7b5 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/SemManagerField.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/SemManagerField.java @@ -14,7 +14,7 @@ * Used to annotate annotations that are to be used for Test Class fields. To be * populated by the Manager. * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/SemTopology.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/SemTopology.java index 80f3ae5f9..eb60d7492 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/SemTopology.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/SemTopology.java @@ -13,7 +13,7 @@ /** * Represents a SEM topology to build a set of CICS regions from * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/Sit.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/Sit.java index d6565d217..8f33ce024 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/Sit.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/Sit.java @@ -24,7 +24,7 @@ * {@link @Sit}(parameter="SITPARM2",value="TWO")
    *

    * - * @author Michael Baylis + * */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/Sits.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/Sits.java index 5be42ec39..5c3c74b4c 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/Sits.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/Sits.java @@ -22,7 +22,7 @@ * }) *

    * - * @author Michael Baylis + * */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/JavaManagerField.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/JavaManagerField.java index ea5113925..a0cd5eda1 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/JavaManagerField.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.manager/src/main/java/dev/galasa/java/JavaManagerField.java @@ -14,7 +14,7 @@ * Used to annotate annotations that are to be used for Test Class fields. To be * populated by the Manager. * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/IJavaUbuntuInstallation.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/IJavaUbuntuInstallation.java index 3ff2c32fd..f1e85ff5b 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/IJavaUbuntuInstallation.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/IJavaUbuntuInstallation.java @@ -16,7 +16,7 @@ * Use a {@link JavaUbuntuInstallation} annotation to populate this field with *

    * - * @author Michael Baylis + * * */ public interface IJavaUbuntuInstallation extends IJavaInstallation { diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/JavaUbuntuInstallation.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/JavaUbuntuInstallation.java index ed11fe5a1..e341b0db0 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/JavaUbuntuInstallation.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/JavaUbuntuInstallation.java @@ -21,7 +21,7 @@ * Used to populate a {@link IJavaUbuntuInstallation} field *

    * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/JavaUbuntuManagerField.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/JavaUbuntuManagerField.java index 923643413..bc21446f2 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/JavaUbuntuManagerField.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.ubuntu.manager/src/main/java/dev/galasa/java/ubuntu/JavaUbuntuManagerField.java @@ -14,7 +14,7 @@ * Used to annotate annotations that are to be used for Test Class fields. To be * populated by the Manager. * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/IJavaWindowsInstallation.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/IJavaWindowsInstallation.java index c69b01ce6..2cb327601 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/IJavaWindowsInstallation.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/IJavaWindowsInstallation.java @@ -16,7 +16,7 @@ * Use a {@link JavaWindowsInstallation} annotation to populate this field with *

    * - * @author Michael Baylis + * * */ public interface IJavaWindowsInstallation extends IJavaInstallation { diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/JavaWindowsInstallation.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/JavaWindowsInstallation.java index 1af751f5f..49a4417db 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/JavaWindowsInstallation.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/JavaWindowsInstallation.java @@ -21,7 +21,7 @@ * Used to populate a {@link IJavaWindowsInstallation} field *

    * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/JavaWindowsManagerField.java b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/JavaWindowsManagerField.java index e7872c46d..76b03b77f 100644 --- a/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/JavaWindowsManagerField.java +++ b/galasa-managers-parent/galasa-managers-languages-parent/dev.galasa.java.windows.manager/src/main/java/dev/galasa/java/windows/JavaWindowsManagerField.java @@ -14,7 +14,7 @@ * Used to annotate annotations that are to be used for Test Class fields. To be * populated by the Manager. * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/ElasticLogManagerImpl.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/ElasticLogManagerImpl.java index 73ab1a4ca..5999a96d7 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/ElasticLogManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.elasticlog.manager/src/main/java/dev/galasa/elasticlog/internal/ElasticLogManagerImpl.java @@ -48,7 +48,7 @@ /** * ElasticLog Manager implementation * - * @author Richard Somers + * */ @Component(service = { IManager.class }) public class ElasticLogManagerImpl extends AbstractManager { diff --git a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/Phoenix2ManagerImpl.java b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/Phoenix2ManagerImpl.java index 8f7c0e305..726aa4427 100644 --- a/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/Phoenix2ManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-logging-parent/dev.galasa.phoenix2.manager/src/main/java/dev/galasa/phoenix2/internal/Phoenix2ManagerImpl.java @@ -46,7 +46,7 @@ /** * ElasticLog Manager implementation * - * @author Michael Baylis + * */ @Component(service = { IManager.class }) public class Phoenix2ManagerImpl extends AbstractManager { diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/EcosystemEndpoint.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/EcosystemEndpoint.java index 540b4c7d4..d23232f9b 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/EcosystemEndpoint.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/EcosystemEndpoint.java @@ -11,7 +11,7 @@ /** * Types of Endpoints for the Galasa Ecosystem * - * @author Michael Baylis + * * */ public enum EcosystemEndpoint { diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/GalasaEcosystemManagerField.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/GalasaEcosystemManagerField.java index 281bc1d21..00ce335e2 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/GalasaEcosystemManagerField.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/GalasaEcosystemManagerField.java @@ -13,7 +13,7 @@ /** * Annotation to identify manager controlled annotated fields * - * @author Michael Baylis + * */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE }) diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IGenericEcosystem.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IGenericEcosystem.java index bc744e6d0..88a9e21d9 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IGenericEcosystem.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IGenericEcosystem.java @@ -18,7 +18,7 @@ * * Provides a means to manipulate the ecosystem * - * @author Michael Baylis + * * */ public interface IGenericEcosystem { diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IKubernetesEcosystem.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IKubernetesEcosystem.java index f094636d3..43c07a27e 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IKubernetesEcosystem.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/IKubernetesEcosystem.java @@ -12,7 +12,7 @@ * * Provides access to the ecosystem endpoints and provides the mean to manipulate the ecosystem * - * @author Michael Baylis + * * */ public interface IKubernetesEcosystem extends IGenericEcosystem { diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/ILocalEcosystem.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/ILocalEcosystem.java index c079b6008..c64db4036 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/ILocalEcosystem.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/ILocalEcosystem.java @@ -12,7 +12,7 @@ * * Provides access to the ecosystem endpoints and provides the mean to manipulate the ecosystem * - * @author Michael Baylis + * * */ public interface ILocalEcosystem extends IGenericEcosystem { diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/GalasaEcosystemManagerImpl.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/GalasaEcosystemManagerImpl.java index 9fe8c9be8..3f2fa10db 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/GalasaEcosystemManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/GalasaEcosystemManagerImpl.java @@ -69,7 +69,7 @@ /** * The Galasa Ecosystem Manager * - * @author Michael Baylis + * * */ @Component(service = { IManager.class }) diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/KubernetesEcosystemImpl.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/KubernetesEcosystemImpl.java index ea7392b96..398c2fbf9 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/KubernetesEcosystemImpl.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/KubernetesEcosystemImpl.java @@ -77,7 +77,7 @@ /** * Deploy the Ecsosystem into a Kubernetes Namespace * - * @author Michael Baylis + * * */ public class KubernetesEcosystemImpl extends AbstractEcosystemImpl implements IKubernetesEcosystem { diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RunIdPrefix.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RunIdPrefix.java index 69b5be953..bd06901bc 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RunIdPrefix.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RunIdPrefix.java @@ -29,7 +29,7 @@ * default value is TEST{A-Z}{A-Z} *

    * - * @author Michael Baylis + * * */ public class RunIdPrefix extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/GalasaEcosystemResourceManagement.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/GalasaEcosystemResourceManagement.java index 59c92e892..6535e35f0 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/GalasaEcosystemResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/GalasaEcosystemResourceManagement.java @@ -21,7 +21,7 @@ /** * Initialise the Resource Management routines for the Galasa Ecosystem Manager * - * @author Michael Baylis + * * */ @Component(service= {IResourceManagementProvider.class}) diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/RunIdPrefixMonitor.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/RunIdPrefixMonitor.java index 41dbb0814..c721141da 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/RunIdPrefixMonitor.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/RunIdPrefixMonitor.java @@ -23,7 +23,7 @@ /** * Clean up the hanging runid prefixes * - * @author Michael Baylis + * * */ public class RunIdPrefixMonitor implements Runnable { diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/RunResourceMonitor.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/RunResourceMonitor.java index 00e8e83cb..93b73c26c 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/RunResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/resourcemanagement/RunResourceMonitor.java @@ -22,7 +22,7 @@ /** * Clean up the ecosystem properties when the run is deleted * - * @author Michael Baylis + * * */ public class RunResourceMonitor implements Runnable { diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/Browser.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/Browser.java index 3771a8507..42031d658 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/Browser.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/Browser.java @@ -14,7 +14,7 @@ /** * Specifies the supported browser types for Local and remote versions * - * @author jamesdavies + * * */ public enum Browser { diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IChromeOptions.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IChromeOptions.java index f8d2f90f4..6079d97a8 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IChromeOptions.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IChromeOptions.java @@ -18,7 +18,7 @@ /** * A Options pass through interface for the Selenium Options object * - * @author jamesdavies + * * */ public interface IChromeOptions { diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IEdgeOptions.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IEdgeOptions.java index 7582fc55c..426b0a5e1 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IEdgeOptions.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IEdgeOptions.java @@ -14,7 +14,7 @@ /** * A Options pass through interface for the Selenium Options object * - * @author jamesdavies + * * */ public interface IEdgeOptions { diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IFirefoxOptions.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IFirefoxOptions.java index 73c2c0ac7..8e3ddf2c1 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IFirefoxOptions.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IFirefoxOptions.java @@ -22,7 +22,7 @@ /** * A Options pass through interface for the Selenium Options object * - * @author jamesdavies + * * */ public interface IFirefoxOptions { diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IInternetExplorerOptions.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IInternetExplorerOptions.java index c3a010969..a20fd15f0 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IInternetExplorerOptions.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/IInternetExplorerOptions.java @@ -19,7 +19,7 @@ /** * A Options pass through interface for the Selenium Options object * - * @author jamesdavies + * * */ public interface IInternetExplorerOptions { diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/ISeleniumManager.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/ISeleniumManager.java index f4d7a73bb..76d92db29 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/ISeleniumManager.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/ISeleniumManager.java @@ -10,7 +10,7 @@ /** * This interface is being deprecated and replaced with a more appropriately named IWebDriver interface. * - * @author jamesdavies + * * */ @Deprecated diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/SeleniumManager.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/SeleniumManager.java index c717bcdd3..15afb36c4 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/SeleniumManager.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/SeleniumManager.java @@ -15,7 +15,7 @@ /** * This annotation is being deprecated and replaced with a more appropriately named @WebDriver. There is no functionality differences between the two * - * @author jamesdavies + * * */ @Deprecated diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/DriverImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/DriverImpl.java index 28177ca20..1b352d580 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/DriverImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/DriverImpl.java @@ -17,7 +17,7 @@ /** * Superclass for the local and remote driver implementations for tracking and discarding webpages * - * @author jamesdavies + * * */ public class DriverImpl { diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/LocalBrowser.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/LocalBrowser.java index e1b542784..21e973a0d 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/LocalBrowser.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/LocalBrowser.java @@ -35,7 +35,7 @@ /** * Interactions with a different browser types for local Selenium drivers. * - * @author jamesdavies + * * */ public enum LocalBrowser { diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/LocalDriverImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/LocalDriverImpl.java index 73cb6fa38..4736c93bc 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/LocalDriverImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/LocalDriverImpl.java @@ -23,7 +23,7 @@ * A local driver can be used to run Selenium tests. This is not support inside an Galasa ecosystem, as the tests run inside * the default engine. Please use the Docker, Kubernetes or Grid implementations for automation runs. * - * @author jamesdavies + * * */ public class LocalDriverImpl extends DriverImpl implements IWebDriver{ diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumEnvironment.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumEnvironment.java index fe13031c5..603bf8963 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumEnvironment.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumEnvironment.java @@ -33,7 +33,7 @@ * Selenium Environment is a generic environment for both local and remote drivers * * - * @author jamesdavies + * * */ public class SeleniumEnvironment { diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumGridSessionMonitor.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumGridSessionMonitor.java index 434edd105..c8e4cb049 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumGridSessionMonitor.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumGridSessionMonitor.java @@ -34,7 +34,7 @@ /** * Monitors any configured Selenium Grids for stale sessions. * - * @author jamesdavies + * * */ public class SeleniumGridSessionMonitor implements Runnable { diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumResourceManagement.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumResourceManagement.java index 38e06eeb0..9afa400dc 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumResourceManagement.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumResourceManagement.java @@ -24,7 +24,7 @@ * We only watch the slot properties and the Grid interactions. Both Docker * and Kubernetes are responsible for the own cleanup of stale resources. * - * @author jamesdavies + * * */ @Component(service = { IResourceManagementProvider.class }) diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumSlotResourceMonitor.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumSlotResourceMonitor.java index 0afdc4286..fa83f5bf4 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumSlotResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.selenium.manager/src/main/java/dev/galasa/selenium/internal/SeleniumSlotResourceMonitor.java @@ -24,7 +24,7 @@ /** * Looks for slots allocated to non active tests. * - * @author jamesdavies + * * */ public class SeleniumSlotResourceMonitor implements Runnable { diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/ILinuxImage.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/ILinuxImage.java index f573f55ed..136bae52e 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/ILinuxImage.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/ILinuxImage.java @@ -22,7 +22,7 @@ * Use a {@link LinuxImage} annotation to populate this field with *

    * - * @author Michael Baylis + * * */ public interface ILinuxImage { diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxImage.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxImage.java index 5b1dab640..b30519dec 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxImage.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxImage.java @@ -19,7 +19,7 @@ * Used to populate a {@link ILinuxImage} field *

    * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxIpHost.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxIpHost.java index e61d80a3a..818bbddf0 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxIpHost.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxIpHost.java @@ -20,7 +20,7 @@ * Used to populate a {@link dev.galasa.ipnetwork.IIpHost} field *

    * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxManagerField.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxManagerField.java index fe0e6d181..c88611fb0 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxManagerField.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/LinuxManagerField.java @@ -14,7 +14,7 @@ * Used to annotate annotations that are to be used for Test Class fields. To be * populated by the Manager. * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxArchivesDirectory.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxArchivesDirectory.java index e171586a1..a15fa9297 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxArchivesDirectory.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxArchivesDirectory.java @@ -24,7 +24,7 @@ * Default is /opt/archives *

    * - * @author Michael Baylis + * * */ public class LinuxArchivesDirectory extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxCapabilities.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxCapabilities.java index e1415dcc9..9ba394c0a 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxCapabilities.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxCapabilities.java @@ -26,7 +26,7 @@ * The default is empty, ie no special capabilities *

    * - * @author Michael Baylis + * * */ public class LinuxCapabilities extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxOperatingSystem.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxOperatingSystem.java index 41800bbfc..223851748 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxOperatingSystem.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/LinuxOperatingSystem.java @@ -24,7 +24,7 @@ * There is no default, the property must be provided for the image to be selectable *

    * - * @author Michael Baylis + * * */ public class LinuxOperatingSystem extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/MaximumSlots.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/MaximumSlots.java index 33015c13c..c9c1c0d45 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/MaximumSlots.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/MaximumSlots.java @@ -23,7 +23,7 @@ * default value is 2 slots *

    * - * @author Michael Baylis + * * */ public class MaximumSlots extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/SharedLinuxImages.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/SharedLinuxImages.java index fc090650e..88b107642 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/SharedLinuxImages.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/SharedLinuxImages.java @@ -27,7 +27,7 @@ * There are no defaults *

    * - * @author Michael Baylis + * * */ public class SharedLinuxImages extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/SharedLinuxPriority.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/SharedLinuxPriority.java index c2e036573..abec16834 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/SharedLinuxPriority.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/SharedLinuxPriority.java @@ -24,7 +24,7 @@ * default value is 1 *

    * - * @author Michael Baylis + * * */ public class SharedLinuxPriority extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/UsernamePool.java b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/UsernamePool.java index 2fd26e49b..d787ede09 100644 --- a/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/UsernamePool.java +++ b/galasa-managers-parent/galasa-managers-unix-parent/dev.galasa.linux.manager/src/main/java/dev/galasa/linux/internal/properties/UsernamePool.java @@ -30,7 +30,7 @@ * default value is galasa{0-9}{0-9} *

    * - * @author Michael Baylis + * * */ public class UsernamePool extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/IWindowsImage.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/IWindowsImage.java index 395481a36..4d2a3151d 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/IWindowsImage.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/IWindowsImage.java @@ -22,7 +22,7 @@ * Use a {@link WindowsImage} annotation to populate this field with *

    * - * @author Michael Baylis + * * */ public interface IWindowsImage { diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsImage.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsImage.java index f75148523..5bae187e1 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsImage.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsImage.java @@ -19,7 +19,7 @@ * Used to populate a {@link IWindowsImage} field *

    * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsIpHost.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsIpHost.java index 3be6d5178..c04f54e58 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsIpHost.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsIpHost.java @@ -20,7 +20,7 @@ * Used to populate a {@link dev.galasa.ipnetwork.IIpHost} field *

    * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsManagerField.java b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsManagerField.java index 61b84a4af..1c814a77e 100644 --- a/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsManagerField.java +++ b/galasa-managers-parent/galasa-managers-windows-parent/dev.galasa.windows.manager/src/main/java/dev/galasa/windows/WindowsManagerField.java @@ -14,7 +14,7 @@ * Used to annotate annotations that are to be used for Test Class fields. To be * populated by the Manager. * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/GitHubIssue.java b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/GitHubIssue.java index 9804f891d..4439cae2f 100644 --- a/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/GitHubIssue.java +++ b/galasa-managers-parent/galasa-managers-workflow-parent/dev.galasa.githubissue.manager/src/main/java/dev/galasa/githubissue/GitHubIssue.java @@ -14,7 +14,7 @@ * This annotation will cause the Manager to influence the "failed" result of the test based on * whether a GitHub issue is open or closed. * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosImage.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosImage.java index 2a0b3177f..454735a80 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosImage.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosImage.java @@ -17,7 +17,7 @@ * *

    Use a {@link ZosImage} annotation to populate this field with

    * - * @author Michael Baylis + * * */ public interface IZosImage { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosManager.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosManager.java index bbb50ca0f..afa6c8b02 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosManager.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/IZosManager.java @@ -8,7 +8,7 @@ /** * Provides the test code access to the zOS Manager * - * @author Michael Baylis + * * */ public interface IZosManager { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosImage.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosImage.java index 2f735277b..e0b492270 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosImage.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosImage.java @@ -17,7 +17,7 @@ * *

    Used to populate a {@link IZosImage} field

    * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosIpHost.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosIpHost.java index 522fa6532..eec9ac053 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosIpHost.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosIpHost.java @@ -18,7 +18,7 @@ * *

    Used to populate a {@link dev.galasa.ipnetwork.IIpHost} field

    * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosIpPort.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosIpPort.java index 16e3a5dbc..f974dd10f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosIpPort.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosIpPort.java @@ -18,7 +18,7 @@ * *

    Used to populate a {@link dev.galasa.ipnetwork.IIpPort} field

    * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosManagerField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosManagerField.java index 38ecac65b..793347628 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosManagerField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/ZosManagerField.java @@ -14,7 +14,7 @@ * Used to annotate annotations that are to be used for Test Class fields. To be * populated by the Manager. * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/spi/ZosImageDependencyField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/spi/ZosImageDependencyField.java index 5a5a3f296..0079ece7b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/spi/ZosImageDependencyField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zos/spi/ZosImageDependencyField.java @@ -13,7 +13,7 @@ /** * Used to annotate annotations that are a dependency of a zosImage, requires a imageTag for the zOS Manager to automatically provision the zOS Image * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatch.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatch.java index ac4431b33..48ce5f58f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatch.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatch.java @@ -12,7 +12,7 @@ /** * Provides the test code access to zOS Batch jobs via the zOS Manager * - * @author Michael Baylis + * * */ public interface IZosBatch { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJob.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJob.java index 14a32c0f9..b98ef2dcb 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJob.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJob.java @@ -8,7 +8,7 @@ /** *

    Represents a zOS Batch Job.

    * - * @author Michael Baylis + * * */ public interface IZosBatchJob { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJobname.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJobname.java index 6a283e803..fac73e972 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJobname.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/IZosBatchJobname.java @@ -10,7 +10,7 @@ * *

    Use a {@link ZosBatchJobname} annotation to populate this field with

    * - * @author Michael Baylis + * * */ public interface IZosBatchJobname { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchField.java index e46ab6a48..1c6f58323 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchField.java @@ -14,7 +14,7 @@ * Used to annotate annotations that are to be used for Test Class fields. To be * populated by the Manager. * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchJobcard.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchJobcard.java index a8cbb61a3..33d9f8534 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchJobcard.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos.manager/src/main/java/dev/galasa/zosbatch/ZosBatchJobcard.java @@ -15,7 +15,7 @@ * * No validation is performed on the values that are set * - * @author Michael Baylis + * * */ public class ZosBatchJobcard { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/FieldContents.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/FieldContents.java index f63b47cc5..e2e05c891 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/FieldContents.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/FieldContents.java @@ -10,7 +10,7 @@ /** * Pojo to contain the onscreen contents. May contain nulls. * - * @author Michael Baylis + * * */ public class FieldContents { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/Terminal.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/Terminal.java index febd9699d..884ad585b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/Terminal.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/Terminal.java @@ -17,7 +17,7 @@ * These pojos are stored in a local directory for inflight tests, and in the * RAS. * - * @author Michael Baylis + * * */ public class Terminal { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalField.java index dd8d04245..afda43c64 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalField.java @@ -11,7 +11,7 @@ /** * Pojo to represent a Field on the terminal screen. * - * @author Michael Baylis + * * */ public class TerminalField { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalImage.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalImage.java index 497324456..cfab1dab8 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalImage.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalImage.java @@ -14,7 +14,7 @@ * Pojo to represent a screen image as received or sent from the client. Inbound * means received by the client. * - * @author Michael Baylis + * * */ public class TerminalImage { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalSize.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalSize.java index e3c637d27..e029a24de 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalSize.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.common/src/main/java/dev/galasa/zos3270/common/screens/TerminalSize.java @@ -8,7 +8,7 @@ /** * Represents the terminal screen size * - * @author Michael Baylis + * * */ public class TerminalSize { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/Zos3270Terminal.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/Zos3270Terminal.java index 3712693e5..ad54d67f9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/Zos3270Terminal.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/Zos3270Terminal.java @@ -20,7 +20,7 @@ * Used to populate a {@link ITerminal} field *

    * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerField.java index b9d61ec98..2009beb9e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerField.java @@ -14,7 +14,7 @@ * Used to annotate annotations that are to be used for Test Class fields. To be * populated by the Manager. * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/ApplyConfidentialTextFiltering.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/ApplyConfidentialTextFiltering.java index 13a7083ec..cd810584b 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/ApplyConfidentialTextFiltering.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/ApplyConfidentialTextFiltering.java @@ -23,7 +23,7 @@ * default value is true *

    * - * @author Michael Baylis + * * */ public class ApplyConfidentialTextFiltering extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/LiveTerminalUrl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/LiveTerminalUrl.java index 18146119b..f7bbe063c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/LiveTerminalUrl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/LiveTerminalUrl.java @@ -26,7 +26,7 @@ * to be done *

    * - * @author Michael Baylis + * * */ public class LiveTerminalUrl extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/LogConsoleTerminals.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/LogConsoleTerminals.java index 69dd51062..059b39264 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/LogConsoleTerminals.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/LogConsoleTerminals.java @@ -20,7 +20,7 @@ * default is TRUE *

    * - * @author Michael Baylis + * * */ public class LogConsoleTerminals extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/TerminalDeviceTypes.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/TerminalDeviceTypes.java index c662e05fa..704e329f0 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/TerminalDeviceTypes.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/properties/TerminalDeviceTypes.java @@ -23,7 +23,7 @@ * default is IBM-DYNAMIC,IBM-3278-2 *

    * - * @author Michael Baylis + * * */ public class TerminalDeviceTypes extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferStartOfField.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferStartOfField.java index 15cc749c8..8252f61f9 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferStartOfField.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/BufferStartOfField.java @@ -16,7 +16,7 @@ /** * Create a Start of Field position, represents to SF order * - * @author Michael Baylis + * * */ public class BufferStartOfField implements IBufferHolder { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Screen.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Screen.java index 982fd8dd3..8d29accfc 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Screen.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/spi/Screen.java @@ -79,7 +79,7 @@ /** * Screen representation of the 3270 terminal * - * @author Michael Baylis + * * */ public class Screen { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackSpaceTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackSpaceTest.java index 1c5517382..6fd3aed28 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackSpaceTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackSpaceTest.java @@ -27,7 +27,7 @@ /** * Test the backSpace function * - * @author Michael Baylis + * * */ public class BackSpaceTest extends Zos3270TestBase { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackTabTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackTabTest.java index ae7cf61c5..05ed629a4 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackTabTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/BackTabTest.java @@ -24,7 +24,7 @@ /** * Test the backTab function * - * @author Michael Baylis + * * */ public class BackTabTest extends Zos3270TestBase { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/FieldOverflowTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/FieldOverflowTest.java index 3697b240a..d5a7e8289 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/FieldOverflowTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/FieldOverflowTest.java @@ -25,7 +25,7 @@ /** * Ensure if type over the end of a field, the cursor will skip to the next unprotected field * - * @author Michael Baylis + * * */ public class FieldOverflowTest extends Zos3270TestBase { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/HomeTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/HomeTest.java index 590911394..0169dd3dc 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/HomeTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/HomeTest.java @@ -24,7 +24,7 @@ /** * Test the home function * - * @author Michael Baylis + * * */ public class HomeTest extends Zos3270TestBase { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/NewLineTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/NewLineTest.java index a7337e00d..5f3fc8d08 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/NewLineTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/NewLineTest.java @@ -25,7 +25,7 @@ /** * Test the newline function * - * @author Michael Baylis + * * */ public class NewLineTest extends Zos3270TestBase { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/TabTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/TabTest.java index edc2ef7c5..f2a719bcf 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/TabTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/cursor/TabTest.java @@ -25,7 +25,7 @@ /** * Test the tab function * - * @author Michael Baylis + * * */ public class TabTest extends Zos3270TestBase { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/EraseAllUnprotectedTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/EraseAllUnprotectedTest.java index 54d421962..a7f1e7df6 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/EraseAllUnprotectedTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/EraseAllUnprotectedTest.java @@ -27,7 +27,7 @@ /** * Test the Erase All Unprotected order * - * @author Michael Baylis + * * */ public class EraseAllUnprotectedTest extends Zos3270TestBase { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java index f72653f4a..00cc171e1 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/orders/GraphicsEscapeTest.java @@ -29,7 +29,7 @@ /** * Test the Graphics Escape order * - * @author Michael Baylis + * * */ public class GraphicsEscapeTest extends Zos3270TestBase { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosCertificate.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosCertificate.java index 8a5550a64..672c2d10a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosCertificate.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosCertificate.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import dev.galasa.zossecurity.datatypes.RACFCertificateType; @@ -11,7 +11,7 @@ /** * Represents a Certificate that has been imported into RACF * - * @author Michael Baylis + * * */ public interface IZosCertificate { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosCicsClassSet.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosCicsClassSet.java index 6e706df3c..7d5100f6a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosCicsClassSet.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosCicsClassSet.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import java.util.HashMap; @@ -16,7 +16,7 @@ * Represents a set of RACF Classes that is used to CICS security. A time of writing this is * 10 classes TxxxxTRN and GxxxxTRN etc. * - * @author Michael Baylis + * * */ public interface IZosCicsClassSet { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosGroup.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosGroup.java index 8cafd87f0..2313e34b7 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosGroup.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosGroup.java @@ -1,15 +1,15 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; /** * Represents a group * - * @author mikebyls + * * */ public interface IZosGroup { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosIdMap.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosIdMap.java index 3a1a5c569..a5b075284 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosIdMap.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosIdMap.java @@ -1,14 +1,14 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; /** * Represents a Id Map that has been created. * - * @author Michael Baylis + * * */ public interface IZosIdMap { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosKerberosPrincipal.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosKerberosPrincipal.java index 2cc6f3a2d..5b87af221 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosKerberosPrincipal.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosKerberosPrincipal.java @@ -1,14 +1,14 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; /** * Representation of a Kerberos Principal * - * @author James Bartlett + * * */ public interface IZosKerberosPrincipal { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosKeyring.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosKeyring.java index 37d78bb3a..64ab3e40c 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosKeyring.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosKeyring.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import dev.galasa.zossecurity.datatypes.RACFCertificateType; @@ -11,7 +11,7 @@ /** * Represents a keyring that has been created. * - * @author Michael Baylis + * * */ public interface IZosKeyring { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosPreDefinedProfile.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosPreDefinedProfile.java index 4e97e8786..1fdfa534e 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosPreDefinedProfile.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosPreDefinedProfile.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import dev.galasa.zossecurity.datatypes.RACFAccessType; @@ -14,7 +14,7 @@ * * This can only be used with the v2 security manager * - * @author Michael Baylis + * * */ public interface IZosPreDefinedProfile { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosProfile.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosProfile.java index 1c7394e1c..3c239d849 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosProfile.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosProfile.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import dev.galasa.zossecurity.datatypes.RACFAccessType; @@ -10,7 +10,7 @@ /** * Represents a profile created by this zossec security manager * - * @author Michael Baylis + * * */ public interface IZosProfile { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosSecurity.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosSecurity.java index 626e94fb0..d831ca661 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosSecurity.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosSecurity.java @@ -23,7 +23,7 @@ * To gain access to the ZosSecurityManager include a field of type IZosSecurity * in your Galasa class. * - * @author Michael Baylis + * * */ public interface IZosSecurity { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosUserid.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosUserid.java index 92f7be470..83ca0d16a 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosUserid.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/IZosUserid.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import dev.galasa.zos.IZosImage; @@ -10,7 +10,7 @@ /** * Represents a pooled userid * - * @author mikebyls + * * */ public interface IZosUserid { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/KerberosToken.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/KerberosToken.java index 96bb69071..5603ee5d4 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/KerberosToken.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/KerberosToken.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import jakarta.xml.bind.DatatypeConverter; @@ -10,7 +10,7 @@ /** * Object representing a Kerberos Token * - * @author James Bartlett + * * */ public class KerberosToken { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosCicsClassSet.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosCicsClassSet.java index f3afa0950..be325ad7f 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosCicsClassSet.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosCicsClassSet.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import java.lang.annotation.ElementType; @@ -16,7 +16,7 @@ /** * Requests a CICS Security Class set to be allocated. Use allowAllAccess to have a default profile created in each of all the classes. * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosPreDefinedProfile.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosPreDefinedProfile.java index 76a2af54f..7c7158c19 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosPreDefinedProfile.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/ZosPreDefinedProfile.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity; import java.lang.annotation.ElementType; @@ -18,7 +18,7 @@ * * This can only be used with the v2 security manager * - * @author Michael Baylis + * * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/RACFAccessType.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/RACFAccessType.java index 1237d3b3c..d38dfcb5d 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/RACFAccessType.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/RACFAccessType.java @@ -1,14 +1,14 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.datatypes; /** * The RACF Access levels * - * @author Michael Baylis + * * */ public enum RACFAccessType { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/ZosCicsClassResource.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/ZosCicsClassResource.java index e9db2bbec..f351c75fa 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/ZosCicsClassResource.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/ZosCicsClassResource.java @@ -1,14 +1,14 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.datatypes; /** * This enum represents the different types of RACF classes that CICS uses for security * - * @author Michael Baylis + * * */ public enum ZosCicsClassResource { diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/ZosCicsClassType.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/ZosCicsClassType.java index db8db72e1..1a13d4679 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/ZosCicsClassType.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zossecurity.manager/src/main/java/dev/galasa/zossecurity/datatypes/ZosCicsClassType.java @@ -1,14 +1,14 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zossecurity.datatypes; /** * Enum to differentiate between the Member RACF CICS Class and the grouping version * - * @author Michael Baylis + * * */ public enum ZosCicsClassType { From 3ce45f55999fb355f0d39c1925928a3541419c06 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Fri, 26 Jul 2024 16:13:53 +0100 Subject: [PATCH 236/263] Allow setting of gherkin terminal size using zos3270.gherkin.terminal.rows and zos3270.gherkin.terminal.columns, or in the gherkin scenario itself. Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../zos3270/internal/Zos3270ManagerImpl.java | 51 +++++- .../gherkin/Gherkin3270Coordinator.java | 5 + .../gherkin/Gherkin3270GivenTerminal.java | 75 ++++++++- .../gherkin/Gherkin3270GivenTerminalTest.java | 154 ++++++++++++++++++ 4 files changed, 279 insertions(+), 6 deletions(-) create mode 100644 galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270GivenTerminalTest.java diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java index 7e6e532d4..3a3b8f4cc 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/Zos3270ManagerImpl.java @@ -9,6 +9,7 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; +import java.util.Map; import javax.validation.constraints.NotNull; @@ -53,7 +54,6 @@ public class Zos3270ManagerImpl extends AbstractGherkinManager implements IZos32 private static final Log logger = LogFactory.getLog(Zos3270ManagerImpl.class); - private IConfigurationPropertyStoreService cps; private IDynamicStatusStoreService dss; private IZosManagerSpi zosManager; @@ -249,8 +249,8 @@ private void disconnectTerminal(Zos3270TerminalImpl terminal) { } } - protected IConfigurationPropertyStoreService getCps() { - return this.cps; + protected IConfigurationPropertyStoreService getCps() throws Zos3270ManagerException { + return Zos3270PropertiesSingleton.cps(); } protected IDynamicStatusStoreService getDss() { @@ -260,4 +260,49 @@ protected IDynamicStatusStoreService getDss() { public IZosManagerSpi getZosManager() { return this.zosManager; } + + /** + * Get a CPS property from the zos3270 namespace. + * + * The Gherkin sister-classes need to be able to retrieve properties from the CPS. + * + * @param fullPropertyName the name of the property you want. Including the namespace, which must + * match {@link Zos3270ManagerImpl#NAMESPACE} + */ + public String getCpsProperty(String fullPropertyName) throws Zos3270ManagerException { + + String propertyValue; + + if (!fullPropertyName.startsWith(Zos3270ManagerImpl.NAMESPACE+".")) { + // This manager can only get properties from the zos3270 namespace. + throw new Zos3270ManagerException( + "Program logic error. CPS property name must start with '"+Zos3270ManagerImpl.NAMESPACE+".' for the Zos3270 manager to access it."+ + " Property"+fullPropertyName+" cannot be retrieved."); + } + + try { + + // We get something like "zos3270.gherkin.terminal.rows" as input. + // The cps we are using is already pinned to the zos3270 namespace, so we don't need to + // pass that. It is implicitly given. + + + String[] propNameParts = fullPropertyName.split("\\."); + // Skip the namespace zos3270 part. + String prefix = propNameParts[1]; + String suffix = propNameParts[propNameParts.length-1]; + // allocate space for the infixes. + String [] infixes = new String[propNameParts.length-3]; + System.arraycopy( propNameParts, 2, infixes, 0, propNameParts.length-3 ); + + propertyValue = getCps().getProperty(prefix, suffix, infixes); + logger.info("Property requested:"+fullPropertyName+" value:"+propertyValue); + + } catch (ConfigurationPropertyStoreException ex) { + throw new Zos3270ManagerException("Failed to retrieve the CPS property "+fullPropertyName , ex ); + } + + return propertyValue; + } + } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Coordinator.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Coordinator.java index 8c6a844d9..377e7a998 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Coordinator.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270Coordinator.java @@ -1,3 +1,8 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.zos3270.internal.gherkin; import java.util.*; diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270GivenTerminal.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270GivenTerminal.java index 97b6e3047..77b692234 100644 --- a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270GivenTerminal.java +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/main/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270GivenTerminal.java @@ -11,6 +11,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import dev.galasa.framework.spi.AbstractManager; import dev.galasa.framework.spi.IGherkinExecutable; import dev.galasa.framework.spi.IStatementOwner; import dev.galasa.framework.spi.language.gherkin.ExecutionMethod; @@ -23,16 +24,22 @@ public class Gherkin3270GivenTerminal implements IStatementOwner { + public static final int DEFAULT_TERMINAL_ROWS = 24; + public static final int DEFAULT_TERMINAL_COLUMNS = 80; + + public static final String DEFAULT_TERMINAL_ROWS_STR = Integer.toString(DEFAULT_TERMINAL_ROWS); + public static final String DEFAULT_TERMINAL_COLUMNS_STR = Integer.toString(DEFAULT_TERMINAL_COLUMNS); + private final static Log logger = LogFactory.getLog(Gherkin3270GivenTerminal.class); private final Gherkin3270Coordinator gerkinCoordinator; private final Zos3270ManagerImpl manager; - + public Gherkin3270GivenTerminal(Gherkin3270Coordinator gerkinCoordinator, Zos3270ManagerImpl manager) { this.gerkinCoordinator = gerkinCoordinator; this.manager = manager; } - @ExecutionMethod(keyword = GherkinKeyword.GIVEN, regex = "a terminal( with id of (\\w+))?( tagged (\\w+))?") + @ExecutionMethod(keyword = GherkinKeyword.GIVEN, regex = "a terminal( with id of (\\w+))?( tagged (\\w+))?( with (\\d+) rows and (\\d+) columns)?") public void allocateTerminal(IGherkinExecutable executable, Map testVariables) throws Zos3270ManagerException { // Ensure we have a connected terminal List groups = executable.getRegexGroups(); @@ -54,12 +61,31 @@ public void allocateTerminal(IGherkinExecutable executable, Map t public void provision(IGherkinExecutable executable) throws Zos3270ManagerException { List groups = executable.getRegexGroups(); + + // Extract the parameters from the step in the scenario. String terminalId = Gherkin3270Coordinator.defaultTerminaId(groups.get(1)); String imageTag = Gherkin3270Coordinator.defaultImageTag(groups.get(3)); + String rowsStepParameter = groups.get(5); + String columnsStepParameter = groups.get(6); + + // Log what we have collected. + { + StringBuffer msg = new StringBuffer(); + msg.append("Provisioning a terminal:"); + msg.append(" id="); + msg.append(terminalId); + msg.append(" imageTag="); + msg.append(imageTag); + msg.append(" rows="); + msg.append(rowsStepParameter); + msg.append(" columns="); + msg.append(columnsStepParameter); + logger.info(msg.toString()); + } Zos3270TerminalImpl newTerminal = this.gerkinCoordinator.getTerminal(terminalId); if (newTerminal == null) { - TerminalSize terminalSize = new TerminalSize(80, 24); + TerminalSize terminalSize = getPreferredTerminalSize(rowsStepParameter , columnsStepParameter); TerminalSize alternateSize = new TerminalSize(0, 0); newTerminal = this.manager.generateTerminal(imageTag, true, terminalSize, alternateSize); @@ -67,4 +93,47 @@ public void provision(IGherkinExecutable executable) throws Zos3270ManagerExcept logger.info("zOS 3270 Terminal id '" + terminalId + "' as been provisioned for image tag '" + imageTag + "'"); } } + + protected TerminalSize getPreferredTerminalSize(String rowsStepParameter, String rowsColumnParameter) throws Zos3270ManagerException { + int columns ; + int rows ; + rows = getNumericCPSProperty("zos3270.gherkin.terminal.rows",DEFAULT_TERMINAL_ROWS,rowsStepParameter); + columns = getNumericCPSProperty("zos3270.gherkin.terminal.columns",DEFAULT_TERMINAL_COLUMNS,rowsColumnParameter); + logger.info("Preferred terminal size is "+Integer.toString(rows)+" x "+Integer.toString(columns)); + return new TerminalSize(columns, rows); + } + + private int getNumericCPSProperty(String propertyName, int defaultConstantValue , String stepDefParameterValue) throws Zos3270ManagerException { + String valueStr ; + int cpsPropValue ; + String notANumberMsg ; + + if (stepDefParameterValue==null || stepDefParameterValue.trim().equals("")) { + // The value wasn't specified in the stepdef, so get it from the CPS property. + valueStr = this.manager.getCpsProperty(propertyName); + notANumberMsg = "Error: CPS property '"+propertyName+"' does not contain a number. Current value is "+valueStr; + } else { + // The value was specified in the stepdef parameter, so use that in preference to the CPS or the default value. + valueStr = stepDefParameterValue ; + notANumberMsg = "Error: value from gherkin statement does not contain a number. Current value is "+valueStr; + } + + if (valueStr == null || valueStr.trim().isBlank()) { + // The property is not there, or it's blank. So use the default value. + cpsPropValue = defaultConstantValue ; + } else { + try { + cpsPropValue = Integer.parseInt(valueStr); + } catch(NumberFormatException ex) { + logger.error(notANumberMsg,ex); + throw new Zos3270ManagerException(notANumberMsg); + } + } + return cpsPropValue; + } + + public static String defaultRows(String rows) { + return AbstractManager.defaultString(rows,DEFAULT_TERMINAL_ROWS_STR); + } + } diff --git a/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270GivenTerminalTest.java b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270GivenTerminalTest.java new file mode 100644 index 000000000..b1736760a --- /dev/null +++ b/galasa-managers-parent/galasa-managers-zos-parent/dev.galasa.zos3270.manager/src/test/java/dev/galasa/zos3270/internal/gherkin/Gherkin3270GivenTerminalTest.java @@ -0,0 +1,154 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ +package dev.galasa.zos3270.internal.gherkin; + +import java.util.Map; + +import org.junit.Test; + +import dev.galasa.framework.spi.language.gherkin.GherkinTest; +import dev.galasa.zos3270.Zos3270ManagerException; +import dev.galasa.zos3270.common.screens.TerminalSize; +import dev.galasa.zos3270.internal.Zos3270ManagerImpl; + +import static org.assertj.core.api.Assertions.*; + +public class Gherkin3270GivenTerminalTest { + + + public class MockZos3270Manager extends Zos3270ManagerImpl { + private Map cpsProperties; + + public MockZos3270Manager(Map cpsProperties) { + this.cpsProperties = cpsProperties; + } + + public String getCpsProperty(String fullPropertyName) throws Zos3270ManagerException { + return cpsProperties.get(fullPropertyName); + } + } + + public class MockGherkinCoordinator extends Gherkin3270Coordinator { + public MockGherkinCoordinator(Zos3270ManagerImpl manager, GherkinTest gherkinTest) { + super(manager, gherkinTest); + } + } + + @Test + public void testGherkin3270GivenTerminalCanBeCreatedOk() { + + Map cpsProps = Map.of(); + MockZos3270Manager mockManager = new MockZos3270Manager(cpsProps); + MockGherkinCoordinator mockCoordinator = new MockGherkinCoordinator(mockManager, null); + + new Gherkin3270GivenTerminal(mockCoordinator, mockManager); + } + + @Test + public void testGherkin3270CanGetDefaultPreferredTerminalSizeEmptyCPS() throws Exception { + Map cpsProps = Map.of( + // "zos3270.gherkin.terminal.rows","24", + // "zos3270.gherkin.terminal.columns","80" + ); + MockZos3270Manager mockManager = new MockZos3270Manager(cpsProps); + MockGherkinCoordinator mockCoordinator = new MockGherkinCoordinator(mockManager, null); + + Gherkin3270GivenTerminal terminal = new Gherkin3270GivenTerminal(mockCoordinator, mockManager); + TerminalSize preferredTerminalSize = terminal.getPreferredTerminalSize("",""); + + assertThat(preferredTerminalSize.getRows()).isEqualTo(Gherkin3270GivenTerminal.DEFAULT_TERMINAL_ROWS); + assertThat(preferredTerminalSize.getColumns()).isEqualTo(Gherkin3270GivenTerminal.DEFAULT_TERMINAL_COLUMNS); + } + + @Test + public void testGherkin3270CanGetDefaultPreferredTerminalSizeFromCPS() throws Exception { + Map cpsProps = Map.of( + "zos3270.gherkin.terminal.rows","25", + "zos3270.gherkin.terminal.columns","81" + ); + MockZos3270Manager mockManager = new MockZos3270Manager(cpsProps); + MockGherkinCoordinator mockCoordinator = new MockGherkinCoordinator(mockManager, null); + + Gherkin3270GivenTerminal terminal = new Gherkin3270GivenTerminal(mockCoordinator, mockManager); + TerminalSize preferredTerminalSize = terminal.getPreferredTerminalSize("",""); + + assertThat(preferredTerminalSize.getRows()).isEqualTo(25); + assertThat(preferredTerminalSize.getColumns()).isEqualTo(81); + } + + @Test + public void testGherkin3270CanGetDefaultPreferredTerminalSizeFromGherkinStatement() throws Exception { + Map cpsProps = Map.of( + "zos3270.gherkin.terminal.rows","25", + "zos3270.gherkin.terminal.columns","81" + ); + MockZos3270Manager mockManager = new MockZos3270Manager(cpsProps); + MockGherkinCoordinator mockCoordinator = new MockGherkinCoordinator(mockManager, null); + + Gherkin3270GivenTerminal terminal = new Gherkin3270GivenTerminal(mockCoordinator, mockManager); + TerminalSize preferredTerminalSize = terminal.getPreferredTerminalSize("48","64"); + + assertThat(preferredTerminalSize.getRows()).isEqualTo(48); + assertThat(preferredTerminalSize.getColumns()).isEqualTo(64); + } + + @Test + public void testGherkin3270GetDefaultPreferredTerminalSizeFailsIfCPSRowsPropNotANumber() throws Exception { + Map cpsProps = Map.of( + "zos3270.gherkin.terminal.rows","hello" + // "zos3270.gherkin.terminal.columns","81" + ); + MockZos3270Manager mockManager = new MockZos3270Manager(cpsProps); + MockGherkinCoordinator mockCoordinator = new MockGherkinCoordinator(mockManager, null); + + Gherkin3270GivenTerminal terminal = new Gherkin3270GivenTerminal(mockCoordinator, mockManager); + + // When... + Zos3270ManagerException ex = catchThrowableOfType( + () -> terminal.getPreferredTerminalSize("",""), + Zos3270ManagerException.class ); + + assertThat(ex).hasMessageContaining("does not contain a number"); + } + + @Test + public void testGherkin3270GetDefaultPreferredTerminalSizeFailsIfGherkinStatementValueNotANumber() throws Exception { + Map cpsProps = Map.of( + "zos3270.gherkin.terminal.rows","25", + "zos3270.gherkin.terminal.columns","81" + ); + MockZos3270Manager mockManager = new MockZos3270Manager(cpsProps); + MockGherkinCoordinator mockCoordinator = new MockGherkinCoordinator(mockManager, null); + + Gherkin3270GivenTerminal terminal = new Gherkin3270GivenTerminal(mockCoordinator, mockManager); + + // When... + Zos3270ManagerException ex = catchThrowableOfType( + () -> terminal.getPreferredTerminalSize("hello-notanumber","notanumber"), + Zos3270ManagerException.class ); + + assertThat(ex).hasMessageContaining("does not contain a number"); + } + + @Test + public void testGherkin3270GetDefaultPreferredTerminalSizeFailsIfCPSColumnsPropNotANumber() throws Exception { + Map cpsProps = Map.of( + "zos3270.gherkin.terminal.rows","24", + "zos3270.gherkin.terminal.columns","hello" + ); + MockZos3270Manager mockManager = new MockZos3270Manager(cpsProps); + MockGherkinCoordinator mockCoordinator = new MockGherkinCoordinator(mockManager, null); + + Gherkin3270GivenTerminal terminal = new Gherkin3270GivenTerminal(mockCoordinator, mockManager); + + // When... + Zos3270ManagerException ex = catchThrowableOfType( + () -> terminal.getPreferredTerminalSize("",""), + Zos3270ManagerException.class ); + + assertThat(ex).hasMessageContaining("does not contain a number"); + } +} From 1a4c2d94d8c89ea6cda60c5bebfea9aa666b9af7 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Thu, 1 Aug 2024 09:42:26 +0100 Subject: [PATCH 237/263] Add support for Gradle 8 Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- galasa-managers-parent/build.gradle | 41 +++++++++++-------- .../src/main/groovy/galasa.manager.gradle | 11 +++++ .../dev.galasa.sdv.manager/build.gradle | 13 ++++-- release.yaml | 2 +- 4 files changed, 45 insertions(+), 22 deletions(-) diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index 82ed9ee03..03a1fe10f 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -45,19 +45,27 @@ subprojects { } // Define the artifact -def execFile = layout.buildDirectory.file('jacoco/jacocoMerge.exec') -def execArtifact = artifacts.add('archives', execFile.get().asFile) { +def mergedReportFile = layout.buildDirectory.file('reports/jacoco/jacocoMerge/jacocoMerge.xml') +def mergedReportArtifact = artifacts.add('archives', mergedReportFile.get().asFile) { builtBy 'jacocoMerge' } +task jacocoMerge(type: JacocoReport) { + gradle.projectsEvaluated { + // Get the jacocoTestReport tasks in all subprojects + def searchRecursively = true + def reportTasks = project.getTasksByName('jacocoTestReport', searchRecursively) + dependsOn reportTasks -task jacocoMerge(type: JacocoMerge) { - doFirst { - // go through all the files and remove the ones that do not exist. some managers do not have unit tests yet - executionData = executionData.filter({f -> f.exists()}) + executionData.setFrom(executionData.filter({ it.exists() })) + sourceDirectories.setFrom(reportTasks.sourceDirectories) + classDirectories.setFrom(reportTasks.classDirectories) } - enabled = jacocoEnabled.toBoolean() + reports { + html.required = true + xml.required = true + } } repositories { @@ -86,7 +94,7 @@ if (jacocoEnabled.toBoolean()) { publishing { publications { maven(MavenPublication) { - artifact execArtifact + artifact mergedReportArtifact groupId = 'codecoverage' artifactId = 'manager-unit-tests' @@ -108,7 +116,7 @@ if (jacocoEnabled.toBoolean()) { } -def manifestFilePath = "$buildDir/release.yaml" +def manifestFile = layout.buildDirectory.file("release.yaml").get().asFile def header = """# # Copyright contributors to the Galasa project @@ -145,14 +153,13 @@ task buildReleaseYaml() { if ( !buildDir.exists() ) { buildDir.mkdirs() } - def manifest_file = new File(manifestFilePath) - if (!manifest_file.exists()){ - manifest_file.createNewFile() + if (!manifestFile.exists()){ + manifestFile.createNewFile() } else { - manifest_file.delete() - manifest_file.createNewFile() + manifestFile.delete() + manifestFile.createNewFile() } - manifest_file.append(header) + manifestFile.append(header) } @@ -173,7 +180,7 @@ task buildReleaseYaml() { doLast { // Some projects don't have a version property... as they are parent projects mostly. if (version != 'unspecified') { - def f = new File(manifestFilePath) + def f = manifestFile f.append("\n\n - artifact: $projectName") f.append("\n version: $version") if (includeInOBR != '') { @@ -200,7 +207,7 @@ task buildReleaseYaml() { } } -def myReleaseYaml = artifacts.add('release_metadata', file("$buildDir/release.yaml")) { +def myReleaseYaml = artifacts.add('release_metadata', manifestFile) { builtBy 'buildReleaseYaml' } diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle index 8ed2c9f74..088646325 100644 --- a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle +++ b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle @@ -28,4 +28,15 @@ test { jacoco { enabled = jacocoEnabled.toBoolean() } + finalizedBy jacocoTestReport +} + +jacocoTestReport { + enabled = jacocoEnabled.toBoolean() + dependsOn test + + reports { + html.required = true + xml.required = true + } } diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/build.gradle index 11be80ff0..9067f47c9 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/build.gradle @@ -7,15 +7,20 @@ plugins { description = 'Galasa SDV Manager' -version = '0.34.0' +version = '0.36.0' checkstyle { configFile = file("config/checkstyle/checkstyle.xml") toolVersion = "10.14.2" } -configurations.all { - attributes { - attribute(Attribute.of('org.gradle.jvm.environment', String), 'standard-jvm') + +// Apply a workaround to get checkstyle working with Gradle 6.x, +// this workaround is not required for later versions of Gradle. +if (project.getGradle().getGradleVersion().compareTo("7.0") < 0) { + configurations.all { + attributes { + attribute(Attribute.of('org.gradle.jvm.environment', String), 'standard-jvm') + } } } diff --git a/release.yaml b/release.yaml index 9b98388a7..24bed4ce8 100644 --- a/release.yaml +++ b/release.yaml @@ -403,7 +403,7 @@ managers: codecoverage: false - artifact: dev.galasa.sdv.manager - version: 0.34.0 + version: 0.36.0 obr: true mvp: true bom: true From 5b30ad106315638404717068202e143bbb63dc9d Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Thu, 1 Aug 2024 16:07:21 +0100 Subject: [PATCH 238/263] 1937 - Added the ICicsRegion#getRegionProperty call Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../dev.galasa.cicsts.manager/build.gradle | 2 +- .../java/dev/galasa/cicsts/ICicsRegion.java | 30 +++++++++++++++---- .../cicsts/internal/dse/DseCicsImpl.java | 15 ++++++---- .../dev.galasa.sem.manager/build.gradle | 2 +- .../dev/galasa/sem/internal/SemCicsImpl.java | 5 ++++ release.yaml | 4 +-- 6 files changed, 44 insertions(+), 14 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle index 21bde66e4..4027a488e 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa CICS/TS Manager' -version = '0.32.0' +version = '0.36.0' dependencies { api project (':galasa-managers-zos-parent:dev.galasa.zos.manager') diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsRegion.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsRegion.java index 1e76c7686..9ab3de93c 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsRegion.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsRegion.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts; import javax.validation.constraints.NotNull; @@ -104,4 +104,24 @@ public interface ICicsRegion { * @throws CicstsManagerException */ public void removeSit(@NotNull String sitParam) throws CicstsManagerException; + + /** + * Allows a testcase to get a specific property about the region. + * + * The list of properties supported will depend upon how the region was + * deployed/provisioned. + * + * By default, no properties are supported, but each implementation of this + * interface is free to provide tests with whatever values they wish to + * reflect this particular CICS region. + * + * @param propertyName The name of the property for which the caller wishes to + * get a value. + * + * @return A string value for the requested property, or null if that property + * value is not available. + * + * @throws CicstsManagerException + */ + public String getRegionProperty( String propertyName ) throws CicstsManagerException; } \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/dse/DseCicsImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/dse/DseCicsImpl.java index ff1d85893..a2fdb23b1 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/dse/DseCicsImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/dse/DseCicsImpl.java @@ -1,8 +1,8 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ package dev.galasa.cicsts.internal.dse; import java.util.List; @@ -153,4 +153,9 @@ public void alterSit(@NotNull String sitParam, String sitValue) throws CicstsMan public void removeSit(@NotNull String sitParam) throws CicstsManagerException { throw new CicstsManagerException("Remove SIT is not supported under DSE provisioning"); } + + @Override + public String getRegionProperty( String propertyName ) throws CicstsManagerException { + return null; + } } diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle index c8821a4a7..d0794c91f 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Internal SEM Manager' -version = '0.25.0' +version = '0.36.0' dependencies { implementation files('jars/sem.jar') diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemCicsImpl.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemCicsImpl.java index 8261cd0ee..47b6fdd29 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemCicsImpl.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemCicsImpl.java @@ -581,4 +581,9 @@ private void rebuildRuntimeJob(CICSRegion region) throws CicstsManagerException // Perform a rebuild of the JCL buildCicsJcl(jobs.get(0)); } + + @Override + public String getRegionProperty( String propertyName ) throws CicstsManagerException { + return null; + } } diff --git a/release.yaml b/release.yaml index 24bed4ce8..f59e9a050 100644 --- a/release.yaml +++ b/release.yaml @@ -79,7 +79,7 @@ managers: codecoverage: false - artifact: dev.galasa.cicsts.manager - version: 0.32.0 + version: 0.36.0 obr: true mvp: true bom: true @@ -304,7 +304,7 @@ managers: codecoverage: false - artifact: dev.galasa.sem.manager - version: 0.25.0 + version: 0.36.0 obr: true mvp: false bom: true From feff4810bb3b9e8ecb2d94f6db7510f7c366626b Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Thu, 1 Aug 2024 19:24:21 +0100 Subject: [PATCH 239/263] Trigger OBR workflow Signed-off-by: Jade Carino --- .github/workflows/build.yaml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f7e4d31e3..2751757bb 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,6 +1,7 @@ name: Main build on: + workflow_dispatch: push: branches: [main] @@ -79,4 +80,22 @@ jobs: env: ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_TOKEN }} run: | - docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app actions run gh-maven-repos restart --kind Deployment --resource-name managers-gh --server argocd.galasa.dev \ No newline at end of file + docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app actions run gh-maven-repos restart --kind Deployment --resource-name managers-gh --server argocd.galasa.dev + + - name: Wait for app health in ArgoCD + env: + ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_TOKEN }} + run: | + docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app wait gh-maven-repos --resource apps:Deployment:managers-gh --health --server argocd.galasa.dev + + trigger-obr-workflow: + name: Trigger OBR workflow + runs-on: ubuntu-latest + needs: build-managers + + steps: + - name: Trigger OBR workflow dispatch event with GitHub CLI + env: + GH_TOKEN: ${{ secrets.GALASA_TEAM_GITHUB_TOKEN }} + run: | + gh workflow run build.yaml --repo https://github.com/galasa-dev/obr \ No newline at end of file From 3d327acc40a25050a24ba867adac7c1faca1b67c Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Fri, 2 Aug 2024 12:01:01 +0100 Subject: [PATCH 240/263] 1513 ICicsRegion interface has default implementation of getRegionProperty Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- .../src/main/java/dev/galasa/cicsts/ICicsRegion.java | 4 +++- .../java/dev/galasa/cicsts/internal/dse/DseCicsImpl.java | 5 ----- .../src/main/java/dev/galasa/sem/internal/SemCicsImpl.java | 4 ---- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsRegion.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsRegion.java index 9ab3de93c..74e26173a 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsRegion.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/ICicsRegion.java @@ -123,5 +123,7 @@ public interface ICicsRegion { * * @throws CicstsManagerException */ - public String getRegionProperty( String propertyName ) throws CicstsManagerException; + public default String getRegionProperty( String propertyName ) throws CicstsManagerException { + return null; + } } \ No newline at end of file diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/dse/DseCicsImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/dse/DseCicsImpl.java index a2fdb23b1..d28a8c55a 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/dse/DseCicsImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/internal/dse/DseCicsImpl.java @@ -153,9 +153,4 @@ public void alterSit(@NotNull String sitParam, String sitValue) throws CicstsMan public void removeSit(@NotNull String sitParam) throws CicstsManagerException { throw new CicstsManagerException("Remove SIT is not supported under DSE provisioning"); } - - @Override - public String getRegionProperty( String propertyName ) throws CicstsManagerException { - return null; - } } diff --git a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemCicsImpl.java b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemCicsImpl.java index 47b6fdd29..c1935df28 100644 --- a/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemCicsImpl.java +++ b/galasa-managers-parent/galasa-managers-internal-parent/dev.galasa.sem.manager/src/main/java/dev/galasa/sem/internal/SemCicsImpl.java @@ -582,8 +582,4 @@ private void rebuildRuntimeJob(CICSRegion region) throws CicstsManagerException buildCicsJcl(jobs.get(0)); } - @Override - public String getRegionProperty( String propertyName ) throws CicstsManagerException { - return null; - } } From 74141a9e2e188718677ba0b78b3df8a5e4182f9e Mon Sep 17 00:00:00 2001 From: Hariprasada Date: Fri, 2 Aug 2024 12:15:45 +0530 Subject: [PATCH 241/263] Implemented PATCH request support Signed-off-by: Hariprasada --- .../java/dev/galasa/http/IHttpClient.java | 14 +++++++++++- .../galasa/http/internal/HttpClientImpl.java | 10 +++++++++ .../http/internal/HttpClientRequest.java | 22 +++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpClient.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpClient.java index 06438fb4f..efcc129ab 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpClient.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/IHttpClient.java @@ -142,7 +142,19 @@ HttpClientResponse postXML(String url, String xml) */ HttpClientResponse postJson(String url, JsonObject json) throws HttpClientException; - /** + /** + * Issue an HTTP PATCH to the provided URL, sending the provided + * com.google.gson.JsonObject and receiving a com.google.gson.JsonObject in the response. + * + * @param url + * @param json + * @return - {@link HttpClientResponse} with a com.google.gson.JsonObject content type + * @throws HttpClientException + */ + HttpClientResponse patchJson(String url, JsonObject json) throws HttpClientException; + + + /** * Issue an HTTP PUT to the provided URL, sending the provided * com.google.gson.JsonObject and receiving a com.google.gson.JsonObject in the response. * diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientImpl.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientImpl.java index 1fd6e86e3..bf249d304 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientImpl.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientImpl.java @@ -180,6 +180,16 @@ public HttpClientResponse postJson(String url, JsonObject json) thro return executeJsonRequest(request); } + @Override + public HttpClientResponse patchJson(String url, JsonObject json) throws HttpClientException { + + HttpClientRequest request = HttpClientRequest.newPatchRequest(buildUri(url, null).toString(), + new ContentType[] { ContentType.APPLICATION_JSON }, ContentType.APPLICATION_JSON); + request.setJSONBody(json); + + return executeJsonRequest(request); + } + @Override public HttpClientResponse deleteJson(String url) throws HttpClientException { diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientRequest.java b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientRequest.java index b9d3c6957..bccfaa711 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientRequest.java +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/src/main/java/dev/galasa/http/internal/HttpClientRequest.java @@ -21,6 +21,7 @@ import org.apache.http.client.methods.HttpHead; import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpPut; +import org.apache.http.client.methods.HttpPatch; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.client.utils.URIBuilder; import org.apache.http.entity.ByteArrayEntity; @@ -53,6 +54,7 @@ private enum RequestType { DELETE, PUT, POST, + PATCH, HEAD; } @@ -275,6 +277,9 @@ HttpUriRequest buildRequest() throws HttpClientException { case HEAD: request = new HttpHead(uri); break; + case PATCH: + request = new HttpPatch(uri); + break; case GET: default: request = new HttpGet(uri); @@ -377,6 +382,23 @@ public static HttpClientRequest newPostRequest(String url, ContentType[] acceptT return request; } + /** + * Create a new PATCH request + * + * @param url + * @param acceptTypes + * @param contentType + * @return new POST request + */ + public static HttpClientRequest newPatchRequest(String url, ContentType[] acceptTypes, ContentType contentType) { + + HttpClientRequest request = new HttpClientRequest(RequestType.PATCH); + request.setUrl(url); + request.setAcceptTypes(acceptTypes); + request.setContentType(contentType); + + return request; + } /** * Create a new HEAD request From 91969ad40659f4ff3469dd81dca498ba38c8b1e9 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Mon, 5 Aug 2024 16:00:01 +0100 Subject: [PATCH 242/263] Bump version and fix exceptions that dont match what theyre doing Signed-off-by: Jade Carino --- .../dev.galasa.openstack.manager/build.gradle | 2 +- .../manager/internal/OpenstackHttpClient.java | 10 +++++----- release.yaml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle index 3298b6e95..367e5c145 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Openstack Manager' -version = '0.32.0' +version = '0.36.0' dependencies { api project(':galasa-managers-comms-parent:dev.galasa.ipnetwork.manager') diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java index 46a3158d3..d6fbfb1b0 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java @@ -239,7 +239,7 @@ public Server findServerByName(@NotNull String serverName) throws OpenstackManag try { checkToken(); - // *** Retrieve a list of the networks available and select one + // *** Retrieve a list of the servers available and select one HttpGet get = new HttpGet(this.openstackComputeUri + "/servers"); get.addHeader(this.openstackToken.getHeader()); @@ -578,7 +578,7 @@ protected String getFlavourId(@NotNull String flavour) throws OpenstackManagerEx try { checkToken(); - // *** Retrieve a list of the images + // *** Retrieve a list of the flavours HttpGet get = new HttpGet(this.openstackComputeUri + "/flavors"); get.addHeader(this.openstackToken.getHeader()); @@ -588,7 +588,7 @@ protected String getFlavourId(@NotNull String flavour) throws OpenstackManagerEx String entity = EntityUtils.toString(response.getEntity()); if (status.getStatusCode() != HttpStatus.SC_OK) { - throw new OpenstackManagerException("OpenStack list image failed - " + status); + throw new OpenstackManagerException("OpenStack list flavour failed - " + status); } Flavors flavours = gson.fromJson(entity, Flavors.class); @@ -633,7 +633,7 @@ public Floatingip allocateFloatingip(Port port, Network network) throws Openstac String entity = EntityUtils.toString(response.getEntity()); if (status.getStatusCode() != HttpStatus.SC_CREATED) { - throw new OpenstackManagerException("OpenStack list image failed - " + status); + throw new OpenstackManagerException("OpenStack create floating ip failed - " + status); } FloatingipRequestResponse fipResponse = this.gson.fromJson(entity, FloatingipRequestResponse.class); @@ -684,7 +684,7 @@ public Network findExternalNetwork(String externalNetwork) throws OpenstackManag } catch (OpenstackManagerException e) { throw e; } catch (Exception e) { - throw new OpenstackManagerException("Unable to list floating ips ", e); + throw new OpenstackManagerException("Unable to list networks ", e); } } diff --git a/release.yaml b/release.yaml index f59e9a050..83b17a86f 100644 --- a/release.yaml +++ b/release.yaml @@ -160,7 +160,7 @@ managers: codecoverage: true - artifact: dev.galasa.openstack.manager - version: 0.32.0 + version: 0.36.0 obr: true mvp: false bom: true From 2331722559ab2bf7aad12ac210a964fdb729a97a Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Mon, 5 Aug 2024 16:21:07 +0100 Subject: [PATCH 243/263] Add cps prop for floating IP pool Signed-off-by: Jade Carino --- .../manager/internal/OpenstackHttpClient.java | 4 +++ .../properties/OpenStackFloatingIPPool.java | 35 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackFloatingIPPool.java diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java index d6fbfb1b0..5cea2c044 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java @@ -60,6 +60,7 @@ import dev.galasa.openstack.manager.internal.json.User; import dev.galasa.openstack.manager.internal.properties.OpenStackCredentialsId; import dev.galasa.openstack.manager.internal.properties.OpenStackDomainName; +import dev.galasa.openstack.manager.internal.properties.OpenStackFloatingIPPool; import dev.galasa.openstack.manager.internal.properties.OpenStackIdentityUri; import dev.galasa.openstack.manager.internal.properties.OpenStackProjectName; @@ -614,9 +615,12 @@ public Floatingip allocateFloatingip(Port port, Network network) throws Openstac try { checkToken(); + String fipPool = OpenStackFloatingIPPool.get(); + Floatingip fip = new Floatingip(); fip.port_id = port.id; fip.floating_network_id = network.id; + fip.floating_ip_address = fipPool; fip.description = "galasa_run=" + this.framework.getTestRunName(); FloatingipRequestResponse fipRequest = new FloatingipRequestResponse(); diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackFloatingIPPool.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackFloatingIPPool.java new file mode 100644 index 000000000..9f0c227e4 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackFloatingIPPool.java @@ -0,0 +1,35 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ +package dev.galasa.openstack.manager.internal.properties; + +import dev.galasa.framework.spi.ConfigurationPropertyStoreException; +import dev.galasa.framework.spi.cps.CpsProperties; +import dev.galasa.openstack.manager.OpenstackManagerException; + +/** + * OpenStack Floating IP Pool + *

    + * The Openstack Floating IP Pool that the OpenStack Manager will use + * to create a Floating IP address within. + *

    + *

    + * The property is:-
    + *
    + * openstack.server.floatingip.pool=my_network_name + *

    + *

    + * There is no default + *

    + * + */ +public class OpenStackFloatingIPPool extends CpsProperties { + + public static String get() + throws ConfigurationPropertyStoreException, OpenstackManagerException { + return getStringNulled(OpenstackPropertiesSingleton.cps(), "server", "floatingip.pool"); + } + +} From 467f01094f10feaf5676049cb767c94c5f584814 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Mon, 5 Aug 2024 16:26:29 +0100 Subject: [PATCH 244/263] Removing @author tags Signed-off-by: Jade Carino --- .../openstack/manager/internal/properties/BuildTimeout.java | 2 -- .../manager/internal/properties/LinuxArchivesDirectory.java | 2 -- .../manager/internal/properties/LinuxAvailablityZone.java | 2 -- .../openstack/manager/internal/properties/LinuxCredentials.java | 2 -- .../openstack/manager/internal/properties/LinuxFlavor.java | 2 -- .../manager/internal/properties/LinuxImageCapabilities.java | 2 -- .../openstack/manager/internal/properties/LinuxImages.java | 2 -- .../openstack/manager/internal/properties/LinuxKeyPair.java | 2 -- .../galasa/openstack/manager/internal/properties/LinuxName.java | 2 -- .../manager/internal/properties/LinuxSecurityGroups.java | 2 -- .../openstack/manager/internal/properties/MaximumInstances.java | 2 -- .../galasa/openstack/manager/internal/properties/NamePool.java | 2 -- .../manager/internal/properties/OpenStackCredentialsId.java | 2 -- .../manager/internal/properties/OpenStackDomainName.java | 2 -- .../openstack/manager/internal/properties/OpenStackEnabled.java | 2 -- .../manager/internal/properties/OpenStackIdentityUri.java | 2 -- .../manager/internal/properties/OpenStackLinuxPriority.java | 2 -- .../manager/internal/properties/OpenStackProjectName.java | 2 -- .../manager/internal/properties/WindowsAvailablityZone.java | 2 -- .../manager/internal/properties/WindowsCredentials.java | 2 -- .../openstack/manager/internal/properties/WindowsFlavor.java | 2 -- .../manager/internal/properties/WindowsImageCapabilities.java | 2 -- .../openstack/manager/internal/properties/WindowsImages.java | 2 -- .../openstack/manager/internal/properties/WindowsKeyPair.java | 2 -- .../openstack/manager/internal/properties/WindowsName.java | 2 -- .../manager/internal/properties/WindowsSecurityGroups.java | 2 -- 26 files changed, 52 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/BuildTimeout.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/BuildTimeout.java index 2ddc012be..6066c4878 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/BuildTimeout.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/BuildTimeout.java @@ -22,8 +22,6 @@ *

    * default value is 10 minutes *

    - * - * @author Michael Baylis * */ public class BuildTimeout extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxArchivesDirectory.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxArchivesDirectory.java index 00a1dcd21..4c02be8aa 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxArchivesDirectory.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxArchivesDirectory.java @@ -23,8 +23,6 @@ *

    * Default is /opt/archives *

    - * - * @author Michael Baylis * */ public class LinuxArchivesDirectory extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxAvailablityZone.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxAvailablityZone.java index 3c6c3e152..f557c65af 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxAvailablityZone.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxAvailablityZone.java @@ -26,8 +26,6 @@ *

    * The default is nova *

    - * - * @author Michael Baylis * */ public class LinuxAvailablityZone extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxCredentials.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxCredentials.java index d5e528fb6..a7ccd9928 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxCredentials.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxCredentials.java @@ -27,8 +27,6 @@ *

    * The default is OPENSTACKSSH *

    - * - * @author Michael Baylis * */ public class LinuxCredentials extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxFlavor.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxFlavor.java index 2856f29b3..4765e4fdb 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxFlavor.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxFlavor.java @@ -26,8 +26,6 @@ *

    * The default is m1.medium *

    - * - * @author Michael Baylis * */ public class LinuxFlavor extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImageCapabilities.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImageCapabilities.java index ba34338dc..5e4034b52 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImageCapabilities.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImageCapabilities.java @@ -32,8 +32,6 @@ *

    * The default is no capabilities *

    - * - * @author Michael Baylis * */ public class LinuxImageCapabilities extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImages.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImages.java index e1de464dd..75ccc4eac 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImages.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxImages.java @@ -32,8 +32,6 @@ *

    * There are no defaults *

    - * - * @author Michael Baylis * */ public class LinuxImages extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxKeyPair.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxKeyPair.java index 194017c00..5d15e2b06 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxKeyPair.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxKeyPair.java @@ -26,8 +26,6 @@ *

    * There is no default *

    - * - * @author Michael Baylis * */ public class LinuxKeyPair extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxName.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxName.java index 35097ccde..c039dabeb 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxName.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxName.java @@ -26,8 +26,6 @@ *

    * The default is the same as the imagename *

    - * - * @author Michael Baylis * */ public class LinuxName extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxSecurityGroups.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxSecurityGroups.java index 234545f8d..0c25da035 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxSecurityGroups.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/LinuxSecurityGroups.java @@ -29,8 +29,6 @@ *

    * There is no default *

    - * - * @author James Davies * */ public class LinuxSecurityGroups extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/MaximumInstances.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/MaximumInstances.java index c02bf59b2..477e8f684 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/MaximumInstances.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/MaximumInstances.java @@ -22,8 +22,6 @@ *

    * default value is 2 instaces *

    - * - * @author Michael Baylis * */ public class MaximumInstances extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/NamePool.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/NamePool.java index f7d5afc4f..44dee1efc 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/NamePool.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/NamePool.java @@ -30,8 +30,6 @@ *

    * default value is GALASA{0-9}{0-9} *

    - * - * @author Michael Baylis * */ public class NamePool extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackCredentialsId.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackCredentialsId.java index 2548ae994..7ca8c8f3f 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackCredentialsId.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackCredentialsId.java @@ -23,8 +23,6 @@ *

    * default value is openstack *

    - * - * @author Michael Baylis * */ public class OpenStackCredentialsId extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackDomainName.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackDomainName.java index 177150713..090a18085 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackDomainName.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackDomainName.java @@ -26,8 +26,6 @@ *

    * There is no default *

    - * - * @author Michael Baylis * */ public class OpenStackDomainName extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackEnabled.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackEnabled.java index 20bf5451d..80a27ac28 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackEnabled.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackEnabled.java @@ -23,8 +23,6 @@ *

    * default value is true *

    - * - * @author Michael Baylis * */ public class OpenStackEnabled extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackIdentityUri.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackIdentityUri.java index 02e1a4d75..6af2dda1b 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackIdentityUri.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackIdentityUri.java @@ -25,8 +25,6 @@ *

    * There is no default *

    - * - * @author Michael Baylis * */ public class OpenStackIdentityUri extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackLinuxPriority.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackLinuxPriority.java index d9636e65f..53a5a704b 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackLinuxPriority.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackLinuxPriority.java @@ -23,8 +23,6 @@ *

    * default value is 1 *

    - * - * @author Michael Baylis * */ public class OpenStackLinuxPriority extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackProjectName.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackProjectName.java index 7e0613737..bbf036d24 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackProjectName.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackProjectName.java @@ -26,8 +26,6 @@ *

    * There is no default *

    - * - * @author Michael Baylis * */ public class OpenStackProjectName extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsAvailablityZone.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsAvailablityZone.java index 1497b7569..41e6e9a39 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsAvailablityZone.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsAvailablityZone.java @@ -26,8 +26,6 @@ *

    * The default is nova *

    - * - * @author Michael Baylis * */ public class WindowsAvailablityZone extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsCredentials.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsCredentials.java index 2466ca93f..2d4087e38 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsCredentials.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsCredentials.java @@ -27,8 +27,6 @@ *

    * The default is OPENSTACKSSH *

    - * - * @author Michael Baylis * */ public class WindowsCredentials extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsFlavor.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsFlavor.java index bfccbf9c8..694c1f6a9 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsFlavor.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsFlavor.java @@ -26,8 +26,6 @@ *

    * The default is m1.medium *

    - * - * @author Michael Baylis * */ public class WindowsFlavor extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImageCapabilities.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImageCapabilities.java index 9131ee276..ed036510b 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImageCapabilities.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImageCapabilities.java @@ -32,8 +32,6 @@ *

    * The default is no capabilities *

    - * - * @author Michael Baylis * */ public class WindowsImageCapabilities extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImages.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImages.java index 102b19746..e24626470 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImages.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsImages.java @@ -30,8 +30,6 @@ *

    * There are no defaults *

    - * - * @author Michael Baylis * */ public class WindowsImages extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsKeyPair.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsKeyPair.java index c25d8e9dd..a79b38db1 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsKeyPair.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsKeyPair.java @@ -26,8 +26,6 @@ *

    * There is no default *

    - * - * @author Michael Baylis * */ public class WindowsKeyPair extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsName.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsName.java index 98b3e2a49..d8e1a1624 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsName.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsName.java @@ -26,8 +26,6 @@ *

    * The default is the same as the imagename *

    - * - * @author Michael Baylis * */ public class WindowsName extends CpsProperties { diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsSecurityGroups.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsSecurityGroups.java index e21e5b980..838ea878f 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsSecurityGroups.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/WindowsSecurityGroups.java @@ -28,8 +28,6 @@ *

    * There is no default *

    - * - * @author James Davies * */ public class WindowsSecurityGroups extends CpsProperties { From 2e8d8f1da4b6317f01dfdbd77ec555359c6a9fdb Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Tue, 6 Aug 2024 10:41:44 +0100 Subject: [PATCH 245/263] Provide network name in CPS to get network ID Signed-off-by: Jade Carino --- .../manager/internal/OpenstackHttpClient.java | 3 --- .../manager/internal/OpenstackServerImpl.java | 5 ++-- ...gIPPool.java => OpenStackNetworkName.java} | 25 ++++++++----------- 3 files changed, 14 insertions(+), 19 deletions(-) rename galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/{OpenStackFloatingIPPool.java => OpenStackNetworkName.java} (60%) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java index 5cea2c044..1e9e8e062 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java @@ -615,12 +615,9 @@ public Floatingip allocateFloatingip(Port port, Network network) throws Openstac try { checkToken(); - String fipPool = OpenStackFloatingIPPool.get(); - Floatingip fip = new Floatingip(); fip.port_id = port.id; fip.floating_network_id = network.id; - fip.floating_ip_address = fipPool; fip.description = "galasa_run=" + this.framework.getTestRunName(); FloatingipRequestResponse fipRequest = new FloatingipRequestResponse(); diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackServerImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackServerImpl.java index d7c4598da..338f96a04 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackServerImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackServerImpl.java @@ -32,6 +32,7 @@ import dev.galasa.openstack.manager.internal.json.Server; import dev.galasa.openstack.manager.internal.json.ServerRequest; import dev.galasa.openstack.manager.internal.properties.BuildTimeout; +import dev.galasa.openstack.manager.internal.properties.OpenStackNetworkName; public abstract class OpenstackServerImpl { @@ -315,8 +316,8 @@ protected void createServer(ServerRequest serverRequest) throws OpenstackManager } // *** Locate the external network - Network network = this.openstackHttpClient.findExternalNetwork(null); // TODO provide means to specify - // network + String networkName = OpenStackNetworkName.get(); + Network network = this.openstackHttpClient.findExternalNetwork(networkName); if (network == null) { throw new OpenstackManagerException("Unable to select an external network to allocate a floatingip on"); diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackFloatingIPPool.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackNetworkName.java similarity index 60% rename from galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackFloatingIPPool.java rename to galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackNetworkName.java index 9f0c227e4..f5da67b6d 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackFloatingIPPool.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/properties/OpenStackNetworkName.java @@ -10,26 +10,23 @@ import dev.galasa.openstack.manager.OpenstackManagerException; /** - * OpenStack Floating IP Pool - *

    - * The Openstack Floating IP Pool that the OpenStack Manager will use - * to create a Floating IP address within. - *

    - *

    - * The property is:-
    - *
    - * openstack.server.floatingip.pool=my_network_name - *

    - *

    + * OpenStack Network name + * + * The Openstack Network name that the OpenStack Manager will use + * to create a Floating IP address within. The Network name is used + * to get the Network ID. + * + * The property is: + * openstack.network.name=my_network_name + * * There is no default - *

    * */ -public class OpenStackFloatingIPPool extends CpsProperties { +public class OpenStackNetworkName extends CpsProperties { public static String get() throws ConfigurationPropertyStoreException, OpenstackManagerException { - return getStringNulled(OpenstackPropertiesSingleton.cps(), "server", "floatingip.pool"); + return getStringNulled(OpenstackPropertiesSingleton.cps(), "network", "name"); } } From 67fa2a2e51db28a9d7473f5955d80db3440ac6c2 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Tue, 6 Aug 2024 10:49:05 +0100 Subject: [PATCH 246/263] Remove unused import Signed-off-by: Jade Carino --- .../galasa/openstack/manager/internal/OpenstackHttpClient.java | 1 - 1 file changed, 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java index 1e9e8e062..d6fbfb1b0 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java @@ -60,7 +60,6 @@ import dev.galasa.openstack.manager.internal.json.User; import dev.galasa.openstack.manager.internal.properties.OpenStackCredentialsId; import dev.galasa.openstack.manager.internal.properties.OpenStackDomainName; -import dev.galasa.openstack.manager.internal.properties.OpenStackFloatingIPPool; import dev.galasa.openstack.manager.internal.properties.OpenStackIdentityUri; import dev.galasa.openstack.manager.internal.properties.OpenStackProjectName; From 957720281b049189c6319110a80822ce1cbba2f6 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Tue, 6 Aug 2024 13:07:04 +0100 Subject: [PATCH 247/263] Add debug messages throughout openstack manager Signed-off-by: Jade Carino --- .../manager/internal/OpenstackHttpClient.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java index d6fbfb1b0..9e6677bb4 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java @@ -496,7 +496,9 @@ public Port retrievePort(@NotNull String deviceId) throws OpenstackManagerExcept PortsResponse portsResponse = this.gson.fromJson(entity, PortsResponse.class); if (portsResponse != null && portsResponse.ports != null) { for (Port port : portsResponse.ports) { + logger.debug("Available port - ID: " + port.id + " Device ID: " + port.device_id); if (deviceId.equals(port.device_id)) { + logger.debug("Port selected that matches our device ID: " + port.id); return port; } } @@ -614,6 +616,8 @@ public Floatingip allocateFloatingip(Port port, Network network) throws Openstac try { checkToken(); + logger.debug("Attempting to allocate a floating ID with port ID: " + port.id + " and network ID: " + network.id); + Floatingip fip = new Floatingip(); fip.port_id = port.id; fip.floating_network_id = network.id; @@ -632,6 +636,8 @@ public Floatingip allocateFloatingip(Port port, Network network) throws Openstac StatusLine status = response.getStatusLine(); String entity = EntityUtils.toString(response.getEntity()); + logger.debug("Response body: " + entity); + if (status.getStatusCode() != HttpStatus.SC_CREATED) { throw new OpenstackManagerException("OpenStack create floating ip failed - " + status); } @@ -650,6 +656,9 @@ public Floatingip allocateFloatingip(Port port, Network network) throws Openstac } public Network findExternalNetwork(String externalNetwork) throws OpenstackManagerException { + + logger.debug("External network name from the CPS: " + externalNetwork); + try { checkToken(); @@ -669,10 +678,13 @@ public Network findExternalNetwork(String externalNetwork) throws OpenstackManag Networks networks = this.gson.fromJson(entity, Networks.class); if (networks != null && networks.networks != null) { for (Network network : networks.networks) { + logger.debug("Available network - ID: " + network.id + " Name: " + network.name + " External? " + network.route_external); if (externalNetwork != null && externalNetwork.equals(network.name)) { + logger.debug("Selected network: " + network.id); return network; } else { if (network.route_external) { + logger.debug("External network name was not provided in CPS or no match was found. Selected network: " + network.id); return network; } } From c43d27950a6c11f09863567ad2699b6f82440676 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Tue, 6 Aug 2024 14:22:32 +0100 Subject: [PATCH 248/263] Dont pick just the first external network that is found Signed-off-by: Jade Carino --- .../openstack/manager/internal/OpenstackHttpClient.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java index 9e6677bb4..e9cf7d1be 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java @@ -682,11 +682,6 @@ public Network findExternalNetwork(String externalNetwork) throws OpenstackManag if (externalNetwork != null && externalNetwork.equals(network.name)) { logger.debug("Selected network: " + network.id); return network; - } else { - if (network.route_external) { - logger.debug("External network name was not provided in CPS or no match was found. Selected network: " + network.id); - return network; - } } } } From 0e365a8b27607f60697333fa8ddbe757f56cac6e Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Tue, 6 Aug 2024 14:35:29 +0100 Subject: [PATCH 249/263] Throw exception if external network name not specified in the CPS Signed-off-by: Jade Carino --- .../openstack/manager/internal/OpenstackServerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackServerImpl.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackServerImpl.java index 338f96a04..9434937c2 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackServerImpl.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackServerImpl.java @@ -317,8 +317,10 @@ protected void createServer(ServerRequest serverRequest) throws OpenstackManager // *** Locate the external network String networkName = OpenStackNetworkName.get(); + if (networkName == null) { + throw new OpenstackManagerException("The external network name to allocate a floatingip on was not provided in the CPS"); + } Network network = this.openstackHttpClient.findExternalNetwork(networkName); - if (network == null) { throw new OpenstackManagerException("Unable to select an external network to allocate a floatingip on"); } From 7a2abe2617c89b5685e68c1513e5a36bd2e3c453 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Tue, 6 Aug 2024 15:04:15 +0100 Subject: [PATCH 250/263] Removed debug messages Signed-off-by: Jade Carino --- .../manager/internal/OpenstackHttpClient.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java index e9cf7d1be..333a1e9df 100644 --- a/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java +++ b/galasa-managers-parent/galasa-managers-cloud-parent/dev.galasa.openstack.manager/src/main/java/dev/galasa/openstack/manager/internal/OpenstackHttpClient.java @@ -496,9 +496,7 @@ public Port retrievePort(@NotNull String deviceId) throws OpenstackManagerExcept PortsResponse portsResponse = this.gson.fromJson(entity, PortsResponse.class); if (portsResponse != null && portsResponse.ports != null) { for (Port port : portsResponse.ports) { - logger.debug("Available port - ID: " + port.id + " Device ID: " + port.device_id); if (deviceId.equals(port.device_id)) { - logger.debug("Port selected that matches our device ID: " + port.id); return port; } } @@ -616,8 +614,6 @@ public Floatingip allocateFloatingip(Port port, Network network) throws Openstac try { checkToken(); - logger.debug("Attempting to allocate a floating ID with port ID: " + port.id + " and network ID: " + network.id); - Floatingip fip = new Floatingip(); fip.port_id = port.id; fip.floating_network_id = network.id; @@ -636,8 +632,6 @@ public Floatingip allocateFloatingip(Port port, Network network) throws Openstac StatusLine status = response.getStatusLine(); String entity = EntityUtils.toString(response.getEntity()); - logger.debug("Response body: " + entity); - if (status.getStatusCode() != HttpStatus.SC_CREATED) { throw new OpenstackManagerException("OpenStack create floating ip failed - " + status); } @@ -657,8 +651,6 @@ public Floatingip allocateFloatingip(Port port, Network network) throws Openstac public Network findExternalNetwork(String externalNetwork) throws OpenstackManagerException { - logger.debug("External network name from the CPS: " + externalNetwork); - try { checkToken(); @@ -678,9 +670,7 @@ public Network findExternalNetwork(String externalNetwork) throws OpenstackManag Networks networks = this.gson.fromJson(entity, Networks.class); if (networks != null && networks.networks != null) { for (Network network : networks.networks) { - logger.debug("Available network - ID: " + network.id + " Name: " + network.name + " External? " + network.route_external); if (externalNetwork != null && externalNetwork.equals(network.name)) { - logger.debug("Selected network: " + network.id); return network; } } From 72c74f0f7e682523026a08debf2b5540cd8e25c9 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Tue, 6 Aug 2024 15:29:34 +0100 Subject: [PATCH 251/263] Add galasaecosystem.runs.timeout CPS prop to configure the timeout of nested ecosystem manager test runs (#973) Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../build.gradle | 2 +- .../internal/LocalEcosystemImpl.java | 6 +++- .../internal/properties/RunsTimeout.java | 29 +++++++++++++++++++ release.yaml | 2 +- 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RunsTimeout.java diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle index f42d259c9..456fcc664 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa Ecosystem Manager' -version = '0.34.0' +version = '0.36.0' dependencies { implementation 'commons-io:commons-io:2.16.1' diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalEcosystemImpl.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalEcosystemImpl.java index 41b7f550c..1e182d0bd 100644 --- a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalEcosystemImpl.java +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/LocalEcosystemImpl.java @@ -56,6 +56,7 @@ import dev.galasa.galasaecosystem.internal.properties.IsolatedFullZip; import dev.galasa.galasaecosystem.internal.properties.IsolatedMvpZip; import dev.galasa.galasaecosystem.internal.properties.MavenUseDefaultLocalRepository; +import dev.galasa.galasaecosystem.internal.properties.RunsTimeout; import dev.galasa.galasaecosystem.internal.properties.RuntimeRepo; import dev.galasa.galasaecosystem.internal.properties.RuntimeVersion; import dev.galasa.galasaecosystem.internal.properties.SimBankTestsVersion; @@ -102,6 +103,8 @@ public abstract class LocalEcosystemImpl extends AbstractEcosystemImpl implement private IFramework framework; + private int runsTimeout; + public LocalEcosystemImpl(@NotNull GalasaEcosystemManagerImpl manager, @NotNull String tag, @NotNull IJavaInstallation javaInstallation, @@ -171,6 +174,7 @@ protected void build(Path runHomeDirectory, Path homeDirectory) throws GalasaEco this.galasaBootVersion = GalasaBootVersion.get(); this.simplatformVersion = SimplatformVersion.get(); + this.runsTimeout = RunsTimeout.get(); switch(this.isolationInstallation) { case Full: @@ -382,7 +386,7 @@ private void downloadArtifactsViaMaven(Path homeDirectory) throws GalasaEcosyste @Override public JsonObject waitForRun(String runName) throws GalasaEcosystemManagerException { - return waitForRun(runName, 3); + return waitForRun(runName, runsTimeout); } @Override diff --git a/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RunsTimeout.java b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RunsTimeout.java new file mode 100644 index 000000000..2065b87a1 --- /dev/null +++ b/galasa-managers-parent/galasa-managers-other-parent/dev.galasa.galasaecosystem.manager/src/main/java/dev/galasa/galasaecosystem/internal/properties/RunsTimeout.java @@ -0,0 +1,29 @@ +/* + * Copyright contributors to the Galasa project + * + * SPDX-License-Identifier: EPL-2.0 + */ +package dev.galasa.galasaecosystem.internal.properties; + +import dev.galasa.framework.spi.cps.CpsProperties; +import dev.galasa.galasaecosystem.GalasaEcosystemManagerException; + +/** + * Timeout for Galasa Ecosystem manager nested test runs + * + * In minutes, how long the Galasa Ecosystem manager should wait for nested runs to complete before + * timing out. The default timeout value is 3 minutes. + * + * The property is:- + * galasaecosystem.runs.timeout + * + */ +public class RunsTimeout extends CpsProperties { + + private static final int DEFAULT_TIMEOUT_MINUTES = 3; + + public static int get() throws GalasaEcosystemManagerException { + return getIntWithDefault(GalasaEcosystemPropertiesSingleton.cps(), DEFAULT_TIMEOUT_MINUTES, "runs", "timeout"); + } + +} diff --git a/release.yaml b/release.yaml index 83b17a86f..5f263eb2b 100644 --- a/release.yaml +++ b/release.yaml @@ -367,7 +367,7 @@ managers: codecoverage: false - artifact: dev.galasa.galasaecosystem.manager - version: 0.34.0 + version: 0.36.0 obr: true mvp: false bom: true From 40b57e2fac5a4c9fa827d36b988fe785b2208b8e Mon Sep 17 00:00:00 2001 From: haripra86 <89834381+haripra86@users.noreply.github.com> Date: Wed, 7 Aug 2024 11:06:26 +0530 Subject: [PATCH 252/263] Update build.gradle Signed-off-by: haripra86 <89834381+haripra86@users.noreply.github.com> --- .../dev.galasa.http.manager/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle index e667531c2..87667a94c 100644 --- a/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-comms-parent/dev.galasa.http.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'HTTP Manager' -version = '0.34.0' +version = '0.36.0' dependencies { api 'org.apache.httpcomponents:httpclient-osgi:4.5.13' From 741c6a37dafed02aeda41235d70587df7c737bb1 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Wed, 7 Aug 2024 13:55:29 +0100 Subject: [PATCH 253/263] Bump HTTP manager to 0.36.0 (#974) * Bump HTTP manager to 0.36.0 Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> * Empty commit to kick off build Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --------- Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.yaml b/release.yaml index 5f263eb2b..0f2a31325 100644 --- a/release.yaml +++ b/release.yaml @@ -178,7 +178,7 @@ managers: codecoverage: false - artifact: dev.galasa.http.manager - version: 0.34.0 + version: 0.36.0 obr: true mvp: true bom: true From d2efa00322740ab18a441b5afe5231d5915b1aa7 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Tue, 13 Aug 2024 15:05:13 +0100 Subject: [PATCH 254/263] Bump managers to 0.37.0 (#975) Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- galasa-managers-parent/build.gradle | 4 ++-- .../buildSrc/src/main/groovy/galasa.manager.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index 03a1fe10f..2b13c9bd2 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -9,7 +9,7 @@ plugins { // It is used as the version number of the managers bundle, which contains a yaml // file which is in a release.yaml, but published to maven, so that the OBR build // can pick it up later. -version = "0.36.0" +version = "0.37.0" // A configuration to publish the merge exec into configurations { @@ -224,7 +224,7 @@ publishing { name = "Manifest for managers bundle versions" artifactId = "dev.galasa.managers.manifest" groupId = 'dev.galasa' - version = "0.36.0" + version = "0.37.0" description = "Conveys bundle version information to OBR builds." licenses { license { diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle index 088646325..2ff26348d 100644 --- a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle +++ b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle @@ -6,7 +6,7 @@ plugins { dependencies { api 'dev.galasa:dev.galasa:0.34.0' - implementation 'dev.galasa:dev.galasa.framework:0.36.0' + implementation 'dev.galasa:dev.galasa.framework:0.37.0' implementation 'commons-logging:commons-logging:1.2' implementation 'org.osgi:org.osgi.core:6.0.0' implementation 'org.osgi:org.osgi.service.component.annotations:1.3.0' From acd991d9fc80498575a8a23f05e77e7b307e7dc0 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Wed, 14 Aug 2024 15:15:33 +0100 Subject: [PATCH 255/263] Parameterise main build workflow to support any branch/tag Signed-off-by: Jade Carino --- .github/workflows/build.yaml | 56 ++++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2751757bb..434bb760f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,15 +2,41 @@ name: Main build on: workflow_dispatch: + inputs: + jacocoEnabled: + description: 'Enable Jacoco code coverage (set to "false" for release builds)' + required: true + default: 'true' + type: choice + options: + - 'true' + - 'false' + isMainOrRelease: + description: 'This build is for the main branch or a release (set to "false" for development branch builds)' + required: true + default: 'true' + type: choice + options: + - 'true' + - 'false' push: branches: [main] env: REGISTRY: ghcr.io NAMESPACE: galasa-dev - IMAGE_TAG: main + BRANCH: ${{ github.ref_name }} + ARGO_APP_BRANCH: gh # TODO: remove this parameter and just use env.BRANCH once we update development.galasa.dev/main with these workflows. jobs: + log-github-ref: + name: Log the GitHub ref this workflow is running on (Branch or tag that received dispatch) + runs-on: ubuntu-latest + steps: + - name: Log GitHub ref of workflow + run: | + echo "This workflow is running on GitHub ref ${{ env.BRANCH }}" + build-managers: name: Build Managers source code and Docker image for development Maven registry runs-on: ubuntu-latest @@ -35,6 +61,7 @@ jobs: gradle-version: 6.9.2 - name: Build Managers source code + if: github.event_name == 'push' env: GITHUB_ACTOR: ${{ github.actor }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -44,12 +71,29 @@ jobs: run: | gradle -b galasa-managers-parent/build.gradle check publish \ -Dorg.gradle.jvmargs=-Xmx4096M \ - -PsourceMaven=https://development.galasa.dev/gh/maven-repo/extensions \ + -PsourceMaven=https://development.galasa.dev/${{ env.ARGO_APP_BRANCH }}/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ -PtargetMaven=${{github.workspace}}/repo \ -PjacocoEnabled=true \ -PisMainOrRelease=true + - name: Build Managers source code + if: github.event_name == 'workflow_dispatch' # Use the input values provided by the workflow dispatch. + env: + GITHUB_ACTOR: ${{ github.actor }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.GPG_KEYID }} + ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_KEY }} + ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }} + run: | + gradle -b galasa-managers-parent/build.gradle check publish \ + -Dorg.gradle.jvmargs=-Xmx4096M \ + -PsourceMaven=https://development.galasa.dev/${{ env.ARGO_APP_BRANCH }}/maven-repo/extensions \ + -PcentralMaven=https://repo.maven.apache.org/maven2/ \ + -PtargetMaven=${{github.workspace}}/repo \ + -PjacocoEnabled=${{ inputs.jacocoEnabled }} \ + -PisMainOrRelease=${{ inputs.isMainOrRelease }} + - name: Login to Github Container Registry uses: docker/login-action@v3 with: @@ -74,19 +118,19 @@ jobs: labels: ${{ steps.metadata.outputs.labels }} build-args: | dockerRepository=ghcr.io - tag=${{ env.IMAGE_TAG }} + tag=${{ env.BRANCH }} - name: Recycle application in ArgoCD env: ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_TOKEN }} run: | - docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app actions run gh-maven-repos restart --kind Deployment --resource-name managers-gh --server argocd.galasa.dev + docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app actions run ${{ env.ARGO_APP_BRANCH }}-maven-repos restart --kind Deployment --resource-name managers-${{ env.ARGO_APP_BRANCH }} --server argocd.galasa.dev - name: Wait for app health in ArgoCD env: ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_TOKEN }} run: | - docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app wait gh-maven-repos --resource apps:Deployment:managers-gh --health --server argocd.galasa.dev + docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app wait ${{ env.ARGO_APP_BRANCH }}-maven-repos --resource apps:Deployment:managers-${{ env.ARGO_APP_BRANCH }} --health --server argocd.galasa.dev trigger-obr-workflow: name: Trigger OBR workflow @@ -98,4 +142,4 @@ jobs: env: GH_TOKEN: ${{ secrets.GALASA_TEAM_GITHUB_TOKEN }} run: | - gh workflow run build.yaml --repo https://github.com/galasa-dev/obr \ No newline at end of file + gh workflow run build.yaml --repo https://github.com/galasa-dev/obr --ref ${{ env.BRANCH }} \ No newline at end of file From 4739dd159327d14cbc8797a8bac34cd712b591f2 Mon Sep 17 00:00:00 2001 From: Alex Brown Date: Thu, 15 Aug 2024 14:34:16 +0100 Subject: [PATCH 256/263] Ensure JVM server logs are saved. Signed-off-by: Alex Brown --- .../build.gradle | 2 +- .../resource/internal/JvmserverImpl.java | 22 ++++++------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle index 55fb8043b..d10733d27 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/build.gradle @@ -4,7 +4,7 @@ plugins { description = 'Galasa CICS/TS Resource Manager' -version = '0.34.0' +version = '0.37.0' dependencies { api project (':galasa-managers-cicsts-parent:dev.galasa.cicsts.manager') diff --git a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmserverImpl.java b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmserverImpl.java index f384ec614..9ec0e9f7e 100644 --- a/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmserverImpl.java +++ b/galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.resource.manager/src/main/java/dev/galasa/cicsts/resource/internal/JvmserverImpl.java @@ -918,21 +918,13 @@ public void saveToResultsArchive() throws CicsJvmserverResourceException { @Override public void saveToResultsArchive(String rasPath) throws CicsJvmserverResourceException { - if (this.jvmprofile != null) { - this.jvmprofile.saveToResultsArchive(rasPath); - } - if (this.jvmLogLog != null) { - this.jvmLogLog.saveToResultsArchive(rasPath); - } - if (this.stdOutLog != null) { - this.stdOutLog.saveToResultsArchive(rasPath); - } - if (this.stdErrLog != null) { - this.stdErrLog.saveToResultsArchive(rasPath); - } - if (this.jvmTraceLog != null) { - this.jvmTraceLog.saveToResultsArchive(rasPath); - } + getJvmprofile().saveToResultsArchive(rasPath); + + getJvmLog().saveToResultsArchive(rasPath); + getStdOut().saveToResultsArchive(rasPath); + getStdErr().saveToResultsArchive(rasPath); + getJvmTrace().saveToResultsArchive(rasPath); + saveDiagnosticsToResultsArchive(rasPath); saveJavaLogsToResultsArchive(rasPath); if (isLiberty()) { From 86ff4d5f87c88031450e1ac90cabefcc227def3f Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Fri, 16 Aug 2024 13:31:20 +0100 Subject: [PATCH 257/263] Bump cicsts.resource.manager to 0.37.0 (#978) Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.yaml b/release.yaml index 0f2a31325..4d282f72c 100644 --- a/release.yaml +++ b/release.yaml @@ -97,7 +97,7 @@ managers: codecoverage: false - artifact: dev.galasa.cicsts.resource.manager - version: 0.34.0 + version: 0.37.0 obr: true mvp: true bom: true From 90a580a0816e22026b203b6b7e890e0540be2d9f Mon Sep 17 00:00:00 2001 From: Savvas Kyriacou Date: Tue, 20 Aug 2024 13:35:24 +0100 Subject: [PATCH 258/263] updated sdv manager tests and workflows to match jvm changes Signed-off-by: Savvas Kyriacou --- .github/workflows/build.yaml | 4 +- .github/workflows/pr-build.yaml | 4 +- .../src/main/groovy/galasa.manager.gradle | 2 +- .../dev.galasa.sdv.manager/build.gradle | 2 +- .../config/spotbugs/excludes.xml | 4 + .../sdv/internal/TestSdvHttpRecorderImpl.java | 992 ++++++++++-------- .../sdv/internal/TestSdvManagerImpl.java | 109 +- .../TestSdvManagersResourceMonitor.java | 124 ++- .../galasa/sdv/internal/TestSdvUserPool.java | 17 +- .../internal/TestSdvUserResourceMonitor.java | 109 +- 10 files changed, 735 insertions(+), 632 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 434bb760f..b32bffb5b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -48,7 +48,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@v4 with: - java-version: '11' + java-version: '17' distribution: 'semeru' - name: Print githash @@ -58,7 +58,7 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 with: - gradle-version: 6.9.2 + gradle-version: 8.9 - name: Build Managers source code if: github.event_name == 'push' diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 7fe26321d..d5897bcb1 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -16,7 +16,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@v4 with: - java-version: '11' + java-version: '17' distribution: 'semeru' - name: Print githash @@ -26,7 +26,7 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 with: - gradle-version: 6.9.2 + gradle-version: 8.9 - name: Build Managers source code run: | diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle index 2ff26348d..9dfcd0d29 100644 --- a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle +++ b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle @@ -21,7 +21,7 @@ dependencies { } jacoco { - toolVersion = "0.8.6" + toolVersion = "0.8.7" } test { diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/build.gradle b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/build.gradle index 9067f47c9..1b42d130a 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/build.gradle +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/build.gradle @@ -2,7 +2,7 @@ plugins { id 'galasa.manager' id 'checkstyle' id 'pmd' - id("com.github.spotbugs") version "4.7.0" + id("com.github.spotbugs") version "6.0.20" } description = 'Galasa SDV Manager' diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/config/spotbugs/excludes.xml b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/config/spotbugs/excludes.xml index 423a426f9..57a96c9ec 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/config/spotbugs/excludes.xml +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/config/spotbugs/excludes.xml @@ -5,6 +5,10 @@ + + + + diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvHttpRecorderImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvHttpRecorderImpl.java index 3afa33691..c6bdf72b5 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvHttpRecorderImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvHttpRecorderImpl.java @@ -47,7 +47,6 @@ import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Modifier; import java.net.URI; import java.net.URISyntaxException; import java.nio.file.Files; @@ -67,6 +66,7 @@ import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; import org.mockito.Mockito; +import sun.misc.Unsafe; class TestSdvHttpRecorderImpl { @@ -109,7 +109,7 @@ class TestSdvHttpRecorderImpl { private String jclDeleteLogstreamPathString = "/jcl/deletelogstreams.jcl"; private String jclGetYamlPathString = "/jcl/getYaml.jcl"; private String structureString = "A_STRUCTURE"; - private String modifiersString = "modifiers"; + private String theUnsafeString = "theUnsafe"; private String managerPrefixString = "manager."; private String runningManagersString = "runningManagers."; private String falseString = "false"; @@ -314,18 +314,20 @@ void testPrepareEnvironmentsAsFirstManagerOnRegionWithSdcActivation() dssService, null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionbTag)).thenReturn(true); @@ -460,18 +462,20 @@ void testPrepareEnvironmentsAsSecondManagerOnRegion() dssService, null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); @@ -577,18 +581,20 @@ void testPrepareEnvironmentsLogstreamJobFailsDueToExisting() dssService, null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); @@ -700,18 +706,20 @@ void testPrepareEnvironmentsLogstreamJobFailsDueToError() dssService, null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); @@ -812,18 +820,20 @@ void testPrepareEnvironmentsCedaCreateException() dssService, null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); @@ -922,18 +932,20 @@ void testPrepareEnvironmentsCedaInstallSdvGrpException() dssService, null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); @@ -1034,18 +1046,20 @@ void testPrepareEnvironmentsCedaInstallDfhxsdException() dssService, null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); @@ -1132,18 +1146,20 @@ void testPrepareEnvironmentsBatchJobThrowsException() throws CredentialsExceptio dssService, null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); @@ -1201,18 +1217,20 @@ void testPrepareEnvironmentsDssThrowsException() .newInstance(framework, recordingRegions, null, null, null, dssService, null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); @@ -1311,18 +1329,20 @@ void testPrepareEnvironmentsCemtThrowsException() throws DynamicStatusStoreExcep dssService, null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); @@ -1435,18 +1455,20 @@ void testPrepareEnvironmentsPortNotFound() throws SdvManagerException, IllegalAr dssService, null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); @@ -1551,18 +1573,20 @@ void testPrepareEnvironmentsHttpResourcesDoNotAlreadyExist() dssService, null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); @@ -1683,18 +1707,20 @@ void testCleanUpEnvironmentsAsLastManagerOnRegionWithSdcActivation() dssService, null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionbTag)).thenReturn(true); @@ -1790,18 +1816,20 @@ void testCleanUpEnvironmentsNotAsLastManagerOnRegionWithSdcActivation() .newInstance(framework, recordingRegions, null, null, null, dssService, null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionbTag)).thenReturn(true); @@ -1857,18 +1885,20 @@ void testCleanUpEnvironmentsDssException() throws CredentialsException, SdvManag .newInstance(framework, recordingRegions, null, null, null, dssService, null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); @@ -1956,18 +1986,20 @@ void testCleanUpEnvironmentsCedaDeleteGroupThrowsException() dssService, null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); @@ -2063,18 +2095,20 @@ void testCleanUpEnvironmentsDeleteSrrLogstreamJobError() dssService, null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); @@ -2158,18 +2192,20 @@ void testCleanUpEnvironmentsArtifactManagerException() throws CicstsManagerExcep null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); @@ -2261,18 +2297,20 @@ void testCleanUpEnvironmentsCemtSetResourceException() dssService, null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionaTag)).thenReturn(true); sdvSdcActivation.when(() -> SdvSdcActivation.get(regionbTag)).thenReturn(true); @@ -2407,18 +2445,20 @@ void testStartRecordingNoExistingSdcForMultipleRegionsAndUsers() .newInstance(null, recordingRegions, null, null, null, null, httpManager); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); // Make call to funtion under test sdvHttpRecorder.startRecording(); @@ -2582,18 +2622,20 @@ void testStartRecordingExistingSdcForMultipleRegionsAndUsers() .newInstance(null, recordingRegions, null, null, null, null, httpManager); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); // Make call to funtion under test sdvHttpRecorder.startRecording(); @@ -2684,18 +2726,20 @@ void testStartRecordingHttpGetSdcServerError() throws CredentialsException, SdvM .newInstance(null, recordingRegions, null, null, null, null, httpManager); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); // Make call to funtion under test SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { @@ -2757,18 +2801,20 @@ void testStartRecordingGetHttpClientException() .newInstance(null, recordingRegions, null, null, null, null, httpManager); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); // Make call to funtion under test SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { @@ -2845,18 +2891,20 @@ void testStartRecordingHttpDeleteSdcServerError() .newInstance(null, recordingRegions, null, null, null, null, httpManager); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); // Make call to funtion under test SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { @@ -2929,18 +2977,20 @@ void testStartRecordingDeleteHttpClientException() .newInstance(null, recordingRegions, null, null, null, null, httpManager); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); // Make call to funtion under test SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { @@ -3016,18 +3066,20 @@ void testStartRecordingHttpPostSdcServerError() .newInstance(null, recordingRegions, null, null, null, null, httpManager); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); // Make call to funtion under test SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { @@ -3100,18 +3152,20 @@ void testStartRecordingPostHttpClientException() .newInstance(null, recordingRegions, null, null, null, null, httpManager); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); // Make call to funtion under test SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { @@ -3186,18 +3240,20 @@ void testStartRecordingNoSrrIdInResponse() .newInstance(null, recordingRegions, null, null, null, null, httpManager); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); // Make call to funtion under test SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { @@ -3255,18 +3311,20 @@ void testStartRecordingBadUri() throws IllegalArgumentException, IllegalAccessEx .newInstance(null, recordingRegions, null, null, null, null, httpManager); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); // Make call to funtion under test SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { @@ -3379,18 +3437,20 @@ void testEndRecordingForMultipleRegionsAndUsers() .newInstance(null, recordingRegions, null, null, null, null, httpManager); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); // Make call to funtion under test sdvHttpRecorder.endRecording(); @@ -3464,18 +3524,20 @@ void testEndRecordingDeleteServerError() .newInstance(null, recordingRegions, null, null, null, null, httpManager); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); // Make call to funtion under test SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { @@ -3554,18 +3616,20 @@ void testEndRecordingDeleteHttpClientException() .newInstance(null, recordingRegions, null, null, null, null, httpManager); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); // Make call to funtion under test SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { @@ -3632,18 +3696,20 @@ void testEndRecordingBadUri() throws CredentialsException, SdvManagerException, .newInstance(null, recordingRegions, null, null, null, null, httpManager); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); // Make call to funtion under test SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { @@ -3782,18 +3848,20 @@ void testExportRecordingsForMulitpleRegions() Mockito.eq(regionByaml.getBytes(utfString)), Mockito.any())).thenReturn(null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); sdvHttpRecorder.exportRecordings("bundleB", "TestClassB"); @@ -3854,18 +3922,20 @@ void testExportRecordingsWithBadSrrIdForRecording() .newInstance(null, recordingRegions, artifactManager, null, null, null, null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); files.when(() -> Files.write(Mockito.any(Path.class), Mockito.any(byte[].class), Mockito.any(OpenOption.class))).thenReturn(null); @@ -3940,18 +4010,20 @@ void testExportRecordingsYamlJobErrorCode() Mockito.any(OpenOption.class))).thenReturn(null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); // Make call to funtion under test SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { @@ -4018,18 +4090,20 @@ void testExportRecordingsArtifactFindException() throws CredentialsException, Mockito.any(OpenOption.class))).thenReturn(null); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); // Make call to funtion under test SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { @@ -4128,18 +4202,20 @@ void testExportRecordingsUnableToSaveYamlFile() throws CredentialsException, .thenThrow(new IOException("path not there")); // Replace LOG - Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); - loggerField.setAccessible(true); - Field loggerSuperField = - sdvHttpRecorderImplClass.getSuperclass().getDeclaredField(logVariableString); - loggerSuperField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - modifiersField.setInt(loggerSuperField, loggerSuperField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvHttpRecorder, mockLog); - loggerSuperField.set(sdvHttpRecorder, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvHttpRecorderImplClass.getDeclaredField(logVariableString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); + + final Field superLoggerField = sdvHttpRecorderImplClass.getSuperclass() + .getDeclaredField(logVariableString); + final Object staticSuperLoggerFieldBase = unsafe.staticFieldBase(superLoggerField); + final long staticSuperLoggerFieldOffset = unsafe.staticFieldOffset(superLoggerField); + unsafe.putObject(staticSuperLoggerFieldBase, staticSuperLoggerFieldOffset, mockLog); // Make call to funtion under test SdvManagerException exception = Assertions.assertThrows(SdvManagerException.class, () -> { diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvManagerImpl.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvManagerImpl.java index 2e2f11bf8..7b5d3c103 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvManagerImpl.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvManagerImpl.java @@ -38,7 +38,6 @@ import dev.galasa.zosbatch.IZosBatchJob; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -51,6 +50,7 @@ import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; import org.mockito.Mockito; +import sun.misc.Unsafe; class TestSdvManagerImpl { @@ -93,7 +93,7 @@ class TestSdvManagerImpl { private String frameworkString = "framework"; private String sdvRecorderVarName = "sdvRecorder"; private String logString = "LOG"; - private String modifiersString = "modifiers"; + private String theUnsafeString = "theUnsafe"; private String regionaApplid = "APPL1"; private String runName = "RUN123"; private String regionbApplid = "APPL2"; @@ -764,13 +764,14 @@ void testProvisionGenerateOldCicsVersionForRegionA() sdvUsersToRecordList.set(sdvManager, listOfUsersForAllRegions); // Replace LOG - Field loggerField = sdvManagerImplClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvManager, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvManagerImplClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvManager.provisionGenerate(); @@ -912,13 +913,14 @@ void testProvisionGenerateNoSecMsg() throws ClassNotFoundException, Instantiatio sdvUsersToRecordList.set(sdvManager, listOfUsersForAllRegions); // Replace LOG - Field loggerField = sdvManagerImplClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvManager, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvManagerImplClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvManager.provisionGenerate(); @@ -1057,13 +1059,14 @@ void testProvisionGenerateNoUsersForRegion() sdvUsersToRecordList.set(sdvManager, listOfUsersForAllRegions); // Replace LOG - Field loggerField = sdvManagerImplClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvManager, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvManagerImplClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvManager.provisionGenerate(); @@ -1422,13 +1425,14 @@ void testProvisionStopEndRecordingException() throws InstantiationException, frameworkField.set(sdvManager, framework); // Replace LOG - Field loggerField = sdvManagerImplClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvManager, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvManagerImplClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvManager.provisionStop(); @@ -1539,13 +1543,14 @@ void testProvisionStopReleaseUsersException() throws InstantiationException, frameworkField.set(sdvManager, framework); // Replace LOG - Field loggerField = sdvManagerImplClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvManager, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvManagerImplClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvManager.provisionStop(); @@ -1656,13 +1661,14 @@ void testProvisionStopcleanUpEnvironmentsException() throws InstantiationExcepti frameworkField.set(sdvManager, framework); // Replace LOG - Field loggerField = sdvManagerImplClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvManager, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvManagerImplClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvManager.provisionStop(); @@ -1896,13 +1902,14 @@ void testReleaseUsersException() throws CredentialsException, NoSuchFieldExcepti frameworkField.set(sdvManager, framework); // Replace LOG - Field loggerField = sdvManagerImplClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvManager, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvManagerImplClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvManager.provisionStop(); diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvManagersResourceMonitor.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvManagersResourceMonitor.java index e4d441276..63cb2c0f8 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvManagersResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvManagersResourceMonitor.java @@ -14,7 +14,6 @@ import dev.galasa.framework.spi.IResourceManagement; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Modifier; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -23,6 +22,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import sun.misc.Unsafe; class TestSdvManagersResourceMonitor { @@ -31,7 +31,7 @@ class TestSdvManagersResourceMonitor { private String sdvManagersResourceMonitorClassString = "dev.galasa.sdv.internal.SdvManagersResourceMonitor"; private String logString = "LOG"; - private String modifiersString = "modifiers"; + private String theUnsafeString = "theUnsafe"; private String runOneString = "RUN1"; private String runTwoString = "RUN2"; @@ -85,13 +85,14 @@ void testRunWithNoActiveRunsOrDssEntries() .newInstance(framework, resMan, dssService); // Replace LOG - Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvManagersResourceMonitor, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvManagersResourceMonitor.run(); @@ -140,13 +141,14 @@ void testRunWithActiveRunsMatchingDssEntries() .newInstance(framework, resMan, dssService); // Replace LOG - Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvManagersResourceMonitor, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvManagersResourceMonitor.run(); @@ -183,13 +185,14 @@ void testRunException() .newInstance(framework, resMan, dssService); // Replace LOG - Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvManagersResourceMonitor, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvManagersResourceMonitor.run(); @@ -245,13 +248,14 @@ void testRunWithDssEntryNotInActiveRunsButNotLastManagerOnRegion() .newInstance(framework, resMan, dssService); // Replace LOG - Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvManagersResourceMonitor, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvManagersResourceMonitor.run(); @@ -299,13 +303,14 @@ void testRunWithDssEntryNotInActiveRunsButIsLastManagerOnRegion() .newInstance(framework, resMan, dssService); // Replace LOG - Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvManagersResourceMonitor, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvManagersResourceMonitor.run(); @@ -348,13 +353,14 @@ void testrunFinishedOrDeletedIsLastManagerOnRegion() .newInstance(framework, resMan, dssService); // Replace LOG - Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvManagersResourceMonitor, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvManagersResourceMonitor.runFinishedOrDeleted(runOneString); @@ -394,13 +400,14 @@ void testrunFinishedOrDeletedNotLastManagerOnRegion() .newInstance(framework, resMan, dssService); // Replace LOG - Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvManagersResourceMonitor, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvManagersResourceMonitor.runFinishedOrDeleted(runThreeString); @@ -437,13 +444,14 @@ void testrunFinishedOrDeletedException() .newInstance(framework, resMan, dssService); // Replace LOG - Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvManagersResourceMonitor, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvManagersResourceMonitorClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvManagersResourceMonitor.runFinishedOrDeleted(runOneString); diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvUserPool.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvUserPool.java index d31a8a923..1c7c228e5 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvUserPool.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvUserPool.java @@ -20,7 +20,6 @@ import dev.galasa.zos.IZosImage; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.List; import org.apache.commons.logging.Log; @@ -30,6 +29,7 @@ import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; import org.mockito.Mockito; +import sun.misc.Unsafe; class TestSdvUserPool { @@ -115,13 +115,14 @@ void testAllocateUser() throws SdvManagerException, ResourceUnavailableException frameworkField.set(sdvUserPool, framework); // Replace LOG - Field loggerField = sdvUserPoolClass.getDeclaredField("LOG"); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField("modifiers"); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvUserPool, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField("theUnsafe"); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvUserPoolClass.getDeclaredField("LOG"); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test String userCred = sdvUserPool.allocateUser(roleName, mockCicsaRegion); diff --git a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvUserResourceMonitor.java b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvUserResourceMonitor.java index 991dc141b..328823c27 100644 --- a/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvUserResourceMonitor.java +++ b/galasa-managers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager/src/test/java/dev/galasa/sdv/internal/TestSdvUserResourceMonitor.java @@ -15,7 +15,6 @@ import dev.galasa.framework.spi.IResourceManagement; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Modifier; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -27,6 +26,7 @@ import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; import org.mockito.Mockito; +import sun.misc.Unsafe; class TestSdvUserResourceMonitor { @@ -37,7 +37,7 @@ class TestSdvUserResourceMonitor { private String sdvUserResourceMonitorClassString = "dev.galasa.sdv.internal.SdvUserResourceMonitor"; private String logString = "LOG"; - private String modifiersString = "modifiers"; + private String theUnsafeString = "theUnsafe"; private String dssEntryUser1RegionA = "sdvuser.APPL1.USER1"; private String dssEntryUser2RegionA = "sdvuser.APPL1.USER2"; @@ -100,13 +100,14 @@ void testRunWithNoActiveRunsOrDssEntries() .newInstance(framework, resMan, dssService); // Replace LOG - Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvUserResourceMonitorClass, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvUserResourceMonitor.run(); @@ -154,13 +155,14 @@ void testRunWithActiveRunsMatchingDssEntries() .newInstance(framework, resMan, dssService); // Replace LOG - Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvUserResourceMonitorClass, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvUserResourceMonitor.run(); @@ -206,13 +208,14 @@ void testRunWithDssEntriesNotInActiveRuns() throws FrameworkException, ClassNotF .newInstance(framework, resMan, dssService); // Replace LOG - Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvUserResourceMonitorClass, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvUserResourceMonitor.run(); @@ -261,13 +264,14 @@ void testRunException() throws FrameworkException, ClassNotFoundException, NoSuc .newInstance(framework, resMan, dssService); // Replace LOG - Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvUserResourceMonitorClass, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvUserResourceMonitor.run(); @@ -311,13 +315,14 @@ void testrunFinishedOrDeleted() throws FrameworkException, ClassNotFoundExceptio .newInstance(framework, resMan, dssService); // Replace LOG - Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvUserResourceMonitorClass, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvUserResourceMonitor.runFinishedOrDeleted(runThreeString); @@ -359,13 +364,14 @@ void testrunFinishedOrDeletedException() throws FrameworkException, ClassNotFoun .newInstance(framework, resMan, dssService); // Replace LOG - Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvUserResourceMonitorClass, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); // Make call to funtion under test sdvUserResourceMonitor.runFinishedOrDeleted(runThreeString); @@ -410,13 +416,14 @@ void testrunFinishedOrDeletedDssDeleteException() .newInstance(framework, resMan, dssService); // Replace LOG - Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); - loggerField.setAccessible(true); - // remove final modifier - Field modifiersField = Field.class.getDeclaredField(modifiersString); - modifiersField.setAccessible(true); - modifiersField.setInt(loggerField, loggerField.getModifiers() & ~Modifier.FINAL); - loggerField.set(sdvUserResourceMonitorClass, mockLog); + final Field unsafeField = Unsafe.class.getDeclaredField(theUnsafeString); + unsafeField.setAccessible(true); + final Unsafe unsafe = (Unsafe) unsafeField.get(null); + + final Field loggerField = sdvUserResourceMonitorClass.getDeclaredField(logString); + final Object staticLoggerFieldBase = unsafe.staticFieldBase(loggerField); + final long staticLoggerFieldOffset = unsafe.staticFieldOffset(loggerField); + unsafe.putObject(staticLoggerFieldBase, staticLoggerFieldOffset, mockLog); sdvUserPoolStatic.when(() -> SdvUserPool.deleteDss(Mockito.eq(user1String), Mockito.any(), Mockito.eq(runThreeString), Mockito.any())) From 3cb28d54e1ad390a3975072f53b8bf555f259895 Mon Sep 17 00:00:00 2001 From: dhruv Date: Thu, 22 Aug 2024 10:08:40 +0530 Subject: [PATCH 259/263] added build log and jacoco report generation/uploading Signed-off-by: dhruv --- .github/workflows/build.yaml | 26 +++++++++++++++++++++----- .github/workflows/pr-build.yaml | 2 +- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b32bffb5b..a0d2772c1 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -69,13 +69,14 @@ jobs: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }} run: | - gradle -b galasa-managers-parent/build.gradle check publish \ + set -o pipefail + gradle -b galasa-managers-parent/build.gradle check publish --info \ -Dorg.gradle.jvmargs=-Xmx4096M \ -PsourceMaven=https://development.galasa.dev/${{ env.ARGO_APP_BRANCH }}/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ -PtargetMaven=${{github.workspace}}/repo \ -PjacocoEnabled=true \ - -PisMainOrRelease=true + -PisMainOrRelease=true 2>&1 | tee build.log - name: Build Managers source code if: github.event_name == 'workflow_dispatch' # Use the input values provided by the workflow dispatch. @@ -86,14 +87,29 @@ jobs: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }} run: | - gradle -b galasa-managers-parent/build.gradle check publish \ + set -o pipefail + gradle -b galasa-managers-parent/build.gradle check publish --info \ -Dorg.gradle.jvmargs=-Xmx4096M \ -PsourceMaven=https://development.galasa.dev/${{ env.ARGO_APP_BRANCH }}/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ -PtargetMaven=${{github.workspace}}/repo \ -PjacocoEnabled=${{ inputs.jacocoEnabled }} \ - -PisMainOrRelease=${{ inputs.isMainOrRelease }} - + -PisMainOrRelease=${{ inputs.isMainOrRelease }} 2>&1 | tee build.log + + - name: Upload Gradle Build Log + if: always() + uses: actions/upload-artifact@v4 + with: + name: gradle-build-log + path: build.log + + - name: Upload Jacoco Report + if: always() + uses: actions/upload-artifact@v4 + with: + name: jacoco-report + path: ${{github.workspace}}/galasa-managers-parent/build/reports/jacoco/jacocoMerge + - name: Login to Github Container Registry uses: docker/login-action@v3 with: diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index d5897bcb1..6283e35e6 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -30,7 +30,7 @@ jobs: - name: Build Managers source code run: | - gradle -b galasa-managers-parent/build.gradle check publish \ + gradle -b galasa-managers-parent/build.gradle check publish --info \ -Dorg.gradle.jvmargs=-Xmx4096M \ -PsourceMaven=https://development.galasa.dev/gh/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ From 551d1ca39e6d716fcb69424a164c929a1812b9c8 Mon Sep 17 00:00:00 2001 From: dhruv Date: Thu, 22 Aug 2024 16:59:17 +0530 Subject: [PATCH 260/263] made required changes Signed-off-by: dhruv --- .github/workflows/build.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a0d2772c1..e75d7261e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -97,19 +97,22 @@ jobs: -PisMainOrRelease=${{ inputs.isMainOrRelease }} 2>&1 | tee build.log - name: Upload Gradle Build Log - if: always() + if: failure() uses: actions/upload-artifact@v4 with: name: gradle-build-log path: build.log + retention-days: 7 - name: Upload Jacoco Report - if: always() + if: failure() uses: actions/upload-artifact@v4 with: name: jacoco-report - path: ${{github.workspace}}/galasa-managers-parent/build/reports/jacoco/jacocoMerge - + path: ${{github.workspace}}/galasa-managers-parent/**/**/build/reports/**/*.html + retention-days: 7 + if-no-files-found: ignore + - name: Login to Github Container Registry uses: docker/login-action@v3 with: From 01c4270ed42e79a99ae97eda96cc84003bd6f4e2 Mon Sep 17 00:00:00 2001 From: dhruv Date: Thu, 22 Aug 2024 18:10:02 +0530 Subject: [PATCH 261/263] added changes to pr workflow Signed-off-by: dhruv --- .github/workflows/pr-build.yaml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 6283e35e6..83a4a1f83 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -30,11 +30,29 @@ jobs: - name: Build Managers source code run: | + set -o pipefail gradle -b galasa-managers-parent/build.gradle check publish --info \ -Dorg.gradle.jvmargs=-Xmx4096M \ -PsourceMaven=https://development.galasa.dev/gh/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ - -PtargetMaven=${{github.workspace}}/repo + -PtargetMaven=${{github.workspace}}/repo 2>&1 | tee build.log + + - name: Upload Gradle Build Log + if: failure() + uses: actions/upload-artifact@v4 + with: + name: gradle-build-log + path: build.log + retention-days: 7 + + - name: Upload Jacoco Report + if: failure() + uses: actions/upload-artifact@v4 + with: + name: jacoco-report + path: ${{github.workspace}}/galasa-managers-parent/**/**/build/reports/**/*.html + retention-days: 7 + if-no-files-found: ignore - name: Build Managers image for testing uses: docker/build-push-action@v5 From c1f8ccd298833e47b793870b44a6178c98eb2160 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Fri, 30 Aug 2024 14:22:29 +0100 Subject: [PATCH 262/263] Add copyright and remove argo app param Signed-off-by: Jade Carino --- .github/workflows/build.yaml | 22 ++++++++++++++-------- .github/workflows/pr-build.yaml | 12 +++++++++--- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e75d7261e..3d3809d39 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,3 +1,8 @@ +# +# Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# name: Main build on: @@ -26,7 +31,6 @@ env: REGISTRY: ghcr.io NAMESPACE: galasa-dev BRANCH: ${{ github.ref_name }} - ARGO_APP_BRANCH: gh # TODO: remove this parameter and just use env.BRANCH once we update development.galasa.dev/main with these workflows. jobs: log-github-ref: @@ -71,10 +75,11 @@ jobs: run: | set -o pipefail gradle -b galasa-managers-parent/build.gradle check publish --info \ + --no-daemon --console plain \ -Dorg.gradle.jvmargs=-Xmx4096M \ - -PsourceMaven=https://development.galasa.dev/${{ env.ARGO_APP_BRANCH }}/maven-repo/extensions \ + -PsourceMaven=https://development.galasa.dev/${{ env.BRANCH }}/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ - -PtargetMaven=${{github.workspace}}/repo \ + -PtargetMaven=${{ github.workspace }}/repo \ -PjacocoEnabled=true \ -PisMainOrRelease=true 2>&1 | tee build.log @@ -89,10 +94,11 @@ jobs: run: | set -o pipefail gradle -b galasa-managers-parent/build.gradle check publish --info \ + --no-daemon --console plain \ -Dorg.gradle.jvmargs=-Xmx4096M \ - -PsourceMaven=https://development.galasa.dev/${{ env.ARGO_APP_BRANCH }}/maven-repo/extensions \ + -PsourceMaven=https://development.galasa.dev/${{ env.BRANCH }}/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ - -PtargetMaven=${{github.workspace}}/repo \ + -PtargetMaven=${{ github.workspace }}/repo \ -PjacocoEnabled=${{ inputs.jacocoEnabled }} \ -PisMainOrRelease=${{ inputs.isMainOrRelease }} 2>&1 | tee build.log @@ -109,7 +115,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: jacoco-report - path: ${{github.workspace}}/galasa-managers-parent/**/**/build/reports/**/*.html + path: ${{ github.workspace }}/galasa-managers-parent/**/**/build/reports/**/*.html retention-days: 7 if-no-files-found: ignore @@ -143,13 +149,13 @@ jobs: env: ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_TOKEN }} run: | - docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app actions run ${{ env.ARGO_APP_BRANCH }}-maven-repos restart --kind Deployment --resource-name managers-${{ env.ARGO_APP_BRANCH }} --server argocd.galasa.dev + docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app actions run ${{ env.BRANCH }}-maven-repos restart --kind Deployment --resource-name managers-${{ env.BRANCH }} --server argocd.galasa.dev - name: Wait for app health in ArgoCD env: ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_TOKEN }} run: | - docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app wait ${{ env.ARGO_APP_BRANCH }}-maven-repos --resource apps:Deployment:managers-${{ env.ARGO_APP_BRANCH }} --health --server argocd.galasa.dev + docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app wait ${{ env.BRANCH }}-maven-repos --resource apps:Deployment:managers-${{ env.BRANCH }} --health --server argocd.galasa.dev trigger-obr-workflow: name: Trigger OBR workflow diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 83a4a1f83..befe7406f 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -1,3 +1,8 @@ +# +# Copyright contributors to the Galasa project +# +# SPDX-License-Identifier: EPL-2.0 +# name: PR build on: @@ -32,10 +37,11 @@ jobs: run: | set -o pipefail gradle -b galasa-managers-parent/build.gradle check publish --info \ + --no-daemon --console plain \ -Dorg.gradle.jvmargs=-Xmx4096M \ - -PsourceMaven=https://development.galasa.dev/gh/maven-repo/extensions \ + -PsourceMaven=https://development.galasa.dev/main/maven-repo/extensions \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ - -PtargetMaven=${{github.workspace}}/repo 2>&1 | tee build.log + -PtargetMaven=${{ github.workspace }}/repo 2>&1 | tee build.log - name: Upload Gradle Build Log if: failure() @@ -50,7 +56,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: jacoco-report - path: ${{github.workspace}}/galasa-managers-parent/**/**/build/reports/**/*.html + path: ${{ github.workspace }}/galasa-managers-parent/**/**/build/reports/**/*.html retention-days: 7 if-no-files-found: ignore From 234ddb3ed0b156b57a125627673642645df46194 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Tue, 10 Sep 2024 11:24:44 +0100 Subject: [PATCH 263/263] Disabling gradle cache to avoid build problems Signed-off-by: Jade Carino --- .github/workflows/build.yaml | 1 + .github/workflows/pr-build.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3d3809d39..715e2f4aa 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -63,6 +63,7 @@ jobs: uses: gradle/actions/setup-gradle@v3 with: gradle-version: 8.9 + cache-disabled: true - name: Build Managers source code if: github.event_name == 'push' diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index befe7406f..27607feae 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -32,6 +32,7 @@ jobs: uses: gradle/actions/setup-gradle@v3 with: gradle-version: 8.9 + cache-disabled: true - name: Build Managers source code run: |