From 9c2ba42d4c2404ed9d40512e5d7b5bfdd85ccaa4 Mon Sep 17 00:00:00 2001 From: Uday Chowdary Date: Tue, 1 Feb 2022 16:15:17 +0530 Subject: [PATCH 01/19] Added Stuff to Read.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 2a03113ac..479b79a39 100644 --- a/README.md +++ b/README.md @@ -20,3 +20,5 @@ For more information you can Ask a Question in the [TECHcommunity Forums](http:/ You can find additional information in the [Software AG TECHcommunity](http://techcommunity.softwareag.com/home/-/product/name/webmethods). ____________________ Contact us at [TECHcommunity](mailto:technologycommunity@softwareag.com?subject=Github/SoftwareAG) if you have any questions. + +This is a POC Branch From 4d1b4bc8b2121b9ffb217c48c18815dab398562a Mon Sep 17 00:00:00 2001 From: Uday Chowdary Date: Tue, 1 Feb 2022 17:41:29 +0530 Subject: [PATCH 02/19] Added DMO_CICD_LSD package to git --- assets/IS/Packages/DMO_CICD_LSD/.classpath | 34 +++++ assets/IS/Packages/DMO_CICD_LSD/.project | 23 +++ assets/IS/Packages/DMO_CICD_LSD/manifest.v3 | 13 ++ .../FlowServices/addInts/flow.xml | 142 ++++++++++++++++++ .../FlowServices/addInts/flow.xml.bak | 4 + .../FlowServices/addInts/node.ndf | 142 ++++++++++++++++++ .../ns/DMO_CICD_LSD/FlowServices/node.idf | 8 + .../DMO_CICD_LSD/ns/DMO_CICD_LSD/node.idf | 8 + .../IS/Packages/DMO_CICD_LSD/pub/index.html | 2 + 9 files changed, 376 insertions(+) create mode 100644 assets/IS/Packages/DMO_CICD_LSD/.classpath create mode 100644 assets/IS/Packages/DMO_CICD_LSD/.project create mode 100644 assets/IS/Packages/DMO_CICD_LSD/manifest.v3 create mode 100644 assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/flow.xml create mode 100644 assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/flow.xml.bak create mode 100644 assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/node.ndf create mode 100644 assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/node.idf create mode 100644 assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/node.idf create mode 100644 assets/IS/Packages/DMO_CICD_LSD/pub/index.html diff --git a/assets/IS/Packages/DMO_CICD_LSD/.classpath b/assets/IS/Packages/DMO_CICD_LSD/.classpath new file mode 100644 index 000000000..615ab5012 --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/.classpath @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/IS/Packages/DMO_CICD_LSD/.project b/assets/IS/Packages/DMO_CICD_LSD/.project new file mode 100644 index 000000000..7dac5b4be --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/.project @@ -0,0 +1,23 @@ + + + DMO_CICD_LSD + + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.softwareag.is.vcsintegration.ISPackageBuilder + + + + + + org.eclipse.jdt.core.javanature + com.softwareag.is.vcsintegration.nature + + diff --git a/assets/IS/Packages/DMO_CICD_LSD/manifest.v3 b/assets/IS/Packages/DMO_CICD_LSD/manifest.v3 new file mode 100644 index 000000000..c62aa628f --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/manifest.v3 @@ -0,0 +1,13 @@ + + + + yes + no + 1.0 + + + + + + yes + diff --git a/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/flow.xml b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/flow.xml new file mode 100644 index 000000000..389e710f8 --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/flow.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + record + unknown + false + record + 0 + true + false + false + + + record + unknown + + + true + false + false + + false + num1 + string + 0 + + + true + false + false + + + record + unknown + + + true + false + false + + false + num2 + string + 0 + + + true + false + false + + + field + unknown + false + value + string + 0 + true + false + false + + + record + unknown + + + true + false + false + + false + result + string + 0 + + + true + false + false + + + true + + + + + + + + record + unknown + false + addIntsOutput + record + 0 + true + false + false + + + field + unknown + false + value + string + 0 + true + false + false + + + true + + + + + + + + + + + + + + diff --git a/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/flow.xml.bak b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/flow.xml.bak new file mode 100644 index 000000000..d62317f7e --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/flow.xml.bak @@ -0,0 +1,4 @@ + + + + diff --git a/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/node.ndf b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/node.ndf new file mode 100644 index 000000000..4bfbf74d1 --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/node.ndf @@ -0,0 +1,142 @@ + + + + flow + default + java 3.5 + + + record + unknown + false + record + 0 + IData + true + false + false + + + record + unknown + + + true + false + false + + false + num1 + string + 0 + + + true + false + false + + + record + unknown + + + true + false + false + + false + num2 + string + 0 + + + true + false + false + + + true + + + record + unknown + false + record + 0 + IData + true + false + false + + + record + unknown + + + true + false + false + + false + result + string + 0 + + + true + false + false + + + true + + + + yes + no + no + 15 + 1 + off + no + $null + no + 0 + 0 + none + none + 0 + + + + 0 + false + false + true + + + false + 1 + 60 + 5 + 60 + 1 + + 300 + false + + + TRACE + HEAD + DELETE + POST + GET + OPTIONS + PUT + PATCH + + 1 + + true + false + diff --git a/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/node.idf b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/node.idf new file mode 100644 index 000000000..1dee48d1d --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/node.idf @@ -0,0 +1,8 @@ + + + + interface + unknown + DMO_CICD_LSD.FlowServices + false + diff --git a/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/node.idf b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/node.idf new file mode 100644 index 000000000..72a781750 --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/node.idf @@ -0,0 +1,8 @@ + + + + interface + unknown + DMO_CICD_LSD + false + diff --git a/assets/IS/Packages/DMO_CICD_LSD/pub/index.html b/assets/IS/Packages/DMO_CICD_LSD/pub/index.html new file mode 100644 index 000000000..fe677b1e0 --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/pub/index.html @@ -0,0 +1,2 @@ + +

Welcome to the Home Page for the DMO_CICD_LSD Package.

\ No newline at end of file From 5d2cf73dbccd2669b4765061d5dd4f818480be7a Mon Sep 17 00:00:00 2001 From: Uday Chowdary Date: Tue, 1 Feb 2022 20:05:02 +0530 Subject: [PATCH 03/19] Updated DMO_CICD_POC --- .../FlowServices/addInts_1/flow.xml | 142 ++++++++++++++++++ .../FlowServices/addInts_1/flow.xml.bak | 4 + .../FlowServices/addInts_1/node.ndf | 142 ++++++++++++++++++ 3 files changed, 288 insertions(+) create mode 100644 assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/flow.xml create mode 100644 assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/flow.xml.bak create mode 100644 assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/node.ndf diff --git a/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/flow.xml b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/flow.xml new file mode 100644 index 000000000..5417932bd --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/flow.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + record + unknown + false + record + 0 + true + false + false + + + record + unknown + + + true + false + false + + false + num1 + string + 0 + + + true + false + false + + + record + unknown + + + true + false + false + + false + result + string + 0 + + + true + false + false + + + record + unknown + + + true + false + false + + false + num2 + string + 0 + + + true + false + false + + + field + unknown + false + value + string + 0 + true + false + false + + + true + + + + + + + + record + unknown + false + addIntsOutput + record + 0 + true + false + false + + + field + unknown + false + value + string + 0 + true + false + false + + + true + + + + + + + + + + + + + + diff --git a/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/flow.xml.bak b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/flow.xml.bak new file mode 100644 index 000000000..d62317f7e --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/flow.xml.bak @@ -0,0 +1,4 @@ + + + + diff --git a/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/node.ndf b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/node.ndf new file mode 100644 index 000000000..4bfbf74d1 --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/node.ndf @@ -0,0 +1,142 @@ + + + + flow + default + java 3.5 + + + record + unknown + false + record + 0 + IData + true + false + false + + + record + unknown + + + true + false + false + + false + num1 + string + 0 + + + true + false + false + + + record + unknown + + + true + false + false + + false + num2 + string + 0 + + + true + false + false + + + true + + + record + unknown + false + record + 0 + IData + true + false + false + + + record + unknown + + + true + false + false + + false + result + string + 0 + + + true + false + false + + + true + + + + yes + no + no + 15 + 1 + off + no + $null + no + 0 + 0 + none + none + 0 + + + + 0 + false + false + true + + + false + 1 + 60 + 5 + 60 + 1 + + 300 + false + + + TRACE + HEAD + DELETE + POST + GET + OPTIONS + PUT + PATCH + + 1 + + true + false + From 139a0ac02263d6f4f96e28e44e33ce7ae7e94ebb Mon Sep 17 00:00:00 2001 From: Uday Chowdary Date: Tue, 1 Feb 2022 21:04:22 +0530 Subject: [PATCH 04/19] Updated jenkins file stuff --- Jenkinsfile.unix | 92 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 68 insertions(+), 24 deletions(-) diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index d34f0db95..098709079 100644 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -1,32 +1,76 @@ -/* -* Copyright © 2010 - 2013 Apama Ltd. -* Copyright © 2013 - 2018 Software AG, Darmstadt, Germany and/or its licensors -* -* SPDX-License-Identifier: Apache-2.0 -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -*/ - pipeline { agent any - + environment { + ZIPNAME = "webmethods-${BUILD_NUMBER}.zip" + APPNAME = 'tla00_wbm(wm107_instance_is)' // This is the name o the XLD application + APP_TLA = 'TLA' + PROJECT = 'tla00' + GROUP_ID = 'tla00_wbm' + ZIP_PATH = '/opt/webmethods107/IntegrationServer/instances/default/replicate/inbound' + XML_PATH = '/opt/webmethods107/IntegrationServer/instances/default/properties' + WBM_APPNAME = 'wm107_instance_is' //WBM_APPNAME is the name of the application in webmethods + } + parameters { + choice(name: 'TARGET_INSTANCE', choices: ['INSTANCE'], description: 'Pick the target IS instance the wM Code you want to deploy') + choice(name: 'TARGET_ENV', choices: ['DV'], description: 'Pick the target environment the wM Code you want to deploy') + string(name: 'BUILD_BRANCH', defaultValue: 'release/*', description: 'Name of the Branch') + } + stages { - stage('Build'){ + stage('Clean Workspace'){ + steps{ + echo 'Cleaning the jenkins Workspace before the build' + always { + cleanWs() + } + echo "Deleting OLD artifacts if any" + sh "rm -rf zips/webmethods-*.zip" + } + }// Cleaning the jenkins Workspace before the build + stage('git commit') { + steps{ + script{ + gitCommit = sh(returnStdout: true, script: 'git rev-parse HEAD').trim() + SCMREVISION = gitCommit.take(8) + currentBuild.description = APPNAME + echo """ + ZIP_PATH : ${ZIP_PATH} + XML_PATH : ${XML_PATH} + ZIPNAME : ${ZIPNAME} + BUILD_BRANCH : ${BUILD_BRANCH} + SCMREVISION : ${SCMREVISION} + APPNAME : ${APPNAME} + """ + } + } + } + stage('Build deployables'){ steps { - sh "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME} build" + echo 'Starting to build webMethods assets using webMethods ABE' + sh "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${GROUP_ID}_${WBM_APPNAME} -DAPP_TLA=${APP_TLA} -DTARGET_INSTANCE=${TARGET_INSTANCE} _DTARGET_ENV=${TARGET_ENV} build" } - } + }// End Build deployables + stage('remove files'){ + steps{ + script{ + dir("target/${GROUP_ID}_${WBM_APPNAME}/build/IS"){ + string fileContents = new File("${env.WORKSPACE}/assets/IS/config-deployment/${APP_TLA}_DeploymentSet.txt").text + println fileContents + files = findFiles glob: '*zip*' + println files + for(file in files){ + if (fileContents.contains("${file.name}")){ + println "keeping file: ${file.name}" + } + else { + println "deleting file ${file.name}" + sh "rm -f ${file.name}" + } + } + } + } + } + } stage('Deploy') { steps { sh "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME} deploy" From 26bd8064802c85f38a2c6d8639082540e5815f94 Mon Sep 17 00:00:00 2001 From: udaydamineni <67158671+udaydamineni@users.noreply.github.com> Date: Wed, 2 Feb 2022 17:42:01 +0530 Subject: [PATCH 05/19] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6972fe278..c4d9f5a9f 100644 --- a/README.md +++ b/README.md @@ -20,3 +20,4 @@ For more information you can Ask a Question in the [Tech Community Forums](https You can find additional information in the [Software AG Tech Community](https://tech.forums.softwareag.com/tag/webmethods). ____________________ +test From aa19d4e50b655e2fe4ee98fc4e024f407114463e Mon Sep 17 00:00:00 2001 From: udaydamineni <67158671+udaydamineni@users.noreply.github.com> Date: Wed, 2 Feb 2022 17:44:24 +0530 Subject: [PATCH 06/19] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c4d9f5a9f..593c1c1a8 100644 --- a/README.md +++ b/README.md @@ -20,4 +20,4 @@ For more information you can Ask a Question in the [Tech Community Forums](https You can find additional information in the [Software AG Tech Community](https://tech.forums.softwareag.com/tag/webmethods). ____________________ -test +test - test From 0f200f19b26dc5e2e7a1e9290a4c120e337a2281 Mon Sep 17 00:00:00 2001 From: Uday Chowdary Date: Wed, 2 Feb 2022 18:26:48 +0530 Subject: [PATCH 07/19] Updated Folder content --- assets/IS/Packages/.gitkeep | 0 assets/IS/Tests/FibonachiTest/.classpath | 6 --- assets/IS/Tests/FibonachiTest/.classpath.swp | Bin 12288 -> 0 bytes assets/IS/Tests/FibonachiTest/.project | 17 --------- .../.settings/org.eclipse.jdt.core.prefs | 12 ------ assets/IS/Tests/FibonachiTest/bin/.gitignore | 2 - .../test/xml/data/fibExpectedOutput.xml | 16 -------- .../resources/test/xml/data/fibWrongInput.xml | 16 -------- .../resources/test/xml/data/finInput.xml | 16 -------- .../test/xml/data/mockSubstractIntWrong.xml | 16 -------- .../test/xml/setup/FibonachiTest.xml | 35 ------------------ assets/IS/config-deployment/.gitkeep | 0 .../config-deployment/TLA_DeploymentSet.txt | 0 assets/IS/config/.gitkeep | 0 assets/IS/properties/.gitkeep | 0 project.properties | 8 +--- 16 files changed, 2 insertions(+), 142 deletions(-) create mode 100644 assets/IS/Packages/.gitkeep delete mode 100644 assets/IS/Tests/FibonachiTest/.classpath delete mode 100644 assets/IS/Tests/FibonachiTest/.classpath.swp delete mode 100644 assets/IS/Tests/FibonachiTest/.project delete mode 100644 assets/IS/Tests/FibonachiTest/.settings/org.eclipse.jdt.core.prefs delete mode 100644 assets/IS/Tests/FibonachiTest/bin/.gitignore delete mode 100644 assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibExpectedOutput.xml delete mode 100644 assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibWrongInput.xml delete mode 100644 assets/IS/Tests/FibonachiTest/resources/test/xml/data/finInput.xml delete mode 100644 assets/IS/Tests/FibonachiTest/resources/test/xml/data/mockSubstractIntWrong.xml delete mode 100644 assets/IS/Tests/FibonachiTest/resources/test/xml/setup/FibonachiTest.xml create mode 100644 assets/IS/config-deployment/.gitkeep create mode 100644 assets/IS/config-deployment/TLA_DeploymentSet.txt create mode 100644 assets/IS/config/.gitkeep create mode 100644 assets/IS/properties/.gitkeep diff --git a/assets/IS/Packages/.gitkeep b/assets/IS/Packages/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/assets/IS/Tests/FibonachiTest/.classpath b/assets/IS/Tests/FibonachiTest/.classpath deleted file mode 100644 index 3485755ac..000000000 --- a/assets/IS/Tests/FibonachiTest/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/assets/IS/Tests/FibonachiTest/.classpath.swp b/assets/IS/Tests/FibonachiTest/.classpath.swp deleted file mode 100644 index 9cd3016c34d1e782f82d59a6344ffbbb8492bd1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI&!EVzq7zc1~aA1eQfENhijNJ|-Kx#LkYLkkzP1?Evr^!j&)Lmjnw$pYO_7LO1 z3n1|VJOd{lfVaVhW=NA**|E~!)h8#hzu5luRP{?*C;h$XC4E7B+aQE~{r3Ly^TFMR z9|++p7e#o!pcPWpvqaD6f`pI1$JtbyGh6Xgyl!u@U72Xb(~%qq>ljT7ZvB`WEm#u6 z5P-m~1=h*)&2}rKJ&m74j~^Z1`VB~c00bZa0SG_<0uX=z1eRC8RV(DeZ+~@ugnRRT z#Q-2tWV=5P$##AOHafKwzl^I_#?IdW)=eu5N^K<~%x+D(l9& zc2(`-D3oS*<3y^M{c~<1lV&0t=~A#iW#3j0-IN=_b6@v;+Uv7am!($BPiJ{3`yNU= zV)>Ac`Gn7C$z|a$%?%5sS~Uy#cTvl8nx~ddOXq9JZ7rRkrdCdtg1#$5efd#%*3-&y zsf1ze=JS7RXp>Ws7P7K}jx$FKUMpX?u5$YJaObplus?Xy-`_c8*XK#)gi*YpnMmrK z)^eUH3_WsOW!z*ZdxP^zu<@k4VJp_8&2f#ex;Ck>EF6^uv5@%pyYtuEv$BXL!dR(Q ZH*V8b90`@`%x}0G9}jk)y^6QD$S-NC*ggON diff --git a/assets/IS/Tests/FibonachiTest/.project b/assets/IS/Tests/FibonachiTest/.project deleted file mode 100644 index c8e6fd4ce..000000000 --- a/assets/IS/Tests/FibonachiTest/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - FibonachiTest - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/assets/IS/Tests/FibonachiTest/.settings/org.eclipse.jdt.core.prefs b/assets/IS/Tests/FibonachiTest/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 8fec98aea..000000000 --- a/assets/IS/Tests/FibonachiTest/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Thu Jan 10 14:25:20 CET 2013 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/assets/IS/Tests/FibonachiTest/bin/.gitignore b/assets/IS/Tests/FibonachiTest/bin/.gitignore deleted file mode 100644 index 9e21f06c3..000000000 --- a/assets/IS/Tests/FibonachiTest/bin/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/PackageTest/ -/test/ diff --git a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibExpectedOutput.xml b/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibExpectedOutput.xml deleted file mode 100644 index 484a0545c..000000000 --- a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibExpectedOutput.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - 8 - - diff --git a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibWrongInput.xml b/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibWrongInput.xml deleted file mode 100644 index cdd9897ec..000000000 --- a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibWrongInput.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - -1 - - diff --git a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/finInput.xml b/assets/IS/Tests/FibonachiTest/resources/test/xml/data/finInput.xml deleted file mode 100644 index 1394e3d06..000000000 --- a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/finInput.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - 6 - - diff --git a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/mockSubstractIntWrong.xml b/assets/IS/Tests/FibonachiTest/resources/test/xml/data/mockSubstractIntWrong.xml deleted file mode 100644 index 3b1c44f94..000000000 --- a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/mockSubstractIntWrong.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - 5 - - diff --git a/assets/IS/Tests/FibonachiTest/resources/test/xml/setup/FibonachiTest.xml b/assets/IS/Tests/FibonachiTest/resources/test/xml/setup/FibonachiTest.xml deleted file mode 100644 index afcde751a..000000000 --- a/assets/IS/Tests/FibonachiTest/resources/test/xml/setup/FibonachiTest.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/IS/config-deployment/.gitkeep b/assets/IS/config-deployment/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/assets/IS/config-deployment/TLA_DeploymentSet.txt b/assets/IS/config-deployment/TLA_DeploymentSet.txt new file mode 100644 index 000000000..e69de29bb diff --git a/assets/IS/config/.gitkeep b/assets/IS/config/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/assets/IS/properties/.gitkeep b/assets/IS/properties/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/project.properties b/project.properties index a900c1312..969880864 100644 --- a/project.properties +++ b/project.properties @@ -5,12 +5,8 @@ # Use slash "/" as path separator. Example: Use "C:/SoftwareAG", instead of "C:\SoftwareAG". isPackages=./assets/IS/Packages isTests=./assets/IS/Tests -isConfigDir=./assets/IS/config -bpmProjects=./assets/BPM/ -mwsProjects=./assets/MWS/ -rulesProjects=./assets/Rules/ -#Should always be named UniversalMessaging -umExport=./assets/UniversalMessaging +isConfig=./assets/IS/config +deployerConfig-./assets/IS/config-deployment From 2e11ac37d5e4d6c654575afd912cbd3641c6ae16 Mon Sep 17 00:00:00 2001 From: Uday Chowdary Date: Wed, 2 Feb 2022 18:29:28 +0530 Subject: [PATCH 08/19] Updated jenkinsfile --- Jenkinsfile.unix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index 098709079..7104efc0c 100644 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -2,16 +2,16 @@ pipeline { agent any environment { ZIPNAME = "webmethods-${BUILD_NUMBER}.zip" - APPNAME = 'tla00_wbm(wm107_instance_is)' // This is the name o the XLD application - APP_TLA = 'TLA' - PROJECT = 'tla00' - GROUP_ID = 'tla00_wbm' + APPNAME = 'dmo00_wbm(wm107_default_is)' // This is the name o the XLD application + APP_TLA = 'DMO' + PROJECT = 'dmo00' + GROUP_ID = 'dmo00_wbm' ZIP_PATH = '/opt/webmethods107/IntegrationServer/instances/default/replicate/inbound' XML_PATH = '/opt/webmethods107/IntegrationServer/instances/default/properties' WBM_APPNAME = 'wm107_instance_is' //WBM_APPNAME is the name of the application in webmethods } parameters { - choice(name: 'TARGET_INSTANCE', choices: ['INSTANCE'], description: 'Pick the target IS instance the wM Code you want to deploy') + choice(name: 'TARGET_INSTANCE', choices: ['default'], description: 'Pick the target IS instance the wM Code you want to deploy') choice(name: 'TARGET_ENV', choices: ['DV'], description: 'Pick the target environment the wM Code you want to deploy') string(name: 'BUILD_BRANCH', defaultValue: 'release/*', description: 'Name of the Branch') } From 34c78491db68c2c52408f0131d0edb622bec321d Mon Sep 17 00:00:00 2001 From: Uday Chowdary Date: Wed, 2 Feb 2022 21:15:58 +0530 Subject: [PATCH 09/19] Updated build.xml --- build.xml | 61 +++++++++++++++++-------------------------------------- 1 file changed, 19 insertions(+), 42 deletions(-) diff --git a/build.xml b/build.xml index eda02ba92..613eebccf 100644 --- a/build.xml +++ b/build.xml @@ -1,57 +1,34 @@ - - - + - - - - - - - - - + + + - - - - - - + + + + - + - - + + - - + + - - + + + + + + From 34bbfbd9bd51a8811ac6813269fff78d657c4e51 Mon Sep 17 00:00:00 2001 From: Uday Chowdary Date: Wed, 2 Feb 2022 22:27:45 +0530 Subject: [PATCH 10/19] updated jenkinsfile --- Jenkinsfile.unix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index 7104efc0c..552e13202 100644 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -47,7 +47,7 @@ pipeline { stage('Build deployables'){ steps { echo 'Starting to build webMethods assets using webMethods ABE' - sh "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${GROUP_ID}_${WBM_APPNAME} -DAPP_TLA=${APP_TLA} -DTARGET_INSTANCE=${TARGET_INSTANCE} _DTARGET_ENV=${TARGET_ENV} build" + sh "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${GROUP_ID}_${WBM_APPNAME} -DAPP_TLA=${APP_TLA} -DTARGET_INSTANCE=${TARGET_INSTANCE} build" } }// End Build deployables stage('remove files'){ From 9bcba36628492f3d1a79dc13ef0c06ba356a4073 Mon Sep 17 00:00:00 2001 From: Uday Chowdary Date: Thu, 3 Feb 2022 15:00:24 +0530 Subject: [PATCH 11/19] Updated jenkins file --- Jenkinsfile.unix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index 552e13202..67c52e013 100644 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -6,8 +6,8 @@ pipeline { APP_TLA = 'DMO' PROJECT = 'dmo00' GROUP_ID = 'dmo00_wbm' - ZIP_PATH = '/opt/webmethods107/IntegrationServer/instances/default/replicate/inbound' - XML_PATH = '/opt/webmethods107/IntegrationServer/instances/default/properties' + ZIP_PATH = '/opt/softwareag/IntegrationServer/instances/default/replicate/inbound' + XML_PATH = '/opt/softwareag/IntegrationServer/instances/default/properties' WBM_APPNAME = 'wm107_instance_is' //WBM_APPNAME is the name of the application in webmethods } parameters { From 815ecaa5a3f5cc34acc5562924353c0f0ea1e8c4 Mon Sep 17 00:00:00 2001 From: Uday Chowdary Date: Thu, 3 Feb 2022 16:17:06 +0530 Subject: [PATCH 12/19] aaded configdeployment stuff --- assets/IS/config-deployment/DMO_DeploymentSet.txt | 1 + assets/IS/config-deployment/TLA_DeploymentSet.txt | 0 2 files changed, 1 insertion(+) create mode 100644 assets/IS/config-deployment/DMO_DeploymentSet.txt delete mode 100644 assets/IS/config-deployment/TLA_DeploymentSet.txt diff --git a/assets/IS/config-deployment/DMO_DeploymentSet.txt b/assets/IS/config-deployment/DMO_DeploymentSet.txt new file mode 100644 index 000000000..baeebc5ec --- /dev/null +++ b/assets/IS/config-deployment/DMO_DeploymentSet.txt @@ -0,0 +1 @@ +DMO_CICD_LSD.zip \ No newline at end of file diff --git a/assets/IS/config-deployment/TLA_DeploymentSet.txt b/assets/IS/config-deployment/TLA_DeploymentSet.txt deleted file mode 100644 index e69de29bb..000000000 From e27ce5ef17fd46578ecb4de45d3c61b47eb4192a Mon Sep 17 00:00:00 2001 From: Uday Chowdary Date: Thu, 3 Feb 2022 16:55:27 +0530 Subject: [PATCH 13/19] Updated Jenkins file --- Jenkinsfile.unix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index 67c52e013..edac1af2f 100644 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -47,7 +47,7 @@ pipeline { stage('Build deployables'){ steps { echo 'Starting to build webMethods assets using webMethods ABE' - sh "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${GROUP_ID}_${WBM_APPNAME} -DAPP_TLA=${APP_TLA} -DTARGET_INSTANCE=${TARGET_INSTANCE} build" + sh "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${GROUP_ID}_${WBM_APPNAME} -DAPP_TLA=${APP_TLA} -DTARGET_INSTANCE=${TARGET_INSTANCE} -DTARGET_ENV =${TARGET_ENV} build" } }// End Build deployables stage('remove files'){ From f5a6f4f2a2b789cee798100c1c34b17ff333505a Mon Sep 17 00:00:00 2001 From: Uday Chowdary Date: Thu, 3 Feb 2022 22:09:26 +0530 Subject: [PATCH 14/19] updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 593c1c1a8..5cfab9773 100644 --- a/README.md +++ b/README.md @@ -20,4 +20,4 @@ For more information you can Ask a Question in the [Tech Community Forums](https You can find additional information in the [Software AG Tech Community](https://tech.forums.softwareag.com/tag/webmethods). ____________________ -test - test +test - test - test From d54cabbb05e6bbbb1214e55718a8021c23c7bef3 Mon Sep 17 00:00:00 2001 From: Uday Chowdary Date: Thu, 3 Feb 2022 22:14:47 +0530 Subject: [PATCH 15/19] updated jenkinsfile --- Jenkinsfile.unix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index edac1af2f..be57486fc 100644 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -54,7 +54,7 @@ pipeline { steps{ script{ dir("target/${GROUP_ID}_${WBM_APPNAME}/build/IS"){ - string fileContents = new File("${env.WORKSPACE}/assets/IS/config-deployment/${APP_TLA}_DeploymentSet.txt").text + string fileContents = new File("${env.WORKSPACE}/assets/IS/config-deployment/${APP_TLA}_DeploymentSet.txt") println fileContents files = findFiles glob: '*zip*' println files From 2d044edaf6aee22a6a316eb9a439f3337ab9c0ae Mon Sep 17 00:00:00 2001 From: Uday Chowdary Date: Thu, 3 Feb 2022 22:30:11 +0530 Subject: [PATCH 16/19] updated jenkins file --- Jenkinsfile.unix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index be57486fc..d97023428 100644 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -50,7 +50,7 @@ pipeline { sh "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${GROUP_ID}_${WBM_APPNAME} -DAPP_TLA=${APP_TLA} -DTARGET_INSTANCE=${TARGET_INSTANCE} -DTARGET_ENV =${TARGET_ENV} build" } }// End Build deployables - stage('remove files'){ + //stage('remove files'){ steps{ script{ dir("target/${GROUP_ID}_${WBM_APPNAME}/build/IS"){ @@ -70,7 +70,7 @@ pipeline { } } } - } + //} stage('Deploy') { steps { sh "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME} deploy" From 60e0b85f5b44af4e2454dae02e12cf254a4c6e93 Mon Sep 17 00:00:00 2001 From: Uday Chowdary Date: Thu, 3 Feb 2022 22:32:09 +0530 Subject: [PATCH 17/19] Updated Jenkins file --- Jenkinsfile.unix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index d97023428..55106bb75 100644 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -50,7 +50,7 @@ pipeline { sh "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${GROUP_ID}_${WBM_APPNAME} -DAPP_TLA=${APP_TLA} -DTARGET_INSTANCE=${TARGET_INSTANCE} -DTARGET_ENV =${TARGET_ENV} build" } }// End Build deployables - //stage('remove files'){ + stage('remove files'){ steps{ script{ dir("target/${GROUP_ID}_${WBM_APPNAME}/build/IS"){ @@ -70,7 +70,7 @@ pipeline { } } } - //} + } stage('Deploy') { steps { sh "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME} deploy" From 6f9e6e93266785308f008ae3b33404857fd035fe Mon Sep 17 00:00:00 2001 From: Uday Chowdary Date: Thu, 3 Feb 2022 22:33:39 +0530 Subject: [PATCH 18/19] Updated jenkins file --- Jenkinsfile.unix | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index 55106bb75..dda85066c 100644 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -50,27 +50,6 @@ pipeline { sh "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${GROUP_ID}_${WBM_APPNAME} -DAPP_TLA=${APP_TLA} -DTARGET_INSTANCE=${TARGET_INSTANCE} -DTARGET_ENV =${TARGET_ENV} build" } }// End Build deployables - stage('remove files'){ - steps{ - script{ - dir("target/${GROUP_ID}_${WBM_APPNAME}/build/IS"){ - string fileContents = new File("${env.WORKSPACE}/assets/IS/config-deployment/${APP_TLA}_DeploymentSet.txt") - println fileContents - files = findFiles glob: '*zip*' - println files - for(file in files){ - if (fileContents.contains("${file.name}")){ - println "keeping file: ${file.name}" - } - else { - println "deleting file ${file.name}" - sh "rm -f ${file.name}" - } - } - } - } - } - } stage('Deploy') { steps { sh "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME} deploy" From cdf10b119fb207c3b72b05971e9ed46216538c92 Mon Sep 17 00:00:00 2001 From: Uday Chowdary Date: Thu, 3 Feb 2022 22:50:37 +0530 Subject: [PATCH 19/19] updated jenkinsfle --- Jenkinsfile.unix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index dda85066c..5596ff27e 100644 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -55,11 +55,5 @@ pipeline { sh "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME} deploy" } } - stage('Test') { - steps { - sh "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME} test" - junit 'report/' - } - } } }