From 7d3803fea84bdae86f0af9aa9c472babbe24e851 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Wed, 5 Apr 2017 17:48:29 +0200 Subject: [PATCH 01/50] minor adjustments --- .../resources/reports/TEST-FibonachiTest.xml | 178 ++++++++++++++++++ build.xml | 29 ++- 2 files changed, 206 insertions(+), 1 deletion(-) create mode 100644 assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml diff --git a/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml b/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml new file mode 100644 index 000000000..b76ff70b4 --- /dev/null +++ b/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + junit.framework.AssertionFailedError: fibonachiNumber :Expected and actual objects don't match.: expected <89999> but was <8> + at com.wm.ps.test.WmAssert.assertIDataEquals(WmAssert.java:161) + at com.wm.ps.test.WmAssert.assertEquals(WmAssert.java:71) + at com.wm.ps.test.DefaultResultsValidator.assertValid(DefaultResultsValidator.java:163) + at com.wm.ps.test.WmTestCase.runInvoke(WmTestCase.java:1054) + at com.wm.ps.test.WmTestCase.runTest(WmTestCase.java:964) + + + + + + diff --git a/build.xml b/build.xml index d74e9386e..8108d8614 100644 --- a/build.xml +++ b/build.xml @@ -2,8 +2,10 @@ + + - + @@ -24,13 +26,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + From df0feae9041964399601cb8808907d95f28e5469 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Wed, 5 Apr 2017 19:34:56 +0200 Subject: [PATCH 02/50] consistent naming --- .gitignore | 2 ++ build.xml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..dd62b2650 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/logs + diff --git a/build.xml b/build.xml index 8108d8614..4d08a99b2 100644 --- a/build.xml +++ b/build.xml @@ -30,7 +30,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -49,7 +49,7 @@ - + From 3eab751e83c346203a8b811ef73d48f36ab48e84 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Thu, 6 Apr 2017 17:13:06 +0200 Subject: [PATCH 03/50] adjusted Jenkinsfile.unix to use new targets and structure --- .classpath | 6 + .gitignore | 3 +- .project | 17 ++ Jenkinsfile.unix | 83 ++++++--- Jenkinsfile.unix.bak | 22 +++ Jenkinsfile.win | 6 +- LICENSE | 0 README.md | 0 assets/BPM/.gitignore | 0 assets/IS/Packages/Fibonachi/.classpath | 0 assets/IS/Packages/Fibonachi/.project | 0 ...ag.ide.eclipse.pld.bundle.builder.ui.prefs | 0 assets/IS/Packages/Fibonachi/manifest.bak | 0 assets/IS/Packages/Fibonachi/manifest.v3 | 0 .../Packages/Fibonachi/ns/Fibonachi/node.idf | 0 .../services/getFibunachiNumber/flow.xml | 0 .../services/getFibunachiNumber/flow.xml.bak | 0 .../services/getFibunachiNumber/node.ndf | 0 .../Fibonachi/ns/Fibonachi/services/node.idf | 0 assets/IS/Packages/Fibonachi/pub/index.html | 0 assets/IS/Tests/FibonachiTest/.classpath | 0 assets/IS/Tests/FibonachiTest/.classpath.swp | Bin assets/IS/Tests/FibonachiTest/.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 assets/IS/Tests/FibonachiTest/bin/.gitignore | 0 .../resources/reports/TEST-FibonachiTest.xml | 161 +++++++++--------- .../test/xml/data/fibExpectedOutput.xml | 0 .../resources/test/xml/data/fibWrongInput.xml | 0 .../resources/test/xml/data/finInput.xml | 0 .../test/xml/data/mockSubstractIntWrong.xml | 0 .../test/xml/setup/FibonachiTest.xml | 0 assets/MWS/.gitignore | 0 build.xml | 14 +- fbr/IS/Fibonachi.acdl | 46 +++++ fbr/IS/Fibonachi.zip | Bin 0 -> 9102 bytes fbr/IS/_assets.obj | Bin 0 -> 244 bytes fbr/_compositeIndex | Bin 0 -> 121 bytes fbr/_index | Bin 0 -> 391 bytes project.properties | 1 + 39 files changed, 246 insertions(+), 113 deletions(-) create mode 100755 .classpath mode change 100644 => 100755 .gitignore create mode 100755 .project mode change 100644 => 100755 Jenkinsfile.unix create mode 100755 Jenkinsfile.unix.bak mode change 100644 => 100755 Jenkinsfile.win mode change 100644 => 100755 LICENSE mode change 100644 => 100755 README.md mode change 100644 => 100755 assets/BPM/.gitignore mode change 100644 => 100755 assets/IS/Packages/Fibonachi/.classpath mode change 100644 => 100755 assets/IS/Packages/Fibonachi/.project mode change 100644 => 100755 assets/IS/Packages/Fibonachi/.settings/com.softwareag.ide.eclipse.pld.bundle.builder.ui.prefs mode change 100644 => 100755 assets/IS/Packages/Fibonachi/manifest.bak mode change 100644 => 100755 assets/IS/Packages/Fibonachi/manifest.v3 mode change 100644 => 100755 assets/IS/Packages/Fibonachi/ns/Fibonachi/node.idf mode change 100644 => 100755 assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibunachiNumber/flow.xml mode change 100644 => 100755 assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibunachiNumber/flow.xml.bak mode change 100644 => 100755 assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibunachiNumber/node.ndf mode change 100644 => 100755 assets/IS/Packages/Fibonachi/ns/Fibonachi/services/node.idf mode change 100644 => 100755 assets/IS/Packages/Fibonachi/pub/index.html mode change 100644 => 100755 assets/IS/Tests/FibonachiTest/.classpath mode change 100644 => 100755 assets/IS/Tests/FibonachiTest/.classpath.swp mode change 100644 => 100755 assets/IS/Tests/FibonachiTest/.project mode change 100644 => 100755 assets/IS/Tests/FibonachiTest/.settings/org.eclipse.jdt.core.prefs mode change 100644 => 100755 assets/IS/Tests/FibonachiTest/bin/.gitignore mode change 100644 => 100755 assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibExpectedOutput.xml mode change 100644 => 100755 assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibWrongInput.xml mode change 100644 => 100755 assets/IS/Tests/FibonachiTest/resources/test/xml/data/finInput.xml mode change 100644 => 100755 assets/IS/Tests/FibonachiTest/resources/test/xml/data/mockSubstractIntWrong.xml mode change 100644 => 100755 assets/IS/Tests/FibonachiTest/resources/test/xml/setup/FibonachiTest.xml mode change 100644 => 100755 assets/MWS/.gitignore mode change 100644 => 100755 build.xml create mode 100755 fbr/IS/Fibonachi.acdl create mode 100755 fbr/IS/Fibonachi.zip create mode 100755 fbr/IS/_assets.obj create mode 100755 fbr/_compositeIndex create mode 100755 fbr/_index mode change 100644 => 100755 project.properties diff --git a/.classpath b/.classpath new file mode 100755 index 000000000..fb5011632 --- /dev/null +++ b/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index dd62b2650..c38e3d635 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /logs - +/assets/IS/**/resources/reports/* +/bin/ diff --git a/.project b/.project new file mode 100755 index 000000000..eebba2f43 --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + henning_webmethods-sample-project-layout + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix old mode 100644 new mode 100755 index 5e1870f78..ec4a7fcf0 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -1,22 +1,65 @@ pipeline { - agent any - - stages { - stage('Build'){ - steps { - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME} build" - } - } - stage('Deploy') { - steps { - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/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/AssetBuildEnvironment/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME} test" - junit 'report/' - } - } - } + agent any + + environment { + currentDir = "/home/waa/cce/henning_webmethods-sample-project-layout" + } + + stages { + stage('Build'){ + steps { + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} build" + } + } + stage('Deploy') { + steps { + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=DEV deploy" + } + } + stage('Test') { + steps { + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} test" + junit 'report/' + } + } + } } +// +// +//node { +// def currentDir = "/home/waa/cce/henning_webmethods-sample-project-layout" +// //def currentDir = "." +// +// stage('Build'){ +// sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} build" +// } +// stage('Deploy') { +// sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=DEV deploy" +// } +// stage('Test') { +// sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} test" +// junit 'report/' +// } +//} + +//node { +// def checkoutAndBuildbda.projectName = "checkout_and_build" +// def fbrArtifactName = "artifact.zip" +// stage("build") { +// //build("checkout_and_build") +// } +// stage("deployToTest") { +// echo "deploy to Test" +// step ([$class: 'CopyArtifact', +// bda.projectName: checkoutAndBuildbda.projectName, +// filter: "target/**/fbr/${fbrArtifactName}"]); +// build job: 'deployBuildGroovy', parameters: [string(name: 'target_env', value: "TEST"), string(name: 'fbr_location', value: "${env.WORKSPACE}/target/${checkoutAndBuildbda.projectName}/build/fbr/${fbrArtifactName}")] +// } +// stage("test") { +// echo "test on test" +// build("executeTest") +// } +// stage("deployToQA") { +// echo "deploy to QA" +// } +//} diff --git a/Jenkinsfile.unix.bak b/Jenkinsfile.unix.bak new file mode 100755 index 000000000..8e6938227 --- /dev/null +++ b/Jenkinsfile.unix.bak @@ -0,0 +1,22 @@ +pipeline { + agent any + + stages { + stage('Build'){ + steps { + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} build" + } + } + stage('Deploy') { + steps { + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} deploy" + } + } + stage('Test') { + steps { + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} test" + junit 'report/' + } + } + } +} diff --git a/Jenkinsfile.win b/Jenkinsfile.win old mode 100644 new mode 100755 index 72fd8c201..2656cd438 --- a/Jenkinsfile.win +++ b/Jenkinsfile.win @@ -4,17 +4,17 @@ pipeline { stages { stage('Build'){ steps { - bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME} build" + bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} build" } } stage('Deploy') { steps { - bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME} deploy" + bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} deploy" } } stage('Test') { steps { - bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME} test" + bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} test" junit 'report/' } } diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/assets/BPM/.gitignore b/assets/BPM/.gitignore old mode 100644 new mode 100755 diff --git a/assets/IS/Packages/Fibonachi/.classpath b/assets/IS/Packages/Fibonachi/.classpath old mode 100644 new mode 100755 diff --git a/assets/IS/Packages/Fibonachi/.project b/assets/IS/Packages/Fibonachi/.project old mode 100644 new mode 100755 diff --git a/assets/IS/Packages/Fibonachi/.settings/com.softwareag.ide.eclipse.pld.bundle.builder.ui.prefs b/assets/IS/Packages/Fibonachi/.settings/com.softwareag.ide.eclipse.pld.bundle.builder.ui.prefs old mode 100644 new mode 100755 diff --git a/assets/IS/Packages/Fibonachi/manifest.bak b/assets/IS/Packages/Fibonachi/manifest.bak old mode 100644 new mode 100755 diff --git a/assets/IS/Packages/Fibonachi/manifest.v3 b/assets/IS/Packages/Fibonachi/manifest.v3 old mode 100644 new mode 100755 diff --git a/assets/IS/Packages/Fibonachi/ns/Fibonachi/node.idf b/assets/IS/Packages/Fibonachi/ns/Fibonachi/node.idf old mode 100644 new mode 100755 diff --git a/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibunachiNumber/flow.xml b/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibunachiNumber/flow.xml old mode 100644 new mode 100755 diff --git a/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibunachiNumber/flow.xml.bak b/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibunachiNumber/flow.xml.bak old mode 100644 new mode 100755 diff --git a/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibunachiNumber/node.ndf b/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibunachiNumber/node.ndf old mode 100644 new mode 100755 diff --git a/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/node.idf b/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/node.idf old mode 100644 new mode 100755 diff --git a/assets/IS/Packages/Fibonachi/pub/index.html b/assets/IS/Packages/Fibonachi/pub/index.html old mode 100644 new mode 100755 diff --git a/assets/IS/Tests/FibonachiTest/.classpath b/assets/IS/Tests/FibonachiTest/.classpath old mode 100644 new mode 100755 diff --git a/assets/IS/Tests/FibonachiTest/.classpath.swp b/assets/IS/Tests/FibonachiTest/.classpath.swp old mode 100644 new mode 100755 diff --git a/assets/IS/Tests/FibonachiTest/.project b/assets/IS/Tests/FibonachiTest/.project old mode 100644 new mode 100755 diff --git a/assets/IS/Tests/FibonachiTest/.settings/org.eclipse.jdt.core.prefs b/assets/IS/Tests/FibonachiTest/.settings/org.eclipse.jdt.core.prefs old mode 100644 new mode 100755 diff --git a/assets/IS/Tests/FibonachiTest/bin/.gitignore b/assets/IS/Tests/FibonachiTest/bin/.gitignore old mode 100644 new mode 100755 diff --git a/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml b/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml index b76ff70b4..1b3653325 100644 --- a/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml +++ b/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml @@ -1,37 +1,43 @@ - + - - + + + - + + - - + + + - - + + + - + + - + + + - - - + + + - @@ -39,140 +45,133 @@ - + - - - - - - + + + + + + - - + - + - + - - - - + + + - - + + + - + - - - + + + - - - - - + + + - - + + - - + - + - - - + + + - + + + - + + - - + - + - - + - - + + - - + + + - - + - + + + + - - - + + + + - - + - - - - + + + + + - - junit.framework.AssertionFailedError: fibonachiNumber :Expected and actual objects don't match.: expected <89999> but was <8> - at com.wm.ps.test.WmAssert.assertIDataEquals(WmAssert.java:161) - at com.wm.ps.test.WmAssert.assertEquals(WmAssert.java:71) - at com.wm.ps.test.DefaultResultsValidator.assertValid(DefaultResultsValidator.java:163) - at com.wm.ps.test.WmTestCase.runInvoke(WmTestCase.java:1054) - at com.wm.ps.test.WmTestCase.runTest(WmTestCase.java:964) - - - + + diff --git a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibExpectedOutput.xml b/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibExpectedOutput.xml old mode 100644 new mode 100755 diff --git a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibWrongInput.xml b/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibWrongInput.xml old mode 100644 new mode 100755 diff --git a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/finInput.xml b/assets/IS/Tests/FibonachiTest/resources/test/xml/data/finInput.xml old mode 100644 new mode 100755 diff --git a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/mockSubstractIntWrong.xml b/assets/IS/Tests/FibonachiTest/resources/test/xml/data/mockSubstractIntWrong.xml old mode 100644 new mode 100755 diff --git a/assets/IS/Tests/FibonachiTest/resources/test/xml/setup/FibonachiTest.xml b/assets/IS/Tests/FibonachiTest/resources/test/xml/setup/FibonachiTest.xml old mode 100644 new mode 100755 diff --git a/assets/MWS/.gitignore b/assets/MWS/.gitignore old mode 100644 new mode 100755 diff --git a/build.xml b/build.xml old mode 100644 new mode 100755 index 4d08a99b2..c907f9bc4 --- a/build.xml +++ b/build.xml @@ -5,7 +5,7 @@ - + @@ -15,8 +15,6 @@ - - @@ -31,13 +29,13 @@ - - + + - + @@ -45,7 +43,7 @@ - + @@ -54,7 +52,7 @@ - + diff --git a/fbr/IS/Fibonachi.acdl b/fbr/IS/Fibonachi.acdl new file mode 100755 index 000000000..ec6175c9f --- /dev/null +++ b/fbr/IS/Fibonachi.acdl @@ -0,0 +1,46 @@ + + + + + + + true + + + true + + + true + + + true + + + false + + + false + + + 0 + + + false + + + true + + + + + + + + + + + + + + + diff --git a/fbr/IS/Fibonachi.zip b/fbr/IS/Fibonachi.zip new file mode 100755 index 0000000000000000000000000000000000000000..b25757088b6c50ae9cc0011c91501ae0abfc8583 GIT binary patch literal 9102 zcmbt)1yo!~v~2^y-CaU};FcI)YzO^t10_D;5DlVg#&pufvb3J6cNhZMJ5t0ht|S{)<8`7(@n@|*;R0)X`&Zp z;e6K;fuE&OB4lobFk77YU*_*)M%*jOp;Qi7H_KcPa+mPN+-`v#N&XC^P+<+dGRtDyVpg*SO28Oou4yN?hwuVM_K&gQq zT1x408cGQ%Af3clpfueC4Ump{pntIZZfv0uSAXBoOnIJ^WBrrxAx3$<43=EkGE$46q~*g+ z5||XDw;mQLZxfrKE0j@FYU+NmTl&>jbFDBDf|DtSBhVyS8>YP^cc8zbx!SjMqM#9* zr*d#0kz4gnz;e@?EKdS>>C@+6Kux{E4?LWUeOfUHW9m5eHjP@XUUl*IdM!lzp;GBt z6$?vTmeNY&SqIo~7LQ_=8W2THdv7F;aYQJarZ-<;g;PIXRb7feOFq=e{-Zk0#Lg&y ze%j|MR8xPuhDC43?jv~#6WprR9eNt^x)f7{ea$jWB?t%W= zp{A*mPdSEL)mS^>ZB@B!T`4m6np<%_*C~YVvaDGLadrjjkx_L!+q@G|<~ZmNa`E8H z5GTbYUa$s6v<+@KzGjT6a+2Wlk%x`ot(z3PUhDpQuzQ-*bcCmV2U4@@6!IPKZy*81 zasFogk_=GoQ;u=_Z`m|@)i^9M#7Ysdcln85@iB!ap6R4Bl~*WF>s$7C!tX(h5^LcD z2Mw`k0^QrMr{sqDMpT{qbGS_N7D)ueuby0nu2hh{ZE4gSCagYmY!NpTC)XzFD$Gk8 ziW}FcMDNMXX6CyhqcjUgl9fg`G!OTiBkHO$c8#+Eu4aBF=~EY6oUgk>flQ>aRN4vGoFl%;+Yua!S0ep){oYgL(-b zBr(rO1%8u=-lBPJ2tl%j9Aj3s8R5fp)ZIn7hH{7Uy2s8AH$=sv4AppzX9W~@%9DJFCrWXn`Giy^S-qSn zE7Jw~mJfalar`aNxr=2899MiYh_c#uxMnotVM3UhH>SS#!m-`;d z-Seb*@;}MmhaW$*PVMp;%H4-E7s|(*X58{(LWA>|K<>SUb(f8KNSm_}zT)kD&~08; z?!07&Jo}610;x;zszpAK+A{~cXErE3WYuCzPUM(Xux1$%a|B-i1R|xC#jDMFA$#vx za{J)ack^L8{^hr>(k)9Tf|*AC4_2ke9`LP3Uk&EzxaZHhQ+E1$I<9P}y&Lufk{@tl!)t_T+K+Qsp5EnB5-d)l9Mv|3MkNNCQF_UY`7oCw{`u2Jslv>0YK zaO;JFKXZrmT|QZ#*yu>L`I7mrk&?{KOGElC+t%$-bN8CU6T?+oiEw7ySDe<(bedCg z(2Em7s`KaJoTyTWP2+PaX>X5jmThr8@voUjN0pYli;{&4IG1;rf^$(2xZa4P`mXcB zd|jl6-!4PL@oA96)Q=D+iRPoouFJADW#y+(1T%~f&lbfsc%ByPCm_;R+~ zSu=;~HOw_1!!W-V2V-@|PF-opyK%qOR2uivMs1|(I5%c6-Li^;Gw@&)JUYVPW7?_h zr0M+9t?b-I`KnWA6&5^Z&d9c)29qSuCkrWxBac2$W4}RcTLH|F%mEaGD2`a~n-nwW z+a+#m9`Y1C^YotH7VQds3YYr%HA_y6P14Ua^-m$%lwm_!4zq)pHgSho(v4qhzOH?d zly02=j(Ia-&TH$NNif@)ImwRb886F1n#_f!B`jZ9Nua4z-=M;f=OZ!n*dodTxKIXR$P9!V6{s5+fm%>BWu-CoQF=*Y_$hP$Cz_PXV1_8Y zplJHqW-px=Ll~g+>hQKkv6K6Kf|VQHDzr_g))JD!VBN^hK%{i?DG^g_^gcoy0kD8TAl$x+?1vZgq$IMW3n1 ztBeS=kp}SHY~sr=1TC9dQWKuaC}6i{o{+`eRw#KYyKZd;2Nuhsx1}=cTX}ATNcYcw z$;0xNr^|zNQ)eKLJ}9v;$F!5iGxZ3jLYqqC3 z>) zkk=gY2;RIAKqN#9n7YJMl_b%O8q_)?oq)yw6?;MtE9A|Bgq$!-7 zloHJFw5~N$mk;Gv&ah#(Gg)~b;X1l&|Dx^9SV6G1=0dtX0{boKEX#*=3W7-RVAf15=Y z%`o?mxwTlFeKr_I>KEqSbJVu#j8(s2lgW>u*S3G9eIj@38gMj7m86C-z_ql!DWSGp(cGo$Z=QNWQ9z-*NJHGsvSSy|dKRfO{XE}HL7Gbk< zhPgzwmbHajLX;!U4DUviIi8?R9xA!J-Zz*e9CCeQyhWy@#NvH)TH%r@lyGyK9FK38 zOctMe=~dsOG}+y;QyWp@ZUBc8g{3z`=Gmbm=WJ357dSFHMWA#if;Nzn%iukh3Q|}; zX-QEemP?q?v2DcMvRPaT3!&F!vKuU9y?6I7EuK;*#g)`|?BY#K#);6iaR+N(;-cwk zcGI$fws6EQ^p>BvV>)>_@(I93afLW758T3zVu1JLJ9q5<8~})jg~fHum_HDJ;C0j= zbOD1j7r|eo04mpI8MWH_;Io}@q$!LQ1ZE#==e_3+T)bINpBzJJ24XeGo1uk^M5GX% zzYNBC6OijCO~Cn-oC3(xd}a?!+DKZJ*xTB6QQs-=SeDPq$~N1B_fv|V-?!U4nMN)Z295vNNl!ORk-BrrOrwW7Q* zw5_?M&Xp6m9nWiKC%j0F2%R>XT23vIX6Ze1-HZ+JjZxvN|0f zy)Op*wmM_46oKeKk3y$xwuJH0Se~XM?||~ijVay96pqv#cuw;j$uyR8`;VL@n=M01fspit>H9LqOd9)+TSauw@kWPqnKtgu(XQ1{#jye~15+IF zjSD42y|@YCZgA-9)LdZF>{#1P-;W}ZNvk^}Vx^Dw!VQf8DG+QmrQ<#iB)+4pjEj2W zl#p5z@~P-NN}=jv{!Z%jja9ww<|RgXY5GCBch$v~D5^UqLK6~IDmZsCuQZP<4&?eB zU0V7Vgl<`#I09yj57qApN#DKC-*s63L$$k^lJGO zJoA{E_o^!@N1#&9cm4)qiV7eIfXNN+QbOWzfV#R*yu5xlMq`@b8N~&1)Vln?Z7^F-W4GD7`W#IEn3Bkyh@? zz(#iIwQNM_etHFfc%?wCqXYis$vap8I-r~N9fIULkOSBVY)%`3_pwqC1S9kw?01#U(!yj=raHVwzYneYdzROqcA_^xW}C2m z9fA9%NqHQfjZJJdm$*TzaB6g=gF0EO&Q?!N2zhQ#xvRf<`D|VDPJQ6%YBC}QK4n#< z^h*5xoYi%5XSqyM6f;j=q!zPo#7<3yfy0D>YF=f`svSW>sxvx+Mn44hc~gCJpw^zn z;{AMh?0KteC1`tn8Fml-SSygSe+cV=1_0h{{Ha#>Pp2N=kB2M`jP~NC!jl+L{12`$ zySFQQEDK^?#Z(lxmDKXKb;tKGUm20?<0W1DkUca(7?dx!A#GV?&!KSXFW?Sx`mfy; zp~ykbSd%NSI=&SojgZXNSf@F@-MQ&vSmjCm8rPg>t+UWABi30?sit)1BQ^rA)UH5V zdV?mG3|py5pJ@Cs#%2dg^65wEDU!aExH~}_Jdf1HlvcbCBc|~ba#GCvp{l4kL045D zIQu#pq%w!OVb)w)*DAVGMe<&=XU)^QWLgpM7#*wzE2z7$0W|GQOmLq6sfl=%`yOf!(7m3Mopp<$GI# zRV!;o%|$z&xQ|S`p7sJ44{f|RiBkm?En9X5vF=;Vft4mpp$z?g?8A0^pR3W-4Pw*s zNMhdI!5*qHpI~pHlX_#M_cp;PL?<UwnghgP|8u*M#tI9z(LEd zyy=i}cC}pL5IoDFCb|NNV7sfS7O8F%h{+C<*1LK1vNhT5CuU)>oCbr-{%0?ouxJh| zdTT^&oHCaCl?Su}?j1I@zh7RQvNS10l_5TC1-;zdK|SONdpB@Kc46-+N?S?tC7mkk znE$gSd_q9PYeA?uivc%Yy;B7?@A#6doiFCS}SJh6xvi_&N-i&kgv2)My0o zEgG-n-|w5hram1`Z70q`Cp~1lpe%^r$R*Z>%%zasXe^Z_V^^jgAR*)P8NbO&uP>4k z`9P7Izt6^?^1y4Gutb;onm}9>m;r#zpu7#KdGUEVGHzEqALtBMxq(4VbEI#GDj?g5 zKZ<*SX!u2Kw?7cQ`6H`h|M-F!qu>m&xJS6jO$o&M%$WcF{&Ie@G|g4IgNM?o#{QW@ z4-iE|;8<--T_!tr{Z;&+OnAVy6am91Qp{Rrp*h#h_u0}<;4d)NQa)Q4xKBI9B``Pf^v^ zrEhLzClZ9A@h`O1KPkX6&%|TB0XHb7eG@A-b~E2SvVpFTUGO^Eig++WJkrS^gEdF8 z%wAig}(eUZ!IJUYNw|&kC-}%l2-(d|h&Jf_;qixNK#wm+8uZ0RYZWe;SBK zxdn7OZuQ1c-#%N8U%HJEg=6`W_OFK4wW4GL%^*(1Bi7WwL7E>cUfXJW(@j z;<`FujIFEBdE$V8DWuw$0}5$2A3a$$@?-X>{i{!5C3Rwh-?VSKllDb0q^DL5z9ZJz zx^Ko0k_{s{Gu25fWVv_i-|a)Eco0ARw)IvRNj5QD+x~oQ@i9Jj-J96kAodKPWc_zV z=6j<4tvmdeV{inJZwp;ZQzJt=`^R@ekD+>`Rz?KKp+;>~mjG~dK|J4x4;XEl+oa})9wo--IYwMs~? z)7G=C{=&8lu&vjOrql8X=!zFqc~sTtWEKB0Pn-DBr_e#;RrP&BgMniJe$}M^5|tk{ z>0j*^>F#gM>mSrAS>Ug3e^zxL73m+Q3cCGgw|_~4zx#T`{?)}t9r%YafJpt~>v!nS z66&K0{KL#a&|fv--?2XnoP0lkpgVC;Z~lKJ*WX+FS%-WSO@G)1sI^~6{@=vuQLy}B zMWFfki;KU9^7n51eEj!Vxc{)zfA#SX>F}3$`Mdj{-xwax5Pw(`XfFSA7ysb?argMW ziJ!}?Um0v;{D&s~dJ*~E{m;e2;}-bCaBzOE+f3pH@1hPO#P;mzUpn-nYLC&MTuR;F@7b)aZ literal 0 HcmV?d00001 diff --git a/fbr/IS/_assets.obj b/fbr/IS/_assets.obj new file mode 100755 index 0000000000000000000000000000000000000000..a84a6f02c60d00031bbf0eb1a00bc7c0964b229e GIT binary patch literal 244 zcmZ4UmVvdnh(Rzbu`E%qv?Mb}&m*xo!#A;jmHpPi!(s^+nHiYe7`Srs6I0w0lS}f8 zJQ+AkGKx}*GxBp%Dhli!7(jrhoC8P-05M|;1D{)FQhr`yaz>_JVsc6j&~&-v{9L`_ z#B?xU&pAK0Aip@XB-OE~Br^?YXm*_QjE_PGEtwdYeHhpii;GiBJY7l{gnU4b($7iE zOVfki6{N*Fldt^f(K Rl`wEv>KPj88R!{Q006VpOP~M% literal 0 HcmV?d00001 diff --git a/fbr/_compositeIndex b/fbr/_compositeIndex new file mode 100755 index 0000000000000000000000000000000000000000..573fd8ba765cc9f07bd5f0b4d6e8d5e1606518da GIT binary patch literal 121 zcmZ4UmVvdnh(Rzbu`E%qv?Mb}&m*xo!#A;jmHpPi!(s^+nHiYe7`Srs6I0w0lS}f8 zJQ+AkGKx}*GxBp%Dhli!7(jrhoC8P-05M|;1D|KGii(O`W>S7$Vsb`i34^enzGtvL MTtF`|IVGn80NfTMlK=n! literal 0 HcmV?d00001 diff --git a/fbr/_index b/fbr/_index new file mode 100755 index 0000000000000000000000000000000000000000..df1a2ed54009c2675f87cbd1bafadb852f0b42fd GIT binary patch literal 391 zcmZ4UmVvdnh(Rzbu`E%qv?Mb}&m*xo!#A;jmHpPi!(s^+nHiYe7`Srs6I0w0lS}f8 zJQ+AkGKx}*GxBp%Dhli!7(jrhoC8P-05MAmgP3Qqm0M;~eqLg7My8%#acW6PW?p(R z&=z5YEsjM+iIqN?#U&Mumt7_A@&dIkq1CTAz6r|Q8?Cf)!I6uXO4i^?*SQ;YS| VQ%it`m4f~4SDKrYT12do6#)E@a_;~D literal 0 HcmV?d00001 diff --git a/project.properties b/project.properties old mode 100644 new mode 100755 index cab56bf97..442461288 --- a/project.properties +++ b/project.properties @@ -4,6 +4,7 @@ #Asset paths # Use slash "/" as path separator. Example: Use "C:/SoftwareAG", instead of "C:\SoftwareAG". isPackages=./assets/IS/Packages +# location of the WmTestSuite tests isTests=./assets/IS/Tests bpmProjects=./assets/BPM/ mwsProjects=./assets/MWS/ From 4055cba917b8568abbc2ae6ad0e9fcd65a197a2c Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Thu, 6 Apr 2017 19:11:54 +0200 Subject: [PATCH 04/50] moved ENV.groovy here from sagdevops-ci-assets, since this file is project specific --- ENV.groovy | 142 ++++++++++++++++++ .../resources/reports/TEST-FibonachiTest.xml | 37 +++-- build.xml | 82 +++++----- project.properties | 2 + 4 files changed, 203 insertions(+), 60 deletions(-) create mode 100755 ENV.groovy diff --git a/ENV.groovy b/ENV.groovy new file mode 100755 index 000000000..89fd54785 --- /dev/null +++ b/ENV.groovy @@ -0,0 +1,142 @@ +environments { + DEV { + IntegrationServers { + is_node1 { + host = "localhost" + port = "8094" + username = "Administrator" + pwd = "manage" + useSSL = "false" + version = "9.12" + installDeployerResource = "true" + test = "true" + } + } + } + TEST { + IntegrationServers { + is_node1 { + host = "localhost" + port = "8094" + username = "Administrator" + pwd = "manage" + useSSL = "false" + version = "9.12" + installDeployerResource = "true" + test = "true" + } + } + } + QA { + IntegrationServers { + is_node1 { + host = "localhost" + port = "8094" + username = "Administrator" + pwd = "manage" + useSSL = "false" + version = "9.12" + installDeployerResource = "true" + test = "true" + } + is_node2 { + host = "localhost" + port = "8094" + username = "Administrator" + pwd = "manage" + useSSL = "false" + version = "9.12" + installDeployerResource = "true" + test = "true" + } + } + } + PRE_PROD_WITH_MWS_AND_BPM { + IntegrationServers { + is_node1 { + host = "localhost" + port = "8080" + username = "Administrator" + pwd = "manage" + useSSL = "false" + version = "9.10" + installDeployerResource = "true" + test = "true" + } + is_node2 { + host = "localhost" + port = "8080" + username = "Administrator" + pwd = "manage" + useSSL = "false" + version = "9.10" + installDeployerResource = "true" + test = "true" + } + } + ProcessModels { + bpm_node1 { + host = "localhost" + port = "5555" + username = "Administrator" + pwd = "manage" + useSSL = "false" + version = "9.10" + test = "true" + } + bpm_node2 { + host = "localhost" + port = "5555" + username = "Administrator" + pwd = "manage" + useSSL = "false" + version = "9.10" + test = "true" + } + } + MWS { + mws_node1 { + host = "localhost" + port = "5555" + username = "Administrator" + pwd = "manage" + useSSL = "false" + version = "9.10" + test = "true" + excludeCoreTaskEngineDependencies = "true" + cacheTimeOut = "0" + includeSecurityDependencies = "true" + rootFolderAliases = "folder.public" + maximumFolderObjectCount = "8000" + enableAddtionalLogging = "true" + maxFolderDepth = "25" + } + } + } + PROD { + IntegrationServers { + is_node1 { + host = "localhost" + port = "8080" + username = "Administrator" + pwd = "manage" + useSSL = "false" + version = "9.10" + installDeployerResource = "true" + test = "true" + executeACL = "Administrator" + } + is_node2 { + host = "localhost" + port = "8080" + username = "Administrator" + pwd = "manage" + useSSL = "false" + version = "9.10" + installDeployerResource = "true" + test = "true" + executeACL = "Administrator" + } + } + } +} diff --git a/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml b/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml index 1b3653325..2b9f729b0 100644 --- a/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml +++ b/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml @@ -1,11 +1,11 @@ - + - + @@ -26,7 +26,6 @@ - @@ -51,10 +50,10 @@ - - + + - + @@ -64,17 +63,17 @@ - - + - + + @@ -85,13 +84,13 @@ - - + + @@ -104,7 +103,7 @@ - + @@ -126,10 +125,8 @@ - - @@ -139,10 +136,9 @@ - - + @@ -154,7 +150,7 @@ - + @@ -165,13 +161,14 @@ - + + - - + + diff --git a/build.xml b/build.xml index c907f9bc4..fcf4bb0aa 100755 --- a/build.xml +++ b/build.xml @@ -1,64 +1,66 @@ - - - - + + + + - + + + + + + + + + + + - - - - - - - - - - + + - + - - - + + + - - - + + + - - + + - - - - - - - - + + + + + + + + - - - - + + + + - + - - + + - + diff --git a/project.properties b/project.properties index 442461288..a3390c533 100755 --- a/project.properties +++ b/project.properties @@ -12,6 +12,8 @@ rulesProjects=./assets/Rules/ #Should always be named UniversalMessaging umExport=./assets/UniversalMessaging +config.environments=ENV.groovy + From 2d83b26d5ebe40f3569d79097477043e26a58a15 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Fri, 7 Apr 2017 10:12:41 +0200 Subject: [PATCH 05/50] cleanup and readme --- Jenkinsfile.unix | 58 +++++++++--------------------------------- Jenkinsfile.unix.bak | 22 ---------------- Jenkinsfile.win | 45 +++++++++++++++++++------------- README.md | 11 +++++--- fbr/IS/Fibonachi.acdl | 46 --------------------------------- fbr/IS/Fibonachi.zip | Bin 9102 -> 0 bytes fbr/IS/_assets.obj | Bin 244 -> 0 bytes fbr/_compositeIndex | Bin 121 -> 0 bytes fbr/_index | Bin 391 -> 0 bytes 9 files changed, 47 insertions(+), 135 deletions(-) delete mode 100755 Jenkinsfile.unix.bak delete mode 100755 fbr/IS/Fibonachi.acdl delete mode 100755 fbr/IS/Fibonachi.zip delete mode 100755 fbr/IS/_assets.obj delete mode 100755 fbr/_compositeIndex delete mode 100755 fbr/_index diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index ec4a7fcf0..13a29e2f2 100755 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -2,64 +2,30 @@ pipeline { agent any environment { - currentDir = "/home/waa/cce/henning_webmethods-sample-project-layout" + currentDir = "." } stages { stage('Build'){ steps { + echo "Build stage" sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} build" } } - stage('Deploy') { + stage('DeployToTest') { steps { - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=DEV deploy" + echo "Deploy stage" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST deploy" + echo "Executing tests" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} test" + junit 'report/' } } - stage('Test') { + stage('QA') { steps { - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} test" - junit 'report/' + echo "QA stage" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA deploy" } } } -} -// -// -//node { -// def currentDir = "/home/waa/cce/henning_webmethods-sample-project-layout" -// //def currentDir = "." -// -// stage('Build'){ -// sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} build" -// } -// stage('Deploy') { -// sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=DEV deploy" -// } -// stage('Test') { -// sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} test" -// junit 'report/' -// } -//} - -//node { -// def checkoutAndBuildbda.projectName = "checkout_and_build" -// def fbrArtifactName = "artifact.zip" -// stage("build") { -// //build("checkout_and_build") -// } -// stage("deployToTest") { -// echo "deploy to Test" -// step ([$class: 'CopyArtifact', -// bda.projectName: checkoutAndBuildbda.projectName, -// filter: "target/**/fbr/${fbrArtifactName}"]); -// build job: 'deployBuildGroovy', parameters: [string(name: 'target_env', value: "TEST"), string(name: 'fbr_location', value: "${env.WORKSPACE}/target/${checkoutAndBuildbda.projectName}/build/fbr/${fbrArtifactName}")] -// } -// stage("test") { -// echo "test on test" -// build("executeTest") -// } -// stage("deployToQA") { -// echo "deploy to QA" -// } -//} +} \ No newline at end of file diff --git a/Jenkinsfile.unix.bak b/Jenkinsfile.unix.bak deleted file mode 100755 index 8e6938227..000000000 --- a/Jenkinsfile.unix.bak +++ /dev/null @@ -1,22 +0,0 @@ -pipeline { - agent any - - stages { - stage('Build'){ - steps { - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} build" - } - } - stage('Deploy') { - steps { - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} deploy" - } - } - stage('Test') { - steps { - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} test" - junit 'report/' - } - } - } -} diff --git a/Jenkinsfile.win b/Jenkinsfile.win index 2656cd438..325d308a7 100755 --- a/Jenkinsfile.win +++ b/Jenkinsfile.win @@ -1,22 +1,31 @@ pipeline { agent any + + environment { + currentDir = "." + } - stages { - stage('Build'){ - steps { - bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} build" - } - } - stage('Deploy') { - steps { - bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} deploy" - } - } - stage('Test') { - steps { - bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} test" - junit 'report/' - } - } - } + stages { + stage('Build'){ + steps { + echo "Build stage" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} build" + } + } + stage('DeployToTest') { + steps { + echo "Deploy stage" + bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST deploy" + echo "Executing tests" + bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} test" + junit 'report/' + } + } + stage('QA') { + steps { + echo "QA stage" + bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA deploy" + } + } + } } diff --git a/README.md b/README.md index 7aeedb560..dad668865 100755 --- a/README.md +++ b/README.md @@ -1,16 +1,21 @@ # webmethods-sample-project-layout -Sample project layout for webMethods assets. This sample also demostrates CI quick set up together with https://github.com/SoftwareAG/sagdevops-ci-assets +Sample project layout for webMethods assets. This sample also demonstrates CI quick set up together with https://github.com/SoftwareAG/sagdevops-ci-assets ## Jump Start with webMethods Structure The best way to start your webMethods project would be to fork this repo directly in github. This will allow you to directly have a set-up copy of layout that will be completely under your control. ## Description -This sample webMethods project layout should serve as a template for organising webMethods projects. It contains demo Integration Server packages with flow services and wM Unit Tests that are covering those. -Fork the repository to easily create fundament for you webMethods project. +This sample webMethods project layout should serve as a template for organizing webMethods projects. It contains demo Integration Server packages with flow services and wM Unit Tests that are covering those. +Fork the repository to easily create a basis for you webMethods project. ## CI (continuous integration) Jenkinsfiles.win and Jenkinfiles.unix in the root of the project contain Jenkins Pipeline declaration. With these and our [DevOps asset library for version 9.x and 10.0](https://github.com/SoftwareAG/sagdevops-ci-assets) you will be able to set up you CI in a matter of minutes. +## Environments + +The file ENV.groovy defines all you environments, e.g. DEV, TEST, QA, PROD. Adjust this file to your infrastructure, i.e. change hosts and ports, adjust the Administrator user and password. + +Note that the Jenkinsfiles reference the environments defined in the EVN.groovy by using the parameter "bda.targetEnv". diff --git a/fbr/IS/Fibonachi.acdl b/fbr/IS/Fibonachi.acdl deleted file mode 100755 index ec6175c9f..000000000 --- a/fbr/IS/Fibonachi.acdl +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - true - - - true - - - true - - - true - - - false - - - false - - - 0 - - - false - - - true - - - - - - - - - - - - - - - diff --git a/fbr/IS/Fibonachi.zip b/fbr/IS/Fibonachi.zip deleted file mode 100755 index b25757088b6c50ae9cc0011c91501ae0abfc8583..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9102 zcmbt)1yo!~v~2^y-CaU};FcI)YzO^t10_D;5DlVg#&pufvb3J6cNhZMJ5t0ht|S{)<8`7(@n@|*;R0)X`&Zp z;e6K;fuE&OB4lobFk77YU*_*)M%*jOp;Qi7H_KcPa+mPN+-`v#N&XC^P+<+dGRtDyVpg*SO28Oou4yN?hwuVM_K&gQq zT1x408cGQ%Af3clpfueC4Ump{pntIZZfv0uSAXBoOnIJ^WBrrxAx3$<43=EkGE$46q~*g+ z5||XDw;mQLZxfrKE0j@FYU+NmTl&>jbFDBDf|DtSBhVyS8>YP^cc8zbx!SjMqM#9* zr*d#0kz4gnz;e@?EKdS>>C@+6Kux{E4?LWUeOfUHW9m5eHjP@XUUl*IdM!lzp;GBt z6$?vTmeNY&SqIo~7LQ_=8W2THdv7F;aYQJarZ-<;g;PIXRb7feOFq=e{-Zk0#Lg&y ze%j|MR8xPuhDC43?jv~#6WprR9eNt^x)f7{ea$jWB?t%W= zp{A*mPdSEL)mS^>ZB@B!T`4m6np<%_*C~YVvaDGLadrjjkx_L!+q@G|<~ZmNa`E8H z5GTbYUa$s6v<+@KzGjT6a+2Wlk%x`ot(z3PUhDpQuzQ-*bcCmV2U4@@6!IPKZy*81 zasFogk_=GoQ;u=_Z`m|@)i^9M#7Ysdcln85@iB!ap6R4Bl~*WF>s$7C!tX(h5^LcD z2Mw`k0^QrMr{sqDMpT{qbGS_N7D)ueuby0nu2hh{ZE4gSCagYmY!NpTC)XzFD$Gk8 ziW}FcMDNMXX6CyhqcjUgl9fg`G!OTiBkHO$c8#+Eu4aBF=~EY6oUgk>flQ>aRN4vGoFl%;+Yua!S0ep){oYgL(-b zBr(rO1%8u=-lBPJ2tl%j9Aj3s8R5fp)ZIn7hH{7Uy2s8AH$=sv4AppzX9W~@%9DJFCrWXn`Giy^S-qSn zE7Jw~mJfalar`aNxr=2899MiYh_c#uxMnotVM3UhH>SS#!m-`;d z-Seb*@;}MmhaW$*PVMp;%H4-E7s|(*X58{(LWA>|K<>SUb(f8KNSm_}zT)kD&~08; z?!07&Jo}610;x;zszpAK+A{~cXErE3WYuCzPUM(Xux1$%a|B-i1R|xC#jDMFA$#vx za{J)ack^L8{^hr>(k)9Tf|*AC4_2ke9`LP3Uk&EzxaZHhQ+E1$I<9P}y&Lufk{@tl!)t_T+K+Qsp5EnB5-d)l9Mv|3MkNNCQF_UY`7oCw{`u2Jslv>0YK zaO;JFKXZrmT|QZ#*yu>L`I7mrk&?{KOGElC+t%$-bN8CU6T?+oiEw7ySDe<(bedCg z(2Em7s`KaJoTyTWP2+PaX>X5jmThr8@voUjN0pYli;{&4IG1;rf^$(2xZa4P`mXcB zd|jl6-!4PL@oA96)Q=D+iRPoouFJADW#y+(1T%~f&lbfsc%ByPCm_;R+~ zSu=;~HOw_1!!W-V2V-@|PF-opyK%qOR2uivMs1|(I5%c6-Li^;Gw@&)JUYVPW7?_h zr0M+9t?b-I`KnWA6&5^Z&d9c)29qSuCkrWxBac2$W4}RcTLH|F%mEaGD2`a~n-nwW z+a+#m9`Y1C^YotH7VQds3YYr%HA_y6P14Ua^-m$%lwm_!4zq)pHgSho(v4qhzOH?d zly02=j(Ia-&TH$NNif@)ImwRb886F1n#_f!B`jZ9Nua4z-=M;f=OZ!n*dodTxKIXR$P9!V6{s5+fm%>BWu-CoQF=*Y_$hP$Cz_PXV1_8Y zplJHqW-px=Ll~g+>hQKkv6K6Kf|VQHDzr_g))JD!VBN^hK%{i?DG^g_^gcoy0kD8TAl$x+?1vZgq$IMW3n1 ztBeS=kp}SHY~sr=1TC9dQWKuaC}6i{o{+`eRw#KYyKZd;2Nuhsx1}=cTX}ATNcYcw z$;0xNr^|zNQ)eKLJ}9v;$F!5iGxZ3jLYqqC3 z>) zkk=gY2;RIAKqN#9n7YJMl_b%O8q_)?oq)yw6?;MtE9A|Bgq$!-7 zloHJFw5~N$mk;Gv&ah#(Gg)~b;X1l&|Dx^9SV6G1=0dtX0{boKEX#*=3W7-RVAf15=Y z%`o?mxwTlFeKr_I>KEqSbJVu#j8(s2lgW>u*S3G9eIj@38gMj7m86C-z_ql!DWSGp(cGo$Z=QNWQ9z-*NJHGsvSSy|dKRfO{XE}HL7Gbk< zhPgzwmbHajLX;!U4DUviIi8?R9xA!J-Zz*e9CCeQyhWy@#NvH)TH%r@lyGyK9FK38 zOctMe=~dsOG}+y;QyWp@ZUBc8g{3z`=Gmbm=WJ357dSFHMWA#if;Nzn%iukh3Q|}; zX-QEemP?q?v2DcMvRPaT3!&F!vKuU9y?6I7EuK;*#g)`|?BY#K#);6iaR+N(;-cwk zcGI$fws6EQ^p>BvV>)>_@(I93afLW758T3zVu1JLJ9q5<8~})jg~fHum_HDJ;C0j= zbOD1j7r|eo04mpI8MWH_;Io}@q$!LQ1ZE#==e_3+T)bINpBzJJ24XeGo1uk^M5GX% zzYNBC6OijCO~Cn-oC3(xd}a?!+DKZJ*xTB6QQs-=SeDPq$~N1B_fv|V-?!U4nMN)Z295vNNl!ORk-BrrOrwW7Q* zw5_?M&Xp6m9nWiKC%j0F2%R>XT23vIX6Ze1-HZ+JjZxvN|0f zy)Op*wmM_46oKeKk3y$xwuJH0Se~XM?||~ijVay96pqv#cuw;j$uyR8`;VL@n=M01fspit>H9LqOd9)+TSauw@kWPqnKtgu(XQ1{#jye~15+IF zjSD42y|@YCZgA-9)LdZF>{#1P-;W}ZNvk^}Vx^Dw!VQf8DG+QmrQ<#iB)+4pjEj2W zl#p5z@~P-NN}=jv{!Z%jja9ww<|RgXY5GCBch$v~D5^UqLK6~IDmZsCuQZP<4&?eB zU0V7Vgl<`#I09yj57qApN#DKC-*s63L$$k^lJGO zJoA{E_o^!@N1#&9cm4)qiV7eIfXNN+QbOWzfV#R*yu5xlMq`@b8N~&1)Vln?Z7^F-W4GD7`W#IEn3Bkyh@? zz(#iIwQNM_etHFfc%?wCqXYis$vap8I-r~N9fIULkOSBVY)%`3_pwqC1S9kw?01#U(!yj=raHVwzYneYdzROqcA_^xW}C2m z9fA9%NqHQfjZJJdm$*TzaB6g=gF0EO&Q?!N2zhQ#xvRf<`D|VDPJQ6%YBC}QK4n#< z^h*5xoYi%5XSqyM6f;j=q!zPo#7<3yfy0D>YF=f`svSW>sxvx+Mn44hc~gCJpw^zn z;{AMh?0KteC1`tn8Fml-SSygSe+cV=1_0h{{Ha#>Pp2N=kB2M`jP~NC!jl+L{12`$ zySFQQEDK^?#Z(lxmDKXKb;tKGUm20?<0W1DkUca(7?dx!A#GV?&!KSXFW?Sx`mfy; zp~ykbSd%NSI=&SojgZXNSf@F@-MQ&vSmjCm8rPg>t+UWABi30?sit)1BQ^rA)UH5V zdV?mG3|py5pJ@Cs#%2dg^65wEDU!aExH~}_Jdf1HlvcbCBc|~ba#GCvp{l4kL045D zIQu#pq%w!OVb)w)*DAVGMe<&=XU)^QWLgpM7#*wzE2z7$0W|GQOmLq6sfl=%`yOf!(7m3Mopp<$GI# zRV!;o%|$z&xQ|S`p7sJ44{f|RiBkm?En9X5vF=;Vft4mpp$z?g?8A0^pR3W-4Pw*s zNMhdI!5*qHpI~pHlX_#M_cp;PL?<UwnghgP|8u*M#tI9z(LEd zyy=i}cC}pL5IoDFCb|NNV7sfS7O8F%h{+C<*1LK1vNhT5CuU)>oCbr-{%0?ouxJh| zdTT^&oHCaCl?Su}?j1I@zh7RQvNS10l_5TC1-;zdK|SONdpB@Kc46-+N?S?tC7mkk znE$gSd_q9PYeA?uivc%Yy;B7?@A#6doiFCS}SJh6xvi_&N-i&kgv2)My0o zEgG-n-|w5hram1`Z70q`Cp~1lpe%^r$R*Z>%%zasXe^Z_V^^jgAR*)P8NbO&uP>4k z`9P7Izt6^?^1y4Gutb;onm}9>m;r#zpu7#KdGUEVGHzEqALtBMxq(4VbEI#GDj?g5 zKZ<*SX!u2Kw?7cQ`6H`h|M-F!qu>m&xJS6jO$o&M%$WcF{&Ie@G|g4IgNM?o#{QW@ z4-iE|;8<--T_!tr{Z;&+OnAVy6am91Qp{Rrp*h#h_u0}<;4d)NQa)Q4xKBI9B``Pf^v^ zrEhLzClZ9A@h`O1KPkX6&%|TB0XHb7eG@A-b~E2SvVpFTUGO^Eig++WJkrS^gEdF8 z%wAig}(eUZ!IJUYNw|&kC-}%l2-(d|h&Jf_;qixNK#wm+8uZ0RYZWe;SBK zxdn7OZuQ1c-#%N8U%HJEg=6`W_OFK4wW4GL%^*(1Bi7WwL7E>cUfXJW(@j z;<`FujIFEBdE$V8DWuw$0}5$2A3a$$@?-X>{i{!5C3Rwh-?VSKllDb0q^DL5z9ZJz zx^Ko0k_{s{Gu25fWVv_i-|a)Eco0ARw)IvRNj5QD+x~oQ@i9Jj-J96kAodKPWc_zV z=6j<4tvmdeV{inJZwp;ZQzJt=`^R@ekD+>`Rz?KKp+;>~mjG~dK|J4x4;XEl+oa})9wo--IYwMs~? z)7G=C{=&8lu&vjOrql8X=!zFqc~sTtWEKB0Pn-DBr_e#;RrP&BgMniJe$}M^5|tk{ z>0j*^>F#gM>mSrAS>Ug3e^zxL73m+Q3cCGgw|_~4zx#T`{?)}t9r%YafJpt~>v!nS z66&K0{KL#a&|fv--?2XnoP0lkpgVC;Z~lKJ*WX+FS%-WSO@G)1sI^~6{@=vuQLy}B zMWFfki;KU9^7n51eEj!Vxc{)zfA#SX>F}3$`Mdj{-xwax5Pw(`XfFSA7ysb?argMW ziJ!}?Um0v;{D&s~dJ*~E{m;e2;}-bCaBzOE+f3pH@1hPO#P;mzUpn-nYLC&MTuR;F@7b)aZ diff --git a/fbr/IS/_assets.obj b/fbr/IS/_assets.obj deleted file mode 100755 index a84a6f02c60d00031bbf0eb1a00bc7c0964b229e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 244 zcmZ4UmVvdnh(Rzbu`E%qv?Mb}&m*xo!#A;jmHpPi!(s^+nHiYe7`Srs6I0w0lS}f8 zJQ+AkGKx}*GxBp%Dhli!7(jrhoC8P-05M|;1D{)FQhr`yaz>_JVsc6j&~&-v{9L`_ z#B?xU&pAK0Aip@XB-OE~Br^?YXm*_QjE_PGEtwdYeHhpii;GiBJY7l{gnU4b($7iE zOVfki6{N*Fldt^f(K Rl`wEv>KPj88R!{Q006VpOP~M% diff --git a/fbr/_compositeIndex b/fbr/_compositeIndex deleted file mode 100755 index 573fd8ba765cc9f07bd5f0b4d6e8d5e1606518da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121 zcmZ4UmVvdnh(Rzbu`E%qv?Mb}&m*xo!#A;jmHpPi!(s^+nHiYe7`Srs6I0w0lS}f8 zJQ+AkGKx}*GxBp%Dhli!7(jrhoC8P-05M|;1D|KGii(O`W>S7$Vsb`i34^enzGtvL MTtF`|IVGn80NfTMlK=n! diff --git a/fbr/_index b/fbr/_index deleted file mode 100755 index df1a2ed54009c2675f87cbd1bafadb852f0b42fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmZ4UmVvdnh(Rzbu`E%qv?Mb}&m*xo!#A;jmHpPi!(s^+nHiYe7`Srs6I0w0lS}f8 zJQ+AkGKx}*GxBp%Dhli!7(jrhoC8P-05MAmgP3Qqm0M;~eqLg7My8%#acW6PW?p(R z&=z5YEsjM+iIqN?#U&Mumt7_A@&dIkq1CTAz6r|Q8?Cf)!I6uXO4i^?*SQ;YS| VQ%it`m4f~4SDKrYT12do6#)E@a_;~D From a5bf89ad4b88cf7a8186f41cacdaaf1055d7292f Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Wed, 12 Apr 2017 10:37:07 +0200 Subject: [PATCH 06/50] artifactory integration --- Jenkinsfile.unix | 43 ++++++++++++++++++++++++++++++++++++++++++- build.xml | 7 ++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index 13a29e2f2..be8019130 100755 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -2,7 +2,11 @@ pipeline { agent any environment { - currentDir = "." + currentDir = "/home/waa/cce/henning_webmethods-sample-project-layout" + artifactoryServerName = "localArtifactory" + artifactoryFileSpecName = "${env.JOB_NAME}.${env.BUILD_NUMBER}.filespec.json" + artifactoryUploadFileSpecName = "upload.${artifactoryFileSpecName}" + artifactoryDownloadFileSpecName = "download.${env.JOB_NAME}.${env.BUILD_NUMBER}.filespec.json" } stages { @@ -10,11 +14,35 @@ pipeline { steps { echo "Build stage" sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} build" + script { + def server = Artifactory.server ${artifactoryServerName} + def uploadSpec = readFile ${artifactoryUploadFileSpecName} + def buildInfo = Artifactory.newBuildInfo() + buildInfo.env.capture = true + buildInfo.env.collect() + + // Upload to Artifactory. + server.upload spec: uploadSpec, buildInfo: buildInfo + server.publishBuildInfo buildInfo + } } } stage('DeployToTest') { steps { echo "Deploy stage" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST prepareArtifactoryDownloadSpec" + script { + def server = Artifactory.server ${artifactoryServerName} + def downloadSpec = readFile ${artifactoryDownloadFileSpecName} + def buildInfo = Artifactory.newBuildInfo() + buildInfo.env.capture = true + buildInfo.env.collect() + + // download from Artifactory. + server.download spec: downloadSpec, buildInfo: buildInfo + server.publishBuildInfo buildInfo + } + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST deploy" echo "Executing tests" sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} test" @@ -24,6 +52,19 @@ pipeline { stage('QA') { steps { echo "QA stage" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA prepareArtifactoryDownloadSpec" + script { + def server = Artifactory.server ${artifactoryServerName} + def downloadSpec = readFile ${artifactoryDownloadFileSpecName} + def buildInfo = Artifactory.newBuildInfo() + buildInfo.env.capture = true + buildInfo.env.collect() + + // download from Artifactory. + server.download spec: downloadSpec, buildInfo: buildInfo + server.publishBuildInfo buildInfo + } + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA deploy" } } diff --git a/build.xml b/build.xml index fcf4bb0aa..ce82d3c33 100755 --- a/build.xml +++ b/build.xml @@ -29,7 +29,12 @@ - + + + + + + From 83923dcbe8bd6a56399d6a919b6d54148b5d0eed Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Wed, 12 Apr 2017 10:40:00 +0200 Subject: [PATCH 07/50] artifactory integration --- Jenkinsfile.unix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index be8019130..29fd510dd 100755 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -2,7 +2,9 @@ pipeline { agent any environment { - currentDir = "/home/waa/cce/henning_webmethods-sample-project-layout" + // currentDir can be set to specific dir for non github testing + //currentDir = "/home/waa/cce/henning_webmethods-sample-project-layout" + currentDir = "." artifactoryServerName = "localArtifactory" artifactoryFileSpecName = "${env.JOB_NAME}.${env.BUILD_NUMBER}.filespec.json" artifactoryUploadFileSpecName = "upload.${artifactoryFileSpecName}" From 4737027d85d5209673d30052f0b5137e6c013b41 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Wed, 12 Apr 2017 10:49:38 +0200 Subject: [PATCH 08/50] artifactory integration --- Jenkinsfile.unix | 12 ++++++------ build.xml | 38 ++++++++++---------------------------- 2 files changed, 16 insertions(+), 34 deletions(-) diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index 29fd510dd..043998eed 100755 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -17,8 +17,8 @@ pipeline { echo "Build stage" sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} build" script { - def server = Artifactory.server ${artifactoryServerName} - def uploadSpec = readFile ${artifactoryUploadFileSpecName} + def server = Artifactory.server "${artifactoryServerName}" + def uploadSpec = readFile "${artifactoryUploadFileSpecName}" def buildInfo = Artifactory.newBuildInfo() buildInfo.env.capture = true buildInfo.env.collect() @@ -34,8 +34,8 @@ pipeline { echo "Deploy stage" sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST prepareArtifactoryDownloadSpec" script { - def server = Artifactory.server ${artifactoryServerName} - def downloadSpec = readFile ${artifactoryDownloadFileSpecName} + def server = Artifactory.server "${artifactoryServerName}" + def downloadSpec = readFile "${artifactoryDownloadFileSpecName}" def buildInfo = Artifactory.newBuildInfo() buildInfo.env.capture = true buildInfo.env.collect() @@ -56,8 +56,8 @@ pipeline { echo "QA stage" sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA prepareArtifactoryDownloadSpec" script { - def server = Artifactory.server ${artifactoryServerName} - def downloadSpec = readFile ${artifactoryDownloadFileSpecName} + def server = Artifactory.server "${artifactoryServerName}" + def downloadSpec = readFile "${artifactoryDownloadFileSpecName}" def buildInfo = Artifactory.newBuildInfo() buildInfo.env.capture = true buildInfo.env.collect() diff --git a/build.xml b/build.xml index ce82d3c33..9f9023603 100755 --- a/build.xml +++ b/build.xml @@ -20,50 +20,32 @@ + + + + - + - - + + - + - - - - - - + - - - - - - - - - - - - - - - - - - + From 021867242cb7209bc4985ddfea8161a410331b22 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Wed, 12 Apr 2017 12:51:16 +0200 Subject: [PATCH 09/50] fix test issue --- Jenkinsfile.unix | 3 +- .../resources/reports/TEST-FibonachiTest.xml | 84 +++++++++++-------- 2 files changed, 49 insertions(+), 38 deletions(-) diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index 043998eed..d99c63c85 100755 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -47,7 +47,7 @@ pipeline { sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST deploy" echo "Executing tests" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} test" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST test" junit 'report/' } } @@ -66,7 +66,6 @@ pipeline { server.download spec: downloadSpec, buildInfo: buildInfo server.publishBuildInfo buildInfo } - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA deploy" } } diff --git a/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml b/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml index 2b9f729b0..129ad1646 100644 --- a/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml +++ b/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml @@ -1,33 +1,35 @@ - + + - + - + + - - + - - + + + - + @@ -40,6 +42,7 @@ + @@ -50,50 +53,58 @@ - - + + - + + + + - + - + - - + + + + + + - + + - + - + - + @@ -103,8 +114,8 @@ - - + + @@ -116,7 +127,7 @@ - + @@ -127,48 +138,49 @@ - + + + - + + - + - - + - - + + - + - + - - + + - - - + + From 6fdcca354956061e8ab75e6938343ed7b0f97971 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Wed, 12 Apr 2017 19:57:17 +0200 Subject: [PATCH 10/50] added default parameters to ENV.groovy --- ENV.groovy | 106 ++++++++---------- Jenkinsfile.unix | 26 ++--- .../resources/reports/TEST-FibonachiTest.xml | 60 +++++----- 3 files changed, 89 insertions(+), 103 deletions(-) diff --git a/ENV.groovy b/ENV.groovy index 89fd54785..9a5a75d1c 100755 --- a/ENV.groovy +++ b/ENV.groovy @@ -1,3 +1,36 @@ +IntegrationServer { + defaults = + [version : "9.12", + installDeployerResource: 'true', + test : 'true', + executeACL : 'Administrators', + useSSL : 'false'] +} + +ProcessModel { + defaults = + [version: '9.12', + test : 'true', + useSSL : 'false'] +} + +MyWebmethodsServer { + defaults = + [ + version : '9.12', + excludeCoreTaskEngineDependencies: 'true', + cacheTimeOut : 900, + includeSecurityDependencies : 'true', + rootFolderAliases : 'folder.public', + maximumFolderObjectCount : 10000, + enableAddtionalLogging : 'true', + maxFolderDepth : 25, + test : 'true', + useSSL : 'false' + ] +} + + environments { DEV { IntegrationServers { @@ -6,48 +39,34 @@ environments { port = "8094" username = "Administrator" pwd = "manage" - useSSL = "false" - version = "9.12" - installDeployerResource = "true" - test = "true" } } } TEST { IntegrationServers { is_node1 { - host = "localhost" - port = "8094" - username = "Administrator" - pwd = "manage" - useSSL = "false" - version = "9.12" - installDeployerResource = "true" - test = "true" + host = "localhost" + port = "8094" + username = "Administrator" + pwd = "manage" } } } QA { IntegrationServers { is_node1 { - host = "localhost" - port = "8094" - username = "Administrator" - pwd = "manage" - useSSL = "false" - version = "9.12" - installDeployerResource = "true" - test = "true" + host = "localhost" + port = "8094" + username = "Administrator" + //pwd = "manage" + pwdHandle = "ADMIN_IS_QA" } is_node2 { host = "localhost" port = "8094" username = "Administrator" - pwd = "manage" - useSSL = "false" - version = "9.12" - installDeployerResource = "true" - test = "true" + //pwd = "manage" + pwdHandle = "ADMIN_IS_QA" } } } @@ -58,20 +77,12 @@ environments { port = "8080" username = "Administrator" pwd = "manage" - useSSL = "false" - version = "9.10" - installDeployerResource = "true" - test = "true" } is_node2 { host = "localhost" port = "8080" username = "Administrator" pwd = "manage" - useSSL = "false" - version = "9.10" - installDeployerResource = "true" - test = "true" } } ProcessModels { @@ -80,18 +91,12 @@ environments { port = "5555" username = "Administrator" pwd = "manage" - useSSL = "false" - version = "9.10" - test = "true" } bpm_node2 { host = "localhost" port = "5555" username = "Administrator" pwd = "manage" - useSSL = "false" - version = "9.10" - test = "true" } } MWS { @@ -100,16 +105,6 @@ environments { port = "5555" username = "Administrator" pwd = "manage" - useSSL = "false" - version = "9.10" - test = "true" - excludeCoreTaskEngineDependencies = "true" - cacheTimeOut = "0" - includeSecurityDependencies = "true" - rootFolderAliases = "folder.public" - maximumFolderObjectCount = "8000" - enableAddtionalLogging = "true" - maxFolderDepth = "25" } } } @@ -119,23 +114,14 @@ environments { host = "localhost" port = "8080" username = "Administrator" - pwd = "manage" - useSSL = "false" - version = "9.10" - installDeployerResource = "true" - test = "true" - executeACL = "Administrator" + useSSL = "true" } is_node2 { host = "localhost" port = "8080" username = "Administrator" pwd = "manage" - useSSL = "false" - version = "9.10" - installDeployerResource = "true" - test = "true" - executeACL = "Administrator" + useSSL = "true" } } } diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index d99c63c85..36e18ac0b 100755 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -32,19 +32,19 @@ pipeline { stage('DeployToTest') { steps { echo "Deploy stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST prepareArtifactoryDownloadSpec" - script { - def server = Artifactory.server "${artifactoryServerName}" - def downloadSpec = readFile "${artifactoryDownloadFileSpecName}" - def buildInfo = Artifactory.newBuildInfo() - buildInfo.env.capture = true - buildInfo.env.collect() - - // download from Artifactory. - server.download spec: downloadSpec, buildInfo: buildInfo - server.publishBuildInfo buildInfo - } - +// sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST prepareArtifactoryDownloadSpec" +// script { +// def server = Artifactory.server "${artifactoryServerName}" +// def downloadSpec = readFile "${artifactoryDownloadFileSpecName}" +// def buildInfo = Artifactory.newBuildInfo() +// buildInfo.env.capture = true +// buildInfo.env.collect() +// +// // download from Artifactory. +// server.download spec: downloadSpec, buildInfo: buildInfo +// server.publishBuildInfo buildInfo +// } +// sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST deploy" echo "Executing tests" sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST test" diff --git a/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml b/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml index 129ad1646..2785b1bda 100644 --- a/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml +++ b/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml @@ -1,17 +1,17 @@ - + - + - + - + @@ -23,8 +23,8 @@ - - + + @@ -53,11 +53,11 @@ - - + + - + @@ -71,16 +71,16 @@ - + - + - + - - + + @@ -91,20 +91,20 @@ - + - + - + - + @@ -114,8 +114,8 @@ - - + + @@ -127,7 +127,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -168,19 +168,19 @@ - + - + - - + + - - + + From 4ee72293b50295639fb42c8ff950e8d5cc331a7e Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Tue, 18 Apr 2017 16:58:15 +0200 Subject: [PATCH 11/50] added additional test package for varsub --- .../implementation/filepolling.class | Bin 0 -> 3336 bytes .../implementation/math.class | Bin 0 -> 1822 bytes .../implementation/filepolling.java | 112 + .../implementation/math.java | 63 + .../SimpleTestPackage/config/auto-config.xml | 77 + .../SimpleTestPackage/config/listeners.cnf | 41 + .../SimpleTestPackage/config/properties.cnf | 6 + .../SimpleTestPackage/config/wxconfig.cnf | 2 + .../IS/Packages/SimpleTestPackage/manifest.v3 | 24 + .../connection/jdbcConnection/node.ndf | 10 + .../adapter/connection/node.idf | 7 + .../ns/simpleTestPackage/adapter/node.idf | 7 + .../adapter/selectTest/node.ndf | 171 ++ .../documents/address/node.ndf | 91 + .../documents/flatfile/invalidRecord/node.ndf | 55 + .../documents/flatfile/node.idf | 7 + .../ns/simpleTestPackage/documents/node.idf | 7 + .../filepolling/checkErrorDirectory/java.frag | 20 + .../filepolling/checkErrorDirectory/node.ndf | 84 + .../filepolling/ffInvalidRecord/node.idf | 7 + .../implementation/filepolling/node.idf | 14 + .../filepolling/sendAddressToBackend/flow.xml | 1596 +++++++++++ .../filepolling/sendAddressToBackend/node.ndf | 81 + .../filepolling/validateAddress/flow.xml | 283 ++ .../filepolling/validateAddress/node.ndf | 120 + .../filepolling/writeErrorFile/flow.xml | 747 +++++ .../filepolling/writeErrorFile/node.ndf | 102 + .../writeInvalidRecordsToFile/java.frag | 31 + .../writeInvalidRecordsToFile/node.ndf | 84 + .../math/calculateFibonacci/java.frag | 17 + .../math/calculateFibonacci/node.ndf | 82 + .../implementation/math/node.idf | 7 + .../simpleTestPackage/implementation/node.idf | 7 + .../ns/simpleTestPackage/node.idf | 7 + .../services/config/autosetup/flow.xml | 165 ++ .../services/config/autosetup/node.ndf | 65 + .../services/config/node.idf | 7 + .../filepolling/ffDictionary/node.ndf | 32 + .../services/filepolling/ffSchema/node.ndf | 37 + .../services/filepolling/ffSchemaDT/node.ndf | 75 + .../services/filepolling/importFile/flow.xml | 2457 +++++++++++++++++ .../services/filepolling/importFile/node.ndf | 65 + .../services/filepolling/node.idf | 7 + .../services/jdbc/invokeJdbcTest/flow.xml | 302 ++ .../services/jdbc/invokeJdbcTest/node.ndf | 101 + .../simpleTestPackage/services/jdbc/node.idf | 7 + .../simpleTestPackage/services/jms/node.idf | 7 + .../jms/receiveInvalidAddress/flow.xml | 149 + .../jms/receiveInvalidAddress/node.ndf | 38 + .../jms/simpleTestJmsTriggerQueue/node.ndf | 58 + .../services/math/addIntegers/flow.xml | 289 ++ .../services/math/addIntegers/node.ndf | 117 + .../math/calculateFibonacciNumber/flow.xml | 258 ++ .../math/calculateFibonacciNumber/node.ndf | 99 + .../simpleTestPackage/services/math/node.idf | 7 + .../ns/simpleTestPackage/services/node.idf | 4 + .../services/string/getStringLength/flow.xml | 216 ++ .../services/string/getStringLength/node.ndf | 101 + .../services/string/node.idf | 7 + .../webservice/jdbc/node.idf | 7 + .../webservice/jdbc/provider/node.idf | 7 + .../jdbc/provider/testJdbcConnection/node.ndf | 94 + .../webservice/math/node.idf | 7 + .../webservice/math/provider/node.idf | 7 + .../provider/simpleMathOperations/node.ndf | 129 + .../ns/simpleTestPackage/webservice/node.idf | 7 + .../Packages/SimpleTestPackage/pub/index.html | 2 + .../resources/autoconfig.cnf | 77 + .../resources/properties.cnf | 6 + .../SimpleTestPackage/resources/wxconfig.cnf | 77 + 70 files changed, 9059 insertions(+) create mode 100755 assets/IS/Packages/SimpleTestPackage/code/classes/simpleTestPackage/implementation/filepolling.class create mode 100755 assets/IS/Packages/SimpleTestPackage/code/classes/simpleTestPackage/implementation/math.class create mode 100755 assets/IS/Packages/SimpleTestPackage/code/source/simpleTestPackage/implementation/filepolling.java create mode 100755 assets/IS/Packages/SimpleTestPackage/code/source/simpleTestPackage/implementation/math.java create mode 100755 assets/IS/Packages/SimpleTestPackage/config/auto-config.xml create mode 100755 assets/IS/Packages/SimpleTestPackage/config/listeners.cnf create mode 100755 assets/IS/Packages/SimpleTestPackage/config/properties.cnf create mode 100755 assets/IS/Packages/SimpleTestPackage/config/wxconfig.cnf create mode 100755 assets/IS/Packages/SimpleTestPackage/manifest.v3 create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/jdbcConnection/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/selectTest/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/address/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/flatfile/invalidRecord/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/flatfile/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/java.frag create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/ffInvalidRecord/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/sendAddressToBackend/flow.xml create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/sendAddressToBackend/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/validateAddress/flow.xml create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/validateAddress/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeErrorFile/flow.xml create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeErrorFile/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/java.frag create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/java.frag create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/autosetup/flow.xml create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/autosetup/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffDictionary/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffSchema/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffSchemaDT/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/importFile/flow.xml create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/importFile/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/invokeJdbcTest/flow.xml create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/invokeJdbcTest/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/receiveInvalidAddress/flow.xml create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/receiveInvalidAddress/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/simpleTestJmsTriggerQueue/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/addIntegers/flow.xml create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/addIntegers/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/calculateFibonacciNumber/flow.xml create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/calculateFibonacciNumber/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/getStringLength/flow.xml create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/getStringLength/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/provider/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/provider/testJdbcConnection/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/provider/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/provider/simpleMathOperations/node.ndf create mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/node.idf create mode 100755 assets/IS/Packages/SimpleTestPackage/pub/index.html create mode 100755 assets/IS/Packages/SimpleTestPackage/resources/autoconfig.cnf create mode 100755 assets/IS/Packages/SimpleTestPackage/resources/properties.cnf create mode 100755 assets/IS/Packages/SimpleTestPackage/resources/wxconfig.cnf diff --git a/assets/IS/Packages/SimpleTestPackage/code/classes/simpleTestPackage/implementation/filepolling.class b/assets/IS/Packages/SimpleTestPackage/code/classes/simpleTestPackage/implementation/filepolling.class new file mode 100755 index 0000000000000000000000000000000000000000..8274edfc4f015e698694306026e973de4c463a31 GIT binary patch literal 3336 zcmb7G+fy4=9R3a@*(EHr4MkmRHQHLCP@+|QM#~J+-e6fCKvm1iJ2Y~E3d(Q9jeZO1y;h(R+ z0k9Sy$FUk&1!f!#$TlMfOU33mMlhl#F>ei8C2yZ$jvJ#^%0HN}3ZCKFP9Zg7 z=dGfX&)bF3^#ZXCcER>G2{d+e4hclIIXRkHl(7p|e|aKnxr0VF&yz&PF^&9?;o9;& zIE;8>c1b`xQn04_su(Ws=v*j@=n>N>c>-HIGDnR`Bb7G_qp7{wqn7EdU$8OZNVs)& z1lr6o%N*a~x{kZuc4^yj?-V$vBV#%fsi}!n&hU&>-*!IN%UGyIyJ#^?WZyQAh(K#7 zu&wNt99KZE7pq(`(9L!s>y!(*>lyyJ_y#<;k_%O)rr((0y%I>%Nrj2+q@*Sdwbmps zXVa@{1&jpZJMJ*8qD(W>qEETDXY~~(jl7+^(J~!3R~mFG{@d)@;}E}EbV|0=W;slh zMg@e;PoF@`9C3lAhw7OUTBGd{dwUge-`*-7dF!JUBiuPw^P605>F|3itIO-%#mNh@d2monpTD3;+in^$YRj2 z20a4Z3uzE~*6=i*QShvWV|b3W?$=e24QcXu4KLtDfvBGadGZo-6sDw7WEx(^D;i$K zYviHfb@WKNH&}b2wYd>seS{a1OeHK*r7RqR@12Eg-Xjfmj1^gE3Uon>VRkGIb3NW^s#xKNfGpSrIc&p&apMi zvfAP8weu}Fm7}JGUiKL-XLL}!#2ThVo)F-QKs6i$_2#9aMKsi#EjjtJXYFI~*{Y$b zT5xQ^qHMt}3t?2_F&xeGsO0!n<2oFqm(4@2MyH1ElK*g#$lGSmf-w*V#-GT&u4~Xo z??M1~&OfDMtY@o`6Ie43;QF)$9mEuL*gZuje)?D@?nzbkoS=A9DPIYz@c)rBE6 ziYxdvzMB7aa2(3!;4a2JCl#M5zNNSduF=&q5MOZ9fXf3Rpq=V~RuSMoE>c~^mAEQU zPEuO_sHf2|JcGv1xfeD17f||YtP7-PU44fJDO&65!a1(4!L_{CaUIf>k~n`v1Pa$( ztG_}-Ak&qIo^e;Vp=_Y9iS5j`@EIRDa7d8S7b%`?!_v93gm9-Bt%DJ<&x z3X271sjfm3?XIEq9<wP!^J%#hqF+Fw$ha1-^?TQ}z<^$~4W9`aXKWu4L zR}(sIrJJ}pUvA>M>IX!p!DUS11$xsomM1RcLuVkDPvfF#B=zVtE`CH2C(fSKqi1k~ ze81!bwxweyuqhoojg`dWt0yj{Qnxg*N}6EMFQbVWbbOm`mZ~j*YBa6s&EI}O!tdc@ ze1aAHJ&u#X`V)ij3x37#d_RewA>SMQ%9_M-?)w=0-3J$vPvSOw27{hVdba3$jNV7^2iHGQ z@Y8>c9*3FwT}--4%U2S|7M9OATWmLXaVB?&m@-7S5w{XUKU4iF@$MzM80}vg?EVPO zG_HSD%jvgjIsM`nku0a5$Vrw{65o@VETs$fXLK?OJYf5QrH zR&a=&{WlI|6dc~p&xnFs&XR&wFH1wRo^OSqoH)xuj?F7HTed2WRENk4%FCbTU=DnV SPT60zqu_kL-Nv&982YnH2p! zzVe{UwMvk+Tt54wT<$xWHmTvE_Tk<;=k9aPK4+hs{{7D%e*##+_esoPRmXct#IQPn z_i@ueK8X*omP7&T6ZjAt>hzHU+%mAJ(UAhP3Z-8;QF4`w1X!Ffw6VhbAt_mcrITN(6;;< z{ZE%%Pu}k~tFpaoR~xjXO1@(^Dt6md-;q%Zp12(WbI+5{ibu)wx%`RKC-xk>69^P? zrKk43Z8dDKZtYZ`N+&3sJc{rY!I1zolC#ro*nzz3R(;QQ99Q6MuH^Vl>siyP*@0~p zZ*wiE;*FNuk_}caF#Q^cz~mudtK07QZGp@vtbfJM3QvU@kScnCtjjiU;*Z@b?~4Lw zjtAUZ7D(Rt$&oE3QAYDV@LA3Hi8nD`uD=qQ`m#hi(UsF+y9I|8$Vn#w`j_3E2lw^5U9 z2dDB&e5IC0CcefuCcedYCek>|QU_jreFd&WGT5z_Rb8oC9ogQOZL7@9b>vYW1g1vx zVxe^z9LjKx6E^}m5+Xfv^)PT79DPQhC<4}N1|sqv(yw1@Ayi{(P)sDNfWB`xx^m~S z8n9x1$Z;V2>*uOzVQE29Gb=jR;|ED`cVGdt$1TCE`7d^`LJrzJwvLbb#?5k{kW| zH7%p1CSJiLty8JV1Dw8afHMb}>LHcULWe=I^P~w}fsU(4A;;bpou=-Gx-!ZL99oA)< LU+>Zu!;OCd3^Jg- literal 0 HcmV?d00001 diff --git a/assets/IS/Packages/SimpleTestPackage/code/source/simpleTestPackage/implementation/filepolling.java b/assets/IS/Packages/SimpleTestPackage/code/source/simpleTestPackage/implementation/filepolling.java new file mode 100755 index 000000000..53c41e65b --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/code/source/simpleTestPackage/implementation/filepolling.java @@ -0,0 +1,112 @@ +package simpleTestPackage.implementation; + +// -----( IS Java Code Template v1.2 +// -----( CREATED: 2013-01-18 12:25:11 CET +// -----( ON-HOST: sles11.softwareag.com + +import com.wm.data.*; +import com.wm.util.Values; +import com.wm.app.b2b.server.Service; +import com.wm.app.b2b.server.ServiceException; +// --- <> --- +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import com.wm.data.IData; +import com.wm.data.IDataCursor; +import com.wm.data.IDataUtil; +// --- <> --- + +public final class filepolling + +{ + // ---( internal utility methods )--- + + final static filepolling _instance = new filepolling(); + + static filepolling _newInstance() { return new filepolling(); } + + static filepolling _cast(Object o) { return (filepolling)o; } + + // ---( server methods )--- + + + + + public static final void checkErrorDirectory (IData pipeline) + throws ServiceException + { + // --- <> --- + // @sigtype java 3.5 + // [i] field:0:required inboundFile + // [o] field:0:required errorDirectory + // pipeline + IDataCursor pipelineCursor = pipeline.getCursor(); + String inboundFile = IDataUtil.getString( pipelineCursor, "inboundFile"); + String fileName = IDataUtil.getString( pipelineCursor, "fileName" ); + + File inbound = new File(inboundFile); + File filepollingdir = inbound.getParentFile().getParentFile(); + File errorDir = new File(filepollingdir, "error"); + + // pipeline + IDataUtil.put( pipelineCursor, "errorDirectory", errorDir.getAbsolutePath() ); + pipelineCursor.destroy(); + + + // --- <> --- + + + } + + + + public static final void writeInvalidRecordsToFile (IData pipeline) + throws ServiceException + { + // --- <> --- + // @sigtype java 3.5 + // [i] field:0:required fileName + // [i] field:0:required dir + // [i] recref:1:required invalidRecordList simpleTestPackage.documents.flatfile:invalidRecord + IDataCursor pipelineCursor = pipeline.getCursor(); + String fileName = IDataUtil.getString( pipelineCursor, "fileName" ); + String dir = IDataUtil.getString( pipelineCursor, "dir" ); + + File f = new File(dir, fileName); + BufferedWriter out = null; + try { + out = new BufferedWriter(new FileWriter(f)); + IData[] invalidRecord = IDataUtil.getIDataArray( pipelineCursor, "invalidRecordList" ); + if ( invalidRecord != null) + { + for ( int i = 0; i < invalidRecord.length; i++ ) + { + IDataCursor invalidRecordCursor = invalidRecord[i].getCursor(); + String position = IDataUtil.getString( invalidRecordCursor, "position" ); + String msg = IDataUtil.getString( invalidRecordCursor, "msg" ); + invalidRecordCursor.destroy(); + + out.write(position + "," + msg); + out.newLine(); + } + } + + } catch( IOException ioe ) { + throw new ServiceException("could not write file to path " + fileName + ": " + ioe); + } finally { + if( out != null ) { + try { + out.close(); + } catch( IOException ioe ) { + // ignore + } + } + } + // --- <> --- + + + } +} + diff --git a/assets/IS/Packages/SimpleTestPackage/code/source/simpleTestPackage/implementation/math.java b/assets/IS/Packages/SimpleTestPackage/code/source/simpleTestPackage/implementation/math.java new file mode 100755 index 000000000..0aaa477e9 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/code/source/simpleTestPackage/implementation/math.java @@ -0,0 +1,63 @@ +package simpleTestPackage.implementation; + +// -----( IS Java Code Template v1.2 +// -----( CREATED: 2012-09-25 12:07:36 CEST +// -----( ON-HOST: sles11.softwareag.com + +import com.wm.data.*; +import com.wm.util.Values; +import com.wm.app.b2b.server.Service; +import com.wm.app.b2b.server.ServiceException; +// --- <> --- +// --- <> --- + +public final class math + +{ + // ---( internal utility methods )--- + + final static math _instance = new math(); + + static math _newInstance() { return new math(); } + + static math _cast(Object o) { return (math)o; } + + // ---( server methods )--- + + + + + public static final void calculateFibonacci (IData pipeline) + throws ServiceException + { + // --- <> --- + // @sigtype java 3.5 + // [i] field:0:required n + // [o] field:0:required fib + // pipeline + IDataCursor pipelineCursor = pipeline.getCursor(); + Integer n = IDataUtil.getInt( pipelineCursor, "n",0 ); + pipelineCursor.destroy(); + + int fib = fib(n); + + // pipeline + IDataCursor pipelineCursor_1 = pipeline.getCursor(); + IDataUtil.put( pipelineCursor_1, "fib", "" + fib ); + pipelineCursor_1.destroy(); + + + // --- <> --- + + + } + + // --- <> --- + + private static int fib(int n ) { + if (n <= 1) return n; + else return fib(n-1) + fib(n-2); + } + // --- <> --- +} + diff --git a/assets/IS/Packages/SimpleTestPackage/config/auto-config.xml b/assets/IS/Packages/SimpleTestPackage/config/auto-config.xml new file mode 100755 index 000000000..530acdd12 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/config/auto-config.xml @@ -0,0 +1,77 @@ + + + + + + localhost + 6849 + Broker #1 + + + + + + + + + + + + + + + + + + + + + wmjmsnaming://Broker #1@localhost:6849 + topic + + + + + + + + + + + + + wmjmsnaming://Broker #1@localhost:6849 + queue + + + + + wmjmsnaming://Broker #1@localhost:6849 + Broker #1 + 6849 + Broker #1 + SimpleTest_ClientGroup + + + + + + JndiAliasDescription + com.webmethods.jms.naming.WmJmsNamingCtxFactory + wmjmsnaming://Broker #1@localhost:6849 + + + + + SimpleTest_JmsConnectionAlias + SimpleTest_JmsClientId + 0 + + SimpleTest_JndiAlias + SimpleTest_ConnectionFactory + + + + + + diff --git a/assets/IS/Packages/SimpleTestPackage/config/listeners.cnf b/assets/IS/Packages/SimpleTestPackage/config/listeners.cnf new file mode 100755 index 000000000..7bf12efd2 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/config/listeners.cnf @@ -0,0 +1,41 @@ + + + + + + c:\tmp\citrus\csv\import + FilePolling + SimpleTestPackage + true + FilePollingListener:c:\tmp\citrus\csv\import + webMethods/FilePolling + /WmFlatFile/configFilePolling.dsp + webMethods + c:\tmp\citrus\csv\import + no + no + yes + Administrator + simpleTestPackage.services.filepolling:importFile + 10 + no + no + 7 + 24 + 1 + 1 + .lock + + + + + + include + + + + + FilePollingListener:c:\tmp\citrus\csv\import + + + diff --git a/assets/IS/Packages/SimpleTestPackage/config/properties.cnf b/assets/IS/Packages/SimpleTestPackage/config/properties.cnf new file mode 100755 index 000000000..2eb71adc7 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/config/properties.cnf @@ -0,0 +1,6 @@ +# This is a new config file. Please add new entries in the following format +# key = value +# +simpletest.jms.connectionAlias=SimpleTest_JmsConnectionAlias +simpletest.jms.topic.destinationName=SimpleTest_Topic +simpletest.jms.queue.destinationName=SimpleTest_Queue \ No newline at end of file diff --git a/assets/IS/Packages/SimpleTestPackage/config/wxconfig.cnf b/assets/IS/Packages/SimpleTestPackage/config/wxconfig.cnf new file mode 100755 index 000000000..34f6a4ab7 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/config/wxconfig.cnf @@ -0,0 +1,2 @@ +wx.config.incl = auto-config.xml +wx.config.incl = properties.cnf diff --git a/assets/IS/Packages/SimpleTestPackage/manifest.v3 b/assets/IS/Packages/SimpleTestPackage/manifest.v3 new file mode 100755 index 000000000..150b928c3 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/manifest.v3 @@ -0,0 +1,24 @@ + + + + yes + no + 1.0 + + + + + + + *.* + + Default + yes + SimpleTestPackage + 8.2.234 + + 2014-01-30 16:06:14 CET + 1.6.0_27 + sagbase.eur.ad.sag + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/jdbcConnection/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/jdbcConnection/node.ndf new file mode 100755 index 000000000..624181049 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/jdbcConnection/node.ndf @@ -0,0 +1,10 @@ + + + + ConnectionData + simpleTestPackage.adapter.connection:jdbcConnection + SimpleTestPackage + false + 2 + CwQAAAABBQEEGQBjAG8AbQAuAHcAbQAuAGQAYQB0AGEALgBJAFMATQBlAG0ARABhAHQAYQBJAG0AcABsBBUAYwBvAG4AbgBlAGMAdABpAG8AbgBOAG8AZABlAFYAZQByAHMAaQBvAG4LBAAAAAIEDwBhAGQAYQBwAHQAZQByAFQAeQBwAGUATgBhAG0AZQQLAEoARABCAEMAQQBkAGEAcAB0AGUAcgQZAGMAbwBuAG4AZQBjAHQAaQBvAG4ARgBhAGMAdABvAHIAeQBUAHkAcABlAE4AYQBtAGUENgBjAG8AbQAuAHcAbQAuAGEAZABhAHAAdABlAHIALgB3AG0AagBkAGIAYwAuAGMAbwBuAG4AZQBjAHQAaQBvAG4ALgBKAEQAQgBDAEMAbwBuAG4AZQBjAHQAaQBvAG4ARgBhAGMAdABvAHIAeQQUAGMAbwBuAG4AZQBjAHQAaQBvAG4AUAByAG8AcABlAHIAdABpAGUAcwUBAAIEDwBvAHQAaABlAHIAUAByAG8AcABlAHIAdABpAGUAcwQPAGQAcgBpAHYAZQByAFQAeQBwAGUAPQB0AGgAaQBuBA8AbgBlAHQAdwBvAHIAawBQAHIAbwB0AG8AYwBvAGwEAAQKAHAAbwByAHQATgB1AG0AYgBlAHIEBAAxADUAMgAxBAwAZABhAHQAYQBiAGEAcwBlAE4AYQBtAGUEAgBYAEUECABwAGEAcwBzAHcAbwByAGQEPABwAGEAcwBzAHcAbwByAGQALgBzAGkAbQBwAGwAZQBUAGUAcwB0AFAAYQBjAGsAYQBnAGUALgBhAGQAYQBwAHQAZQByAC4AYwBvAG4AbgBlAGMAdABpAG8AbgA6AGoAZABiAGMAQwBvAG4AbgBlAGMAdABpAG8AbgQEAHUAcwBlAHIEDABwAGgAaQBsAF8AYwBmAHMAXwBpAG4AdAQKAHMAZQByAHYAZQByAE4AYQBtAGUEDgAxADkAMgAuADEANgA4AC4ANQAwAC4AMQAyADkEDwBkAGEAdABhAHMAbwB1AHIAYwBlAEMAbABhAHMAcwQvAG8AcgBhAGMAbABlAC4AagBkAGIAYwAuAHAAbwBvAGwALgBPAHIAYQBjAGwAZQBDAG8AbgBuAGUAYwB0AGkAbwBuAFAAbwBvAGwARABhAHQAYQBTAG8AdQByAGMAZQQPAHQAcgBhAG4AcwBhAGMAdABpAG8AbgBUAHkAcABlBBEATABPAEMAQQBMAF8AVABSAEEATgBTAEEAQwBUAEkATwBOAgAEGwBjAG8AbgBuAGUAYwB0AGkAbwBuAE0AYQBuAGEAZwBlAHIAUAByAG8AcABlAHIAdABpAGUAcwUBAAIEEgBzAHQAYQByAHQAdQBwAEIAYQBjAGsAbwBmAGYAUwBlAGMAcwQCADEAMAQRAHMAdABhAHIAdAB1AHAAUgBlAHQAcgB5AEMAbwB1AG4AdAQBADAEDQBlAHgAcABpAHIAZQBUAGkAbQBlAG8AdQB0BAUAMwAwADAAMAAwBA8AYgBsAG8AYwBrAGkAbgBnAFQAaQBtAGUAbwB1AHQEBQA2ADAAMAAwADAEEQBwAG8AbwBsAEkAbgBjAHIAZQBtAGUAbgB0AFMAaQB6AGUEAQAxBA8AbQBhAHgAaQBtAHUAbQBQAG8AbwBsAFMAaQB6AGUEAwAxADAAMAQPAG0AaQBuAGkAbQB1AG0AUABvAG8AbABTAGkAegBlACUECABwAG8AbwBsAGEAYgBsAGUEBAB0AHIAdQBlAgAEEQBjAG8AbgBuAGUAYwB0AGkAbwBuAEUAbgBhAGIAbABlAGQEBQBmAGEAbABzAGUEBQB4AGYAbABkAHMKAQQQAGoAYQB2AGEALgBsAGEAbgBnAC4AUwB0AHIAaQBuAGcAFAIA + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/node.idf new file mode 100755 index 000000000..dbfaf5d06 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage.adapter.connection + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/node.idf new file mode 100755 index 000000000..e1879eb6e --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage.adapter + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/selectTest/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/selectTest/node.ndf new file mode 100755 index 000000000..7f6958a09 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/selectTest/node.ndf @@ -0,0 +1,171 @@ + + + + AdapterService + unknown + unknown + + + record + + + false + false + + false + selectTestInput + record + 0 + true + false + false + + + record + false + selectTestInput + record + 0 + true + false + false + + + record + false + overrideCredentials + record + 0 + true + false + false + + + unknown + false + $dbUser + string + 0 + true + false + false + + + unknown + false + $dbPassword + string + 0 + true + false + false + + + true + + + true + + + record + false + $connectionName + string + 0 + true + false + false + false + + + true + + + record + + + false + false + + false + selectTestOutput + record + 0 + true + false + false + + + record + false + selectTestOutput + record + 0 + true + false + false + + + record + false + results + record + 1 + true + false + false + false + + + unknown + false + CREATED_ON + string + 0 + true + false + false + + + true + + + true + + + true + + + + no + no + no + 15 + 1 + off + no + $null + no + 0 + 0 + none + none + 0 + + + + + + 0 + false + false + true + + 1 + + true + false + service + 1 + CwQAAAABBQEEGQBjAG8AbQAuAHcAbQAuAGQAYQB0AGEALgBJAFMATQBlAG0ARABhAHQAYQBJAG0AcABsBBMAcwBlAHIAdgBpAGMAZQBUAGUAbQBwAGwAYQB0AGUATgBhAG0AZQQlAGMAbwBtAC4AdwBtAC4AYQBkAGEAcAB0AGUAcgAuAHcAbQBqAGQAYgBjAC4AcwBlAHIAdgBpAGMAZQBzAC4AUwBlAGwAZQBjAHQEDgBjAG8AbgBuAGUAYwB0AGkAbwBuAE4AYQBtAGUEMwBzAGkAbQBwAGwAZQBUAGUAcwB0AFAAYQBjAGsAYQBnAGUALgBhAGQAYQBwAHQAZQByAC4AYwBvAG4AbgBlAGMAdABpAG8AbgA6AGoAZABiAGMAQwBvAG4AbgBlAGMAdABpAG8AbgQSAHQAZQBtAHAAbABhAHQAZQBQAHIAbwBwAGUAcgB0AGkAZQBzBQEAAgQTAHQAYQBiAGwAZQBzAC4AdABhAGIAbABlAEkAbgBkAGUAeABlAHMKAQQQAGoAYQB2AGEALgBsAGEAbgBnAC4AUwB0AHIAaQBuAGcEAgB0ADEEEgB0AGEAYgBsAGUAcwAuAGMAYQB0AGEAbABvAGcATgBhAG0AZQoBAAwEEQA8AGMAdQByAHIAZQBuAHQAIABjAGEAdABhAGwAbwBnAD4EEQB0AGEAYgBsAGUAcwAuAHMAYwBoAGUAbQBhAE4AYQBtAGUKAQAMBBAAPABjAHUAcgByAGUAbgB0ACAAcwBjAGgAZQBtAGEAPgQQAHQAYQBiAGwAZQBzAC4AdABhAGIAbABlAE4AYQBtAGUKAQAMBAoAVABFAFMAVABfAFQAQQBCAEwARQQQAHQAYQBiAGwAZQBzAC4AdABhAGIAbABlAFQAeQBwAGUKAQAMBAUAVABBAEIATABFBBEAdABhAGIAbABlAHMALgBjAG8AbAB1AG0AbgBJAG4AZgBvCgEADAQiAEMAUgBFAEEAVABFAEQAXwBPAE4AXABuAFYAQQBSAEMASABBAFIAMgAoADIAMAApAFwAbgAxADIAXABuADEAXABuAAoEFQB0AGEAYgBsAGUAcwAuAHIAZQBhAGwAUwBjAGgAZQBtAGEATgBhAG0AZQoBAAwEDABQAEgASQBMAF8AQwBGAFMAXwBJAE4AVAQQAGoAbwBpAG4AcwAuAGwAZQBmAHQAQwBvAGwAdQBtAG4KAAAMBA4AagBvAGkAbgBzAC4AbwBwAGUAcgBhAHQAbwByCgAADAQRAGoAbwBpAG4AcwAuAHIAaQBnAGgAdABDAG8AbAB1AG0AbgoAAAwEEgBzAGUAbABlAGMAdAAuAGEAbABsAEQAaQBzAHQAaQBuAGMAdAQABBEAcwBlAGwAZQBjAHQALgBlAHgAcAByAGUAcwBzAGkAbwBuCgEADAQNAHQAMQAuAEMAUgBFAEEAVABFAEQAXwBPAE4EEABzAGUAbABlAGMAdAAuAHIAZQBmAEMAbwBsAHUAbQBuCgEADAA0BBEAcwBlAGwAZQBjAHQALgBjAG8AbAB1AG0AbgBUAHkAcABlCgEADAQMAFYAQQBSAEMASABBAFIAMgAoADIAMAApBA8AcwBlAGwAZQBjAHQALgBKAEQAQgBDAFQAeQBwAGUKAQAMBAcAVgBBAFIAQwBIAEEAUgQWAHMAZQBsAGUAYwB0AC4AbwB1AHQAcAB1AHQARgBpAGUAbABkAFQAeQBwAGUKAQAMAAwEFgBzAGUAbABlAGMAdAAuAHIAZQBzAHUAbAB0AEYAaQBlAGwAZABUAHkAcABlCgEADAQSAGoAYQB2AGEALgBsAGEAbgBnAC4AUwB0AHIAaQBuAGcAWwBdBBIAcwBlAGwAZQBjAHQALgBvAHUAdABwAHUAdABGAGkAZQBsAGQKAQAMBAoAQwBSAEUAQQBUAEUARABfAE8ATgQSAHMAZQBsAGUAYwB0AC4AcgBlAHMAdQBsAHQARgBpAGUAbABkCgEADAQUAHIAZQBzAHUAbAB0AHMAWwBdAC4AQwBSAEUAQQBUAEUARABfAE8ATgQWAHMAZQBsAGUAYwB0AC4AcgBlAGEAbABPAHUAdABwAHUAdABGAGkAZQBsAGQKAQAMAFAEEABzAGUAbABlAGMAdAAuAHMAbwByAHQATwByAGQAZQByCgEADAAwBA0AcwBlAGwAZQBjAHQALgBtAGEAeABSAG8AdwQBADAEEwBzAGUAbABlAGMAdAAuAHEAdQBlAHIAeQBUAGkAbQBlAE8AdQB0BAIALQAxBBUAcwBlAGwAZQBjAHQALgByAGUAcwB1AGwAdABSAG8AdwBGAGkAZQBsAGQAMAQZAHMAZQBsAGUAYwB0AC4AcgBlAHMAdQBsAHQAUgBvAHcARgBpAGUAbABkAFQAeQBwAGUEEQBqAGEAdgBhAC4AbABhAG4AZwAuAEkAbgB0AGUAZwBlAHIEFQBzAGUAbABlAGMAdAAuAG4AbwB0AGkAZgB5AE8AbgBVAHAAZABhAHQAZQoAAAwEFwBzAGUAbABlAGMAdAAuAG8AdQB0AHAAdQB0AFYAYQBsAHUAZQBUAHkAcABlAHMKAAAMBBEAcwBlAGwAZQBjAHQALgBhAHUAdABvAEQAZQBsAGUAdABlBAUAZgBhAGwAcwBlBAsAdwBoAGUAcgBlAC4AYQBuAGQATwByCgAADAQPAHcAaABlAHIAZQAuAGwAZQBmAHQAUABhAHIAZQBuCgAADAQOAHcAaABlAHIAZQAuAGwAZQBmAHQARQB4AHAAcgoAAAwEDgB3AGgAZQByAGUALgBvAHAAZQByAGEAdABvAHIKAAAMBA8AdwBoAGUAcgBlAC4AcgBpAGcAaAB0AEUAeABwAHIKAAAMBBAAdwBoAGUAcgBlAC4AcgBpAGcAaAB0AFAAYQByAGUAbgoAAAwEDgB3AGgAZQByAGUALgBKAEQAQgBDAFQAeQBwAGUKAAAMBA8AdwBoAGUAcgBlAC4AaQBuAHAAdQB0AFQAeQBwAGUKAAAMBBAAdwBoAGUAcgBlAC4AaQBuAHAAdQB0AEYAaQBlAGwAZAoAAAwEBgB1AHMAZQByAGkAZAQbAG8AdgBlAHIAcgBpAGQAZQBDAHIAZQBkAGUAbgB0AGkAYQBsAHMALgAkAGQAYgBVAHMAZQByBAoAdQBzAGUAcgBpAGQAVAB5AHAAZQAMBA8AaQBuAHAAdQB0AFUAcwBlAHIAaQBkAFMAaQBnAG4AhQQIAHAAYQBzAHMAdwBvAHIAZAQfAG8AdgBlAHIAcgBpAGQAZQBDAHIAZQBkAGUAbgB0AGkAYQBsAHMALgAkAGQAYgBQAGEAcwBzAHcAbwByAGQEDABwAGEAcwBzAHcAbwByAGQAVAB5AHAAZQAMBBEAaQBuAHAAdQB0AFAAYQBzAHMAdwBvAHIAZABTAGkAZwBuAIsEEABkAGUAcwBpAGcAbgBUAGkAbQBlAEwAbwBjAGEAbABlBAUAZQBuAF8AVQBTAgAEGQBhAGQAYQBwAHQAZQByAFMAZQByAHYAaQBjAGUATgBvAGQAZQBWAGUAcgBzAGkAbwBuCwQAAAACBAsAYQBkAGEAcAB0AGUAcgBUAHkAcABlBAsASgBEAEIAQwBBAGQAYQBwAHQAZQByBA8AaQBuAHAAdQB0AFIAZQBjAG8AcgBkAE4AYQBtAGUEDwBzAGUAbABlAGMAdABUAGUAcwB0AEkAbgBwAHUAdAQQAG8AdQB0AHAAdQB0AFIAZQBjAG8AcgBkAE4AYQBtAGUEEABzAGUAbABlAGMAdABUAGUAcwB0AE8AdQB0AHAAdQB0AgA= + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/address/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/address/node.ndf new file mode 100755 index 000000000..2a81030a5 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/address/node.ndf @@ -0,0 +1,91 @@ + + + + + record + simpleTestPackage.documents:address + SimpleTestPackage + + false + record + 0 + true + false + false + + + record + + + true + false + false + + false + name + string + 0 + + + true + false + false + + + record + + + true + false + false + + false + address + string + 0 + + + true + false + false + + + record + + + true + false + false + + false + phone + string + 0 + + + true + false + false + + + record + + + true + false + false + + false + mail + string + 0 + + + true + false + false + + + true + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/flatfile/invalidRecord/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/flatfile/invalidRecord/node.ndf new file mode 100755 index 000000000..7f1332588 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/flatfile/invalidRecord/node.ndf @@ -0,0 +1,55 @@ + + + + + record + simpleTestPackage.documents.flatfile:invalidRecord + SimpleTestPackage + + false + record + 0 + true + false + false + + + record + + + true + false + false + + false + position + string + 0 + + + true + false + false + + + record + + + true + false + false + + false + msg + string + 0 + + + true + false + false + + + true + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/flatfile/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/flatfile/node.idf new file mode 100755 index 000000000..dd344f9a5 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/flatfile/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage.documents.flatfile + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/node.idf new file mode 100755 index 000000000..03f28f5b1 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage.documents + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/java.frag b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/java.frag new file mode 100755 index 000000000..315fbbe0d --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/java.frag @@ -0,0 +1,20 @@ + + + + checkErrorDirectory + + [i] field:0:required inboundFile + [o] field:0:required errorDirectory + + java 3.5 + true + Ly8gcGlwZWxpbmUNCklEYXRhQ3Vyc29yIHBpcGVsaW5lQ3Vyc29yID0gcGlwZWxpbmUuZ2V0Q3Vy +c29yKCk7DQpTdHJpbmcJaW5ib3VuZEZpbGUgPSBJRGF0YVV0aWwuZ2V0U3RyaW5nKCBwaXBlbGlu +ZUN1cnNvciwgImluYm91bmRGaWxlIik7DQpTdHJpbmcJZmlsZU5hbWUgPSBJRGF0YVV0aWwuZ2V0 +U3RyaW5nKCBwaXBlbGluZUN1cnNvciwgImZpbGVOYW1lIiApOw0KDQpGaWxlIGluYm91bmQgPSBu +ZXcgRmlsZShpbmJvdW5kRmlsZSk7DQpGaWxlIGZpbGVwb2xsaW5nZGlyID0gaW5ib3VuZC5nZXRQ +YXJlbnRGaWxlKCkuZ2V0UGFyZW50RmlsZSgpOw0KRmlsZSBlcnJvckRpciA9IG5ldyBGaWxlKGZp +bGVwb2xsaW5nZGlyLCAiZXJyb3IiKTsNCg0KLy8gcGlwZWxpbmUNCklEYXRhVXRpbC5wdXQoIHBp +cGVsaW5lQ3Vyc29yLCAiZXJyb3JEaXJlY3RvcnkiLCBlcnJvckRpci5nZXRBYnNvbHV0ZVBhdGgo +KSApOw0KcGlwZWxpbmVDdXJzb3IuZGVzdHJveSgpOw0KDQoJDQo= + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/node.ndf new file mode 100755 index 000000000..6deec36f5 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/node.ndf @@ -0,0 +1,84 @@ + + + + java + default + java 3.5 + + + record + false + checkErrorDirectoryInput + record + 0 + true + false + false + + + unknown + false + inboundFile + string + 0 + true + false + false + + + true + + + record + false + checkErrorDirectoryOutput + record + 0 + true + false + false + + + unknown + false + errorDirectory + string + 0 + true + false + false + + + true + + + + no + no + no + 15 + 1 + off + no + $null + no + 0 + 0 + none + none + 0 + + + + + + 0 + false + false + true + + 1 + + true + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/ffInvalidRecord/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/ffInvalidRecord/node.idf new file mode 100755 index 000000000..84162b4e0 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/ffInvalidRecord/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage.implementation.filepolling.ffInvalidRecord + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/node.idf new file mode 100755 index 000000000..c2c6ca7f9 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/node.idf @@ -0,0 +1,14 @@ + + + + true + + java.io.BufferedWriter + java.io.File + java.io.FileWriter + java.io.IOException + com.wm.data.IData + com.wm.data.IDataCursor + com.wm.data.IDataUtil + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/sendAddressToBackend/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/sendAddressToBackend/flow.xml new file mode 100755 index 000000000..b4ad06c6f --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/sendAddressToBackend/flow.xml @@ -0,0 +1,1596 @@ + + + + simpletest.jms.topic.destinationName + + + + + simpletest.jms.topic.destinationName + + + + + + + + + record + false + getValueInput + record + 0 + true + false + false + + + unknown + false + key + string + 0 + true + false + false + + + unknown + false + wxConfigPkgName + string + 0 + true + true + false + false + + + unknown + false + noServiceException + string + 0 + true + + true + false + + true + false + false + + + unknown + false + substituteVariables + string + 0 + true + + false + true + + true + false + false + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + true + + + + + + + + + + + simpletest.jms.topic.destinationName + + unknown + false + key + string + 0 + true + false + false + + + + + + + + + + + + record + false + record + 0 + true + false + false + + + unknown + false + key + string + 0 + true + false + false + + + record + + + false + false + + false + address + recref + 0 + true + false + false + true + true + simpleTestPackage.documents:address + + + unknown + false + propertyValue + string + 0 + true + false + false + + + unknown + false + topicName + string + 0 + true + false + false + + + true + + + + + + + + record + false + getValueOutput + record + 0 + true + false + false + + + unknown + false + propertyValue + string + 0 + true + false + false + + + true + + + + + + + + + + + + + + + + + + + simpletest.jms.connectionAlias + + + + + + + + + record + false + getValueInput + record + 0 + true + false + false + + + unknown + false + key + string + 0 + true + false + false + + + unknown + false + wxConfigPkgName + string + 0 + true + true + false + false + + + unknown + false + noServiceException + string + 0 + true + + true + false + + true + false + false + + + unknown + false + substituteVariables + string + 0 + true + + false + true + + true + false + false + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + true + + + + + + + + + + + simpletest.jms.connectionAlias + + unknown + false + key + string + 0 + true + false + false + + + + + + + + + + + + record + false + record + 0 + true + false + false + + + unknown + false + key + string + 0 + true + false + false + + + record + + + false + false + + false + address + recref + 0 + true + false + false + true + true + simpleTestPackage.documents:address + + + unknown + false + topicName + string + 0 + true + false + false + + + unknown + false + simpletest.jms.connectionAlias + string + 0 + true + false + false + + + unknown + false + propertyValue + string + 0 + true + false + false + + + true + + + + + + + + record + false + getValueOutput + record + 0 + true + false + false + + + unknown + false + propertyValue + string + 0 + true + false + false + + + true + + + + + + + + + + + + + + + + + + + map to wrapper doc and set topic name and connection factory + + + + + record + false + record + 0 + true + false + false + + + unknown + false + topicName + string + 0 + true + false + false + + + unknown + false + simpletest.jms.connectionAlias + string + 0 + true + false + false + + + record + false + wrapper + record + 0 + true + false + false + + + record + false + address + recref + 0 + true + false + false + true + simpleTestPackage.documents:address + + + true + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + record + + + false + false + + false + address + recref + 0 + true + false + false + true + true + simpleTestPackage.documents:address + + + true + + + + + + + + + + + + + + + + + SimpleTest_Topic + + unknown + false + topicName + string + 0 + true + false + false + + + + + + + + + + SimpleTest_JmsConnectionAlias + + unknown + false + simpletest.jms.connectionAlias + string + 0 + true + false + false + + + + + + + + + + + + + + + + + record + false + documentToXMLStringInput + record + 0 + true + false + false + + + unknown + false + attrPrefix + string + 0 + true + true + false + false + + + record + false + document + record + 0 + true + false + false + + + true + + + record + false + nsDecls + record + 0 + true + true + false + false + + + true + + + unknown + false + addHeader + string + 0 + true + + true + false + + true + false + false + + + unknown + false + encode + string + 0 + true + + true + false + + true + false + false + + + unknown + false + documentTypeName + string + 0 + true + true + false + false + + + unknown + false + generateRequiredTags + string + 0 + true + + false + true + + true + false + false + + + unknown + false + generateNilTags + string + 0 + true + + false + true + + true + false + false + + + unknown + false + enforceLegalXML + string + 0 + true + + true + false + + true + false + false + + + record + false + dtdHeaderInfo + record + 0 + true + true + false + false + + + true + + + unknown + false + bufferSize + string + 0 + true + true + false + false + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + record + + + false + false + + false + address + recref + 0 + true + false + false + true + true + simpleTestPackage.documents:address + + + unknown + false + topicName + string + 0 + true + false + false + + + unknown + false + simpletest.jms.connectionAlias + string + 0 + true + false + false + + + record + false + wrapper + record + 0 + true + false + false + + + record + false + address + recref + 0 + true + false + false + true + simpleTestPackage.documents:address + + + true + + + true + + + + + + + + + + + + + + + + record + false + record + 0 + true + false + false + + + record + + + false + false + + false + address + recref + 0 + true + false + false + true + true + simpleTestPackage.documents:address + + + record + false + document + record + 0 + true + false + false + + + true + + + unknown + false + topicName + string + 0 + true + false + false + + + unknown + false + simpletest.jms.connectionAlias + string + 0 + true + false + false + + + record + false + wrapper + record + 0 + true + false + false + + + true + + + unknown + false + xmldata + string + 0 + true + false + false + + + true + + + + + + + + record + false + documentToXMLStringOutput + record + 0 + true + false + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + record + false + sendInput + record + 0 + true + false + false + + + unknown + + + + false + false + + false + connectionAliasName + string + 0 + true + false + false + + + unknown + + + + false + false + + false + destinationName + string + 0 + true + false + false + + + unknown + false + destinationType + string + 0 + true + + QUEUE + TOPIC + + true + false + false + + + record + + + false + false + + false + JMSMessage + record + 0 + true + false + false + + + record + + + false + false + + false + header + record + 0 + true + true + false + false + + + true + + + record + + + false + false + + false + properties + record + 0 + true + true + false + false + + + true + + + record + + + false + false + + false + body + record + 0 + true + true + false + false + + + unknown + false + string + string + 0 + true + true + false + false + + + unknown + + + false + false + + false + bytes + object + 0 + true + byte [] + true + false + false + + + unknown + false + object + object + 0 + true + true + false + false + + + record + false + data + record + 0 + true + true + false + false + + + true + + + unknown + + + false + false + + false + message + object + 0 + true + true + false + false + + + true + + + true + + + record + + + false + false + + false + useCSQ + object + 0 + true + java.lang.Boolean + true + false + false + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + unknown + false + topicName + string + 0 + true + false + false + + + unknown + false + simpletest.jms.connectionAlias + string + 0 + true + false + false + + + unknown + false + xmldata + string + 0 + true + false + false + + + true + + + + + + + + + + + + + + + + + TOPIC + + unknown + false + destinationType + string + 0 + true + + QUEUE + TOPIC + + true + false + false + + + + + + + + + + + + + + + record + false + record + 0 + true + false + false + + + unknown + false + connectionAliasName + string + 0 + true + false + false + + + unknown + false + destinationName + string + 0 + true + false + false + + + unknown + false + destinationType + string + 0 + true + false + false + + + record + false + JMSMessage + record + 0 + true + false + false + + + record + false + body + record + 0 + true + false + false + + + true + + + record + + + false + false + + false + header + record + 0 + true + false + false + + + true + + + record + + + false + false + + false + properties + record + 0 + true + true + false + false + + + true + + + true + + + record + false + address + recref + 0 + true + false + false + true + simpleTestPackage.documents:address + + + unknown + false + topicName + string + 0 + true + false + false + + + record + false + JMSMessage + recref + 0 + true + false + false + true + pub.jms:JMSMessage + + + unknown + false + simpletest.jms.connectionAlias + string + 0 + true + false + false + + + unknown + false + xmldata + string + 0 + true + false + false + + + true + + + + + + + + record + false + sendOutput + record + 0 + true + false + false + + + record + + + false + false + + false + JMSMessage + record + 0 + true + false + false + + + record + + + false + false + + false + header + record + 0 + true + false + false + + + true + + + record + + + false + false + + false + properties + record + 0 + true + true + false + false + + + true + + + record + + + false + false + + false + body + record + 0 + true + true + false + false + + + true + + + true + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/sendAddressToBackend/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/sendAddressToBackend/node.ndf new file mode 100755 index 000000000..3ea54c31c --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/sendAddressToBackend/node.ndf @@ -0,0 +1,81 @@ + + + + flow + default + java 3.5 + + + record + + false + record + 0 + true + false + false + + + record + + + false + false + + false + address + recref + 0 + true + false + false + true + true + simpleTestPackage.documents:address + + + true + + + record + + false + record + 0 + true + false + false + + + true + + + + no + no + no + 15 + 1 + simpleTestPackage_implementation_filepolling_sendAddressToBackend + off + no + $null + no + 0 + 0 + none + none + 0 + + + + 0 + false + false + true + + 1 + + true + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/validateAddress/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/validateAddress/flow.xml new file mode 100755 index 000000000..e9276ecfc --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/validateAddress/flow.xml @@ -0,0 +1,283 @@ + + + + + + + + + + + + + valid + + + + + set isValid to true + + + + + record + false + record + 0 + true + false + false + + + record + + + false + false + + false + address + recref + 0 + true + false + false + true + true + simpleTestPackage.documents:address + + + record + + + true + false + false + + false + isValid + string + 0 + + + true + false + false + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + true + + + + + + + + + + + true + + record + + + true + false + false + + false + isValid + string + 0 + + + true + false + false + + + + + + + + + + + + mail is missing --> invalid + + + + + set isValid to false, create error Msg + + + + + record + false + record + 0 + true + false + false + + + record + + + false + false + + false + address + recref + 0 + true + false + false + true + true + simpleTestPackage.documents:address + + + record + + + true + false + false + + false + isValid + string + 0 + + + true + false + false + + + record + + + true + false + false + + false + errorMsg + string + 0 + true + + + true + false + false + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + true + + + + + + + + + + + false + + record + + + true + false + false + + false + isValid + string + 0 + + + true + false + false + + + + + + + + + + Mail address for "%address/name%" is missing + + record + + + true + false + false + + false + errorMsg + string + 0 + true + + + true + false + false + + + + + + + + + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/validateAddress/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/validateAddress/node.ndf new file mode 100755 index 000000000..3e85f31c5 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/validateAddress/node.ndf @@ -0,0 +1,120 @@ + + + + flow + default + java 3.5 + + + record + + false + record + 0 + true + false + false + + + record + + + false + false + + false + address + recref + 0 + true + false + false + true + true + simpleTestPackage.documents:address + + + true + + + record + + false + record + 0 + true + false + false + + + record + + + true + false + false + + false + isValid + string + 0 + + + true + false + false + + + record + + + true + false + false + + false + errorMsg + string + 0 + true + + + true + false + false + + + true + + + + no + no + no + 15 + 1 + simpleTestPackage_implementation_filepolling_validateAddress + off + no + $null + no + 0 + 0 + none + none + 0 + + + + + + 0 + false + false + true + + 1 + + true + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeErrorFile/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeErrorFile/flow.xml new file mode 100755 index 000000000..7d4b57e5d --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeErrorFile/flow.xml @@ -0,0 +1,747 @@ + + + + + + + + + + + + + + + + + record + false + sizeOfListInput + record + 0 + true + false + false + + + unknown + false + fromList + object + 1 + true + true + false + false + false + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + record + + + false + false + + false + invalidRecordList + recref + 1 + true + false + false + false + true + true + simpleTestPackage.documents.flatfile:invalidRecord + + + record + + + true + false + false + + false + inboundFile + string + 0 + + + true + false + false + + + true + + + + + + + + + + + + + + + + record + false + record + 0 + true + false + false + + + unknown + false + fromList + object + 1 + true + false + false + false + + + record + + + false + false + + false + invalidRecordList + recref + 1 + true + false + false + false + true + true + simpleTestPackage.documents.flatfile:invalidRecord + + + record + + + true + false + false + + false + inboundFile + string + 0 + + + true + false + false + + + unknown + false + size + string + 0 + true + false + false + + + true + + + + + + + + record + false + sizeOfListOutput + record + 0 + true + false + false + + + unknown + false + size + string + 0 + true + false + false + + + unknown + false + fromList + object + 1 + true + false + false + false + + + true + + + + + + + + + + + + + + + + + + + + + + + do nothing, empty list + + + + + + + + + + + + + + + + + + + record + + false + record + 0 + true + false + false + + + record + + + true + false + false + + false + inboundFile + string + 0 + + + true + false + false + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + record + + + false + false + + false + invalidRecordList + recref + 1 + true + false + false + false + true + true + simpleTestPackage.documents.flatfile:invalidRecord + + + record + + + true + false + false + + false + inboundFile + string + 0 + + + true + false + false + + + unknown + false + size + string + 0 + true + false + false + + + true + + + + + + + + + + + + + + + + record + false + record + 0 + true + false + false + + + record + + + false + false + + false + invalidRecordList + recref + 1 + true + false + false + false + true + true + simpleTestPackage.documents.flatfile:invalidRecord + + + record + + + true + false + false + + false + inboundFile + string + 0 + + + true + false + false + + + unknown + false + size + string + 0 + true + false + false + + + record + + + true + false + false + + false + errorDirectory + string + 0 + + + true + false + false + + + true + + + + + + + + record + + false + record + 0 + true + false + false + + + true + + + + + + + + + + + + + + + + + + + + + + record + + false + record + 0 + true + false + false + + + record + + + true + false + false + + false + fileName + string + 0 + + + true + false + false + + + record + + + true + false + false + + false + dir + string + 0 + + + true + false + false + + + record + + + false + false + + false + invalidRecordList + recref + 1 + true + false + false + false + true + true + simpleTestPackage.documents.flatfile:invalidRecord + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + record + + + false + false + + false + invalidRecordList + recref + 1 + true + false + false + false + true + true + simpleTestPackage.documents.flatfile:invalidRecord + + + record + + + true + false + false + + false + errorDirectory + string + 0 + + + true + false + false + + + true + + + + + + + + + + + + + + invalidRecords.csv + + record + + + true + false + false + + false + fileName + string + 0 + + + true + false + false + + + + + + + + + + + + record + false + record + 0 + true + false + false + + + unknown + false + fileName + string + 0 + true + false + false + + + unknown + false + dir + string + 0 + true + false + false + + + record + + + false + false + + false + invalidRecordList + recref + 1 + true + false + false + false + true + true + simpleTestPackage.documents.flatfile:invalidRecord + + + record + + + true + false + false + + false + errorDirectory + string + 0 + + + true + false + false + + + true + + + + + + + + record + + false + record + 0 + true + false + false + + + true + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeErrorFile/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeErrorFile/node.ndf new file mode 100755 index 000000000..ba83730c4 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeErrorFile/node.ndf @@ -0,0 +1,102 @@ + + + + flow + default + java 3.5 + + + record + + false + record + 0 + true + false + false + + + record + + + false + false + + false + invalidRecordList + recref + 1 + true + false + false + false + true + true + simpleTestPackage.documents.flatfile:invalidRecord + + + record + + + true + false + false + + false + inboundFile + string + 0 + + + true + false + false + + + true + + + record + + false + record + 0 + true + false + false + + + true + + + + no + no + no + 15 + 1 + simpleTestPackage_implementation_filepolling_writeErrorFile + off + no + $null + no + 0 + 0 + none + none + 0 + + + + + + 0 + false + false + true + + 1 + + true + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/java.frag b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/java.frag new file mode 100755 index 000000000..c23d13061 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/java.frag @@ -0,0 +1,31 @@ + + + + writeInvalidRecordsToFile + + [i] field:0:required fileName + [i] field:0:required dir + [i] recref:1:required invalidRecordList simpleTestPackage.documents.flatfile:invalidRecord + + java 3.5 + true + SURhdGFDdXJzb3IgcGlwZWxpbmVDdXJzb3IgPSBwaXBlbGluZS5nZXRDdXJzb3IoKTsNClN0cmlu +ZwlmaWxlTmFtZSA9IElEYXRhVXRpbC5nZXRTdHJpbmcoIHBpcGVsaW5lQ3Vyc29yLCAiZmlsZU5h +bWUiICk7DQpTdHJpbmcJZGlyID0gSURhdGFVdGlsLmdldFN0cmluZyggcGlwZWxpbmVDdXJzb3Is +ICJkaXIiICk7DQoNCkZpbGUgZiA9IG5ldyBGaWxlKGRpciwgZmlsZU5hbWUpOw0KQnVmZmVyZWRX +cml0ZXIgb3V0ID0gbnVsbDsNCnRyeSB7DQoJb3V0ID0gbmV3IEJ1ZmZlcmVkV3JpdGVyKG5ldyBG +aWxlV3JpdGVyKGYpKTsNCglJRGF0YVtdCWludmFsaWRSZWNvcmQgPSBJRGF0YVV0aWwuZ2V0SURh +dGFBcnJheSggcGlwZWxpbmVDdXJzb3IsICJpbnZhbGlkUmVjb3JkTGlzdCIgKTsNCglpZiAoIGlu +dmFsaWRSZWNvcmQgIT0gbnVsbCkNCgl7DQoJCWZvciAoIGludCBpID0gMDsgaSA8IGludmFsaWRS +ZWNvcmQubGVuZ3RoOyBpKysgKQ0KCQl7DQoJCQlJRGF0YUN1cnNvciBpbnZhbGlkUmVjb3JkQ3Vy +c29yID0gaW52YWxpZFJlY29yZFtpXS5nZXRDdXJzb3IoKTsNCgkJCVN0cmluZwlwb3NpdGlvbiA9 +IElEYXRhVXRpbC5nZXRTdHJpbmcoIGludmFsaWRSZWNvcmRDdXJzb3IsICJwb3NpdGlvbiIgKTsN +CgkJCVN0cmluZwltc2cgPSBJRGF0YVV0aWwuZ2V0U3RyaW5nKCBpbnZhbGlkUmVjb3JkQ3Vyc29y +LCAibXNnIiApOw0KCQkJaW52YWxpZFJlY29yZEN1cnNvci5kZXN0cm95KCk7DQoNCgkJCW91dC53 +cml0ZShwb3NpdGlvbiArICIsIiArIG1zZyk7DQoJCQlvdXQubmV3TGluZSgpOw0KCQl9DQoJfQ0K +CQ0KfSBjYXRjaCggSU9FeGNlcHRpb24gaW9lICkgew0KCXRocm93IG5ldyBTZXJ2aWNlRXhjZXB0 +aW9uKCJjb3VsZCBub3Qgd3JpdGUgZmlsZSB0byBwYXRoICIgKyBmaWxlTmFtZSArICI6ICIgKyBp +b2UpOw0KfSBmaW5hbGx5IHsNCglpZiggb3V0ICE9IG51bGwgKSB7DQoJCXRyeSB7DQoJCQlvdXQu +Y2xvc2UoKTsJCQkJCQ0KCQl9IGNhdGNoKCBJT0V4Y2VwdGlvbiBpb2UgKSB7DQoJCQkvLyBpZ25v +cmUNCgkJfQ0KCX0NCn0NCg== + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/node.ndf new file mode 100755 index 000000000..24422d960 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/node.ndf @@ -0,0 +1,84 @@ + + + + java + default + java 3.5 + + + record + false + writeInvalidRecordsToFileInput + record + 0 + true + false + false + + + unknown + false + fileName + string + 0 + true + false + false + + + unknown + false + dir + string + 0 + true + false + false + + + record + false + invalidRecordList + recref + 1 + true + false + false + false + true + simpleTestPackage.documents.flatfile:invalidRecord + + + true + + + + no + no + no + 15 + 1 + off + no + $null + no + 0 + 0 + none + none + 0 + + + + + + 0 + false + false + true + + 1 + + true + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/java.frag b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/java.frag new file mode 100755 index 000000000..42cefa2e2 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/java.frag @@ -0,0 +1,17 @@ + + + + calculateFibonacci + + [i] field:0:required n + [o] field:0:required fib + + java 3.5 + true + Ly8gcGlwZWxpbmUNCklEYXRhQ3Vyc29yIHBpcGVsaW5lQ3Vyc29yID0gcGlwZWxpbmUuZ2V0Q3Vy +c29yKCk7DQpJbnRlZ2VyIG4gPSBJRGF0YVV0aWwuZ2V0SW50KCBwaXBlbGluZUN1cnNvciwgIm4i +LDAgKTsNCnBpcGVsaW5lQ3Vyc29yLmRlc3Ryb3koKTsNCg0KaW50IGZpYiA9IGZpYihuKTsNCg0K +Ly8gcGlwZWxpbmUNCklEYXRhQ3Vyc29yIHBpcGVsaW5lQ3Vyc29yXzEgPSBwaXBlbGluZS5nZXRD +dXJzb3IoKTsNCklEYXRhVXRpbC5wdXQoIHBpcGVsaW5lQ3Vyc29yXzEsICJmaWIiLCAiIiArIGZp +YiApOw0KcGlwZWxpbmVDdXJzb3JfMS5kZXN0cm95KCk7DQoNCiAgICANCg== + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/node.ndf new file mode 100755 index 000000000..9ab6b38f7 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/node.ndf @@ -0,0 +1,82 @@ + + + + java + default + java 3.5 + + + record + false + calculateFibonacciInput + record + 0 + true + false + false + + + unknown + false + n + string + 0 + true + false + false + + + true + + + record + false + calculateFibonacciOutput + record + 0 + true + false + false + + + unknown + false + fib + string + 0 + true + false + false + + + true + + + + no + no + no + 15 + 1 + off + no + $null + no + 0 + 0 + none + none + 0 + + + + 0 + false + false + true + + 1 + + true + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/node.idf new file mode 100755 index 000000000..d5af4107c --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/node.idf @@ -0,0 +1,7 @@ + + + + DQpwcml2YXRlIHN0YXRpYyBpbnQgZmliKGludCBuICkgew0KCWlmIChuIDw9IDEpIHJldHVybiBu +Ow0KICAgIGVsc2UgcmV0dXJuIGZpYihuLTEpICsgZmliKG4tMik7DQp9DQo= + true + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/node.idf new file mode 100755 index 000000000..409e9a1e6 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage.implementation + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/node.idf new file mode 100755 index 000000000..7a5f3ea2a --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/autosetup/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/autosetup/flow.xml new file mode 100755 index 000000000..b1c79eca9 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/autosetup/flow.xml @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + record + false + record + 0 + true + false + false + + + record + + + + false + false + + false + wxConfigPkgName + string + 0 + true + false + false + + + record + + + false + false + false + + false + calledFromPackageShutdown + string + 0 + true + + false + true + + + 1 + reference + dtVersion2 + + + http://www.w3.org/2001/XMLSchema + boolean + + + + true + false + false + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + true + + + + + + + + + + + SimpleTestPackage + + record + + + + false + false + + false + wxConfigPkgName + string + 0 + true + false + false + + + + + + + + + + false + + record + + + false + false + false + + false + calledFromPackageShutdown + string + 0 + true + + false + true + + + 1 + reference + dtVersion2 + + + http://www.w3.org/2001/XMLSchema + boolean + + + + true + false + false + + + + + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/autosetup/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/autosetup/node.ndf new file mode 100755 index 000000000..b1fda32b1 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/autosetup/node.ndf @@ -0,0 +1,65 @@ + + + + flow + default + java 3.5 + + + record + + false + record + 0 + true + false + false + + + true + + + record + + false + record + 0 + true + false + false + + + true + + + + no + no + no + 15 + 1 + simpleTestPackage_services_config_autosetup + off + no + $null + no + 0 + 0 + none + none + 0 + + + + + + 0 + false + false + true + + 1 + + true + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/node.idf new file mode 100755 index 000000000..0f5b41d5a --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage.services.config + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffDictionary/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffDictionary/node.ndf new file mode 100755 index 000000000..da35670b5 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffDictionary/node.ndf @@ -0,0 +1,32 @@ + + + + Document Part Holder + simpleTestPackage.services.filepolling:ffDictionary + SimpleTestPackage + false + CwQAAAABBQEEGQBjAG8AbQAuAHcAbQAuAGQAYQB0AGEALgBJAFMATQBlAG0ARABhAHQAYQBJAG0A +cABsBAEAMAUBAAIEDQBBAGQAZAByAGUAcwBzAFIAZQBjAG8AcgBkEgEEHgBjAG8AbQAuAHcAbQAu +AGYAZgAuAHAAYQByAHMAZQAuAE4AbwBkAGUARABlAGYAaQBuAGkAdABpAG8AbgUBAAIEBABUAHkA +cABlAAMECABEAGEAdABhAFQAeQBwAGUEAgA5ADkEDQBOAG8AZABlAFYAYQBsAGkAZABhAHQAbwBy +AgAECgBOAG8AZABlAFUAcwBhAGcAZQBzCgQEGQBjAG8AbQAuAHcAbQAuAGYAZgAuAHAAYQByAHMA +ZQAuAE4AbwBkAGUAVQBzAGEAZwBlEgEAEwUBAAIEBABOAGEAbQBlAgAEFABSAGUAZgBlAHIAZQBu +AGMAZQBkAEQAZQBmAGkAbgBpAHQAaQBvAG4EBABuAGEAbQBlBAoAUABhAHIAdABIAG8AbABkAGUA +cgQABAgATgBvAGQAZQBUAHkAcABlBAEAMgQJAE0AYQBuAGQAaQB0AG8AcgB5BAQAdAByAHUAZQQI +AE0AYQB4AE8AYwBjAHUAcgQBADEEDQBOAG8AZABlAEUAeAB0AHIAYQBjAHQAbwByEgEEMwBjAG8A +bQAuAHcAbQAuAGYAZgAuAHAAYQByAHMAZQAuAE4AbwBkAGUARQB4AHQAcgBhAGMAdABvAHIASQBt +AHAAbAAkAE4AdABoAEYAaQBlAGwAZABFAHgAdAByAGEAYwB0AG8AcgUBAAIECABGAGkAZQBsAGQA +TgB1AG0AAwIABAYASQBzAEwAbwBvAHAEBQBmAGEAbABzAGUEDgBOAG8AZABlAEQAZQBmAGkAbgBp +AHQAaQBvAG4SAQAIBQEAAgALAB8ADQAOAA8CAAARAgAECwBDAGgAZQBjAGsARgBpAGUAbABkAHMA +LQQNAEEAbAB0AGUAcgBuAGEAdABlAE4AYQBtAGUAHQQLAEQAZQBzAGMAcgBpAHAAdABpAG8AbgAd +BA4ARABhAHQAYQBUAHkAcABlAFMAdAByAGkAbgBnAB0EBgBJAEQAQwBvAGQAZQAdAgAEDQBGAGkA +ZQBsAGQAUABvAHMAaQB0AGkAbwBuBAIALQAyBAkARgBpAGUAbABkAEEAcgBlAGEEAgAtADMEDgBB +AGwAbABvAHcAVQBuAGQAZQBmAEQAYQB0AGEAIQIAEgEAEwUBAAIAGAIAABoEBwBhAGQAZAByAGUA +cwBzABwAHQAeAB8AIAAhACIAIwAkEgEAJgUBAAIAKQAjAgAALAAtAC4SAQAIBQEAAgALAB8ADQAO +AA8CAAARAgAAOwAtAD0AHQA/AB0AQQAdAEMAHQIAAEYARwBIAEkASgAhAgASAQATBQEAAgAYAgAA +GgQFAHAAaABvAG4AZQAcAB0AHgAfACAAIQAiACMAJBIBACYFAQACACkAHwIAACwALQAuEgEACAUB +AAIACwAfAA0ADgAPAgAAEQIAADsALQA9AB0APwAdAEEAHQBDAB0CAABGAEcASABJAEoAIQIAEgEA +EwUBAAIAGAIAABoEBABtAGEAaQBsABwAHQAeAB8AIAAhACIAIwAkEgEAJgUBAAIAKQQBADMCAAAs +AC0ALhIBAAgFAQACAAsAHwANAA4ADwIAABECAAA7AC0APQAdAD8AHQBBAB0AQwAdAgAARgBHAEgA +SQBKACECAAA7AC0APQAdAD8AHQIAAgACAA== + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffSchema/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffSchema/node.ndf new file mode 100755 index 000000000..448d14ec9 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffSchema/node.ndf @@ -0,0 +1,37 @@ + + + + Flat File Schema + simpleTestPackage.services.filepolling:ffSchema + SimpleTestPackage + false + CwQAAAABBQEEGQBjAG8AbQAuAHcAbQAuAGQAYQB0AGEALgBJAFMATQBlAG0ARABhAHQAYQBJAG0A +cABsBAoARABlAGwAaQBtAGkAdABlAHIAcxIBBCsAYwBvAG0ALgB3AG0ALgBmAGYALgBwAGEAcgBz +AGUALgBEAGUAbABpAG0AaQB0AGUAcgBFAHgAdAByAGEAYwB0AG8AcgBDAG8AbgB0AGEAaQBuAGUA +cgUBAAIECgBFAHgAdAByAGEAYwB0AG8AcgBzCgIEIgBjAG8AbQAuAHcAbQAuAGYAZgAuAHAAYQBy +AHMAZQAuAEQAZQBsAGkAbQBpAHQAZQByAEUAeAB0AHIAYQBjAHQAbwByEgEEMABjAG8AbQAuAHcA +bQAuAGYAZgAuAHAAYQByAHMAZQAuAEQAZQBsAGkAbQBpAHQAZQByAEUAeAB0AHIAYQBjAHQAbwBy +ACQARQB4AHQAcgBhAGMAdABvAHIASQBtAHAAbAUBAAIEBgBPAGYAZgBzAGUAdAQBADAEBQBGAGkA +eABlAGQEAQAKBAcASQBzAEYAaQB4AGUAZAQEAHQAcgB1AGUEBwBUAHkAcABlAEsAZQB5BAEAMQQI +AE8AcgBpAGcAaQBuAGEAbAQCAFwAbgQHAFYAZQByAHMAaQBvAG4EAQAyAgASAQAMBQEAAgAPABAA +EQQBADsAEwAUABUAGgAXACMAGQAaAgACAAQMAFIAZQBjAG8AcgBkAFAAYQByAHMAZQByEgEEHwBj +AG8AbQAuAHcAbQAuAGYAZgAuAHAAYQByAHMAZQAuAEQAZQBsAGkAbQBpAHQAZQByAFAAYQByAHMA +ZQByBQEAAgIABBEARABvAGMAdQBtAGUAbgB0AFMAdAByAHUAYwB0AHUAcgBlEgEEJABjAG8AbQAu +AHcAbQAuAGYAZgAuAHAAYQByAHMAZQAuAE8AcgBkAGUAcgBlAGQATgBvAGQAZQBDAG8AbgB0AGEA +aQBuAGUAcgUBAAICAAQQAFIAZQBjAG8AcgBkAEkAZABlAG4AdABpAGYAaQBlAHISAQQqAGMAbwBt +AC4AdwBtAC4AZgBmAC4AcABhAHIAcwBlAC4AUABvAHMAaQB0AGkAbwBuAGEAbABSAGUAYwBvAHIA +ZABJAGQAZQBuAHQAaQBmAGkAZQByBQEAAgQGAE8ARgBGAFMARQBUABAEBwBJAEQAYQByAHIAYQB5 +CgAEEABqAGEAdgBhAC4AbABhAG4AZwAuAFMAdAByAGkAbgBnAgAEEgBBAGwAbABvAHcAVQBuAGQA +ZQBmAGkAbgBlAGQARABhAHQAYQQFAGYAYQBsAHMAZQQNAEQAbwBjAHUAbQBlAG4AdABBAHIAZQBh +AHMKAABDBA0ARABlAGYAYQB1AGwAdABSAGUAYwBvAHIAZBIBBBkAYwBvAG0ALgB3AG0ALgBmAGYA +LgBwAGEAcgBzAGUALgBOAG8AZABlAFUAcwBhAGcAZQUBAAIEBABOAGEAbQBlBA4AcgBlAGMAbwBy +AGQAVwBpAHQAaABOAG8ASQBEBBQAUgBlAGYAZQByAGUAbgBjAGUAZABEAGUAZgBpAG4AaQB0AGkA +bwBuBA0AQQBkAGQAcgBlAHMAcwBSAGUAYwBvAHIAZAQKAFAAYQByAHQASABvAGwAZABlAHIEMwBz +AGkAbQBwAGwAZQBUAGUAcwB0AFAAYQBjAGsAYQBnAGUALgBzAGUAcgB2AGkAYwBlAHMALgBmAGkA +bABlAHAAbwBsAGwAaQBuAGcAOgBmAGYARABpAGMAdABpAG8AbgBhAHIAeQQIAE4AbwBkAGUAVAB5 +AHAAZQAQBAkATQBhAG4AZABpAHQAbwByAHkARgQIAE0AYQB4AE8AYwBjAHUAcgQCAC0AMQQNAE4A +bwBkAGUARQB4AHQAcgBhAGMAdABvAHICAAQGAEkAcwBMAG8AbwBwAEYEDQBGAGkAZQBsAGQAUABv +AHMAaQB0AGkAbwBuBAIALQAyBAkARgBpAGUAbABkAEEAcgBlAGEEAgAtADMEDgBBAGwAbABvAHcA +VQBuAGQAZQBmAEQAYQB0AGEAFAIABAwASQBEAGEAdABhAEUAbgBjAG8AZABlAGQEAgBjAGYEDgBG +AGwAbwBhAHQAaQBuAGcAUgBlAGMAbwByAGQEAAIA + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffSchemaDT/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffSchemaDT/node.ndf new file mode 100755 index 000000000..41ced0429 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffSchemaDT/node.ndf @@ -0,0 +1,75 @@ + + + + + record + simpleTestPackage.services.filepolling:ffSchemaDT + SimpleTestPackage + cf + false + record + 0 + true + false + false + + + record + false + recordWithNoID + record + 1 + true + true + false + false + false + + + unknown + false + name + string + 0 + true + false + false + + + unknown + false + address + string + 0 + true + false + false + + + unknown + false + phone + string + 0 + true + false + false + + + unknown + false + mail + string + 0 + true + false + false + + + true + + + is://simpleTestPackage.services.filepolling:ffSchema + false + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/importFile/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/importFile/flow.xml new file mode 100755 index 000000000..3ecc07569 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/importFile/flow.xml @@ -0,0 +1,2457 @@ + + + + + + + + + + + + + + + + + + record + false + savePipelineInput + record + 0 + true + false + false + + + unknown + false + $name + string + 0 + true + false + false + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + true + + + + + + + + + + + importFile + + unknown + false + $name + string + 0 + true + false + false + + + + + + + + + + + + record + false + record + 0 + true + false + false + + + unknown + false + $name + string + 0 + true + false + false + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + true + + + + + + + + + + + + + + + + + + + + + + record + false + restorePipelineInput + record + 0 + true + false + false + + + unknown + false + $name + string + 0 + true + false + false + + + unknown + false + $merge + string + 0 + true + + true + false + + true + false + false + + + unknown + false + $remove + string + 0 + true + + false + true + + true + false + false + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + true + + + + + + + + + + + importFile + + unknown + false + $name + string + 0 + true + false + false + + + + + + + + + + + + record + false + record + 0 + true + false + false + + + unknown + false + $name + string + 0 + true + false + false + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + true + + + + + + + + + + + + + + + + + + + + + + record + false + convertToValuesInput + record + 0 + true + false + false + + + unknown + false + ffData + object + 0 + true + false + false + + + unknown + false + ffSchema + string + 0 + true + false + false + + + unknown + false + ffIterator + object + 0 + true + true + false + false + + + unknown + false + encoding + string + 0 + true + true + false + false + + + record + false + delimiters + record + 0 + true + true + false + false + + + true + + + unknown + false + iterate + string + 0 + true + + false + true + + true + false + false + + + unknown + false + createIfNull + string + 0 + true + + true + false + + true + false + false + + + unknown + false + skipWhiteSpace + string + 0 + true + + true + false + + true + false + false + + + unknown + false + keepResults + string + 0 + true + + true + false + + true + false + false + + + unknown + false + validate + string + 0 + true + + false + true + + true + false + false + + + unknown + false + returnErrors + string + 0 + true + + asArray + inResults + both + + true + false + false + + + unknown + false + maxErrors + string + 0 + true + true + false + false + + + record + + false + false + + false + flags + record + 0 + true + true + false + false + + + record + + false + false + false + + false + addRecordCount + string + 0 + + false + true + + true + false + false + + + record + + false + false + false + + false + detailedErrors + string + 0 + + false + true + + true + false + false + + + record + + false + false + false + + false + skipToFirstRecord + string + 0 + + true + false + + true + false + false + + + record + + + false + false + false + + false + trimWhitespace + string + 0 + + none + left + right + both + + true + false + false + + + record + + false + false + false + + false + resultAsArray + string + 0 + + false + true + + true + false + false + + + true + true + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + unknown + false + ffdata + object + 0 + true + false + false + + + true + + + + + + + + + + + simpleTestPackage.services.filepolling:ffSchema + + unknown + false + ffSchema + string + 0 + true + false + false + + + + + + + + + + false + + unknown + false + iterate + string + 0 + true + + false + true + + true + false + false + + + + + + + + + + + + + true + + record + + false + false + false + + false + resultAsArray + string + 0 + + false + true + + true + false + false + + + + + + + + + + asArray + + unknown + false + returnErrors + string + 0 + true + + asArray + inResults + both + + true + false + false + + + + + + + + + + true + + unknown + false + validate + string + 0 + true + + false + true + + true + false + false + + + + + + + + + + UTF8 + + unknown + false + encoding + string + 0 + true + true + false + false + + + + + + + + + + + + record + false + record + 0 + true + false + false + + + unknown + false + ffData + object + 0 + true + false + false + + + unknown + false + ffSchema + string + 0 + true + false + false + + + unknown + false + ffdata + object + 0 + true + false + false + + + unknown + false + encoding + string + 0 + true + false + false + + + unknown + false + $name + string + 0 + true + false + false + + + unknown + false + iterate + string + 0 + true + false + false + + + unknown + false + validate + string + 0 + true + false + false + + + unknown + false + returnErrors + string + 0 + true + false + false + + + record + false + flags + record + 0 + true + false + false + + + unknown + false + resultAsArray + string + 0 + true + false + false + + + true + + + record + false + ffValues + record + 0 + true + false + false + + + true + + + unknown + false + ffIterator + object + 0 + true + true + false + false + + + unknown + false + isValid + string + 0 + true + + true + false + + true + false + false + + + record + false + errors + record + 1 + true + true + false + false + true + + + true + + + true + + + + + + + + record + false + convertToValuesOutput + record + 0 + true + false + false + + + record + false + ffValues + record + 0 + true + false + false + + + true + + + unknown + false + ffIterator + object + 0 + true + true + false + false + + + unknown + false + isValid + string + 0 + true + + true + false + + true + false + false + + + record + false + errors + record + 1 + true + true + false + false + true + + + true + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + map to DT document type + + + + + record + false + record + 0 + true + false + false + + + record + false + ffValues + record + 0 + true + false + false + + + true + + + record + false + ffSchemaDT + recref + 0 + true + false + false + true + simpleTestPackage.services.filepolling:ffSchemaDT + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + record + false + ffValues + record + 0 + true + false + false + + + true + + + true + + + + + + + + + + + + + + + init list of invalid values + + + + + record + false + record + 0 + true + false + false + + + record + false + ffSchemaDT + recref + 0 + true + false + false + true + simpleTestPackage.services.filepolling:ffSchemaDT + + + record + false + invaidRecordList + recref + 1 + true + false + false + false + true + true + simpleTestPackage.documents.flatfile:invalidRecord + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + map to address document type + + + + + record + false + record + 0 + true + false + false + + + unknown + false + message + string + 0 + true + false + false + + + record + false + ffSchemaDT + recref + 0 + true + false + false + true + simpleTestPackage.services.filepolling:ffSchemaDT + + + record + false + address + recref + 0 + true + false + false + true + true + simpleTestPackage.documents:address + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + unknown + false + message + string + 0 + true + false + false + + + record + false + ffSchemaDT + recref + 0 + true + false + false + true + simpleTestPackage.services.filepolling:ffSchemaDT + + + unknown + false + $iteration + string + 0 + true + false + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + record + + false + record + 0 + true + false + false + + + record + + + false + false + + false + address + recref + 0 + true + false + false + true + true + simpleTestPackage.documents:address + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + record + false + invaidRecordList + recref + 1 + true + false + false + false + true + simpleTestPackage.documents.flatfile:invalidRecord + + + record + false + address + recref + 0 + true + false + false + true + simpleTestPackage.documents:address + + + unknown + false + $iteration + string + 0 + true + false + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + record + + false + record + 0 + true + false + false + + + record + + + false + false + + false + address + recref + 0 + true + false + false + true + true + simpleTestPackage.documents:address + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + record + false + invaidRecordList + recref + 1 + true + false + false + false + true + simpleTestPackage.documents.flatfile:invalidRecord + + + record + false + address + recref + 0 + true + false + false + true + simpleTestPackage.documents:address + + + record + + + true + false + false + + false + isValid + string + 0 + + + true + false + false + + + record + + + true + false + false + + false + errorMsg + string + 0 + true + + + true + false + false + + + unknown + false + $iteration + string + 0 + true + false + false + + + true + + + + + + + + + + + + + + + + record + false + record + 0 + true + false + false + + + record + false + invaidRecordList + recref + 1 + true + false + false + false + true + simpleTestPackage.documents.flatfile:invalidRecord + + + record + false + address + recref + 0 + true + false + false + true + simpleTestPackage.documents:address + + + record + + + true + false + false + + false + isValid + string + 0 + + + true + false + false + + + record + + + true + false + false + + false + errorMsg + string + 0 + true + + + true + false + false + + + true + + + + + + + + record + + false + record + 0 + true + false + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + create invalid record entry + + + + + record + false + record + 0 + true + false + false + + + record + false + invaidRecordList + recref + 1 + true + false + false + false + true + simpleTestPackage.documents.flatfile:invalidRecord + + + record + false + address + recref + 0 + true + false + false + true + simpleTestPackage.documents:address + + + record + + + true + false + false + + false + isValid + string + 0 + + + true + false + false + + + record + + + true + false + false + + false + errorMsg + string + 0 + true + + + true + false + false + + + record + false + invalidRecord + recref + 0 + true + false + false + true + true + simpleTestPackage.documents.flatfile:invalidRecord + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + record + false + invaidRecordList + recref + 1 + true + false + false + false + true + simpleTestPackage.documents.flatfile:invalidRecord + + + record + false + address + recref + 0 + true + false + false + true + simpleTestPackage.documents:address + + + record + + + true + false + false + + false + isValid + string + 0 + + + true + false + false + + + record + + + true + false + false + + false + errorMsg + string + 0 + true + + + true + false + false + + + unknown + false + $iteration + string + 0 + true + false + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + record + false + appendToDocumentListInput + record + 0 + true + false + false + + + record + false + toList + record + 1 + true + true + false + false + false + + + true + + + record + false + fromList + record + 1 + true + true + false + false + false + + + true + + + record + false + fromItem + record + 0 + true + true + false + false + + + true + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + record + false + invaidRecordList + recref + 1 + true + false + false + false + true + simpleTestPackage.documents.flatfile:invalidRecord + + + record + false + address + recref + 0 + true + false + false + true + simpleTestPackage.documents:address + + + unknown + false + $iteration + string + 0 + true + false + false + + + record + false + invalidRecord + recref + 0 + true + false + false + true + simpleTestPackage.documents.flatfile:invalidRecord + + + true + + + + + + + + + + + + + + + + + + + record + false + record + 0 + true + false + false + + + record + false + toList + record + 1 + true + false + false + false + + + true + + + record + false + invaidRecordList + recref + 1 + true + false + false + false + true + simpleTestPackage.documents.flatfile:invalidRecord + + + record + false + fromItem + record + 0 + true + false + false + + + true + + + record + false + address + recref + 0 + true + false + false + true + simpleTestPackage.documents:address + + + unknown + false + $iteration + string + 0 + true + false + false + + + record + false + invalidRecord + recref + 0 + true + false + false + true + simpleTestPackage.documents.flatfile:invalidRecord + + + true + + + + + + + + record + false + appendToDocumentListOutput + record + 0 + true + false + false + + + record + false + toList + record + 1 + true + false + false + false + + + true + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + record + + false + record + 0 + true + false + false + + + record + + + false + false + + false + invalidRecordList + recref + 1 + true + false + false + false + true + true + simpleTestPackage.documents.flatfile:invalidRecord + + + record + + + true + false + false + + false + inboundFile + string + 0 + + + true + false + false + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + record + false + invaidRecordList + recref + 1 + true + false + false + false + true + simpleTestPackage.documents.flatfile:invalidRecord + + + record + false + address + recref + 0 + true + false + false + true + simpleTestPackage.documents:address + + + unknown + false + $iteration + string + 0 + true + false + false + + + true + + + + + + + + + + + + + + %originalFileName% + + + record + + + true + false + false + + false + inboundFile + string + 0 + + + true + false + false + + + + + + + + + + + + record + false + record + 0 + true + false + false + + + record + false + invalidRecordList + recref + 1 + true + false + false + false + true + simpleTestPackage.documents.flatfile:invalidRecord + + + unknown + false + inboundFile + string + 0 + true + false + false + + + record + false + invaidRecordList + recref + 1 + true + false + false + false + true + simpleTestPackage.documents.flatfile:invalidRecord + + + record + false + address + recref + 0 + true + false + false + true + simpleTestPackage.documents:address + + + unknown + false + $iteration + string + 0 + true + false + false + + + true + + + + + + + + record + + false + record + 0 + true + false + false + + + true + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/importFile/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/importFile/node.ndf new file mode 100755 index 000000000..27c385f3d --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/importFile/node.ndf @@ -0,0 +1,65 @@ + + + + flow + default + java 3.5 + + + record + + false + record + 0 + true + false + false + + + true + + + record + + false + record + 0 + true + false + false + + + true + + + + no + no + no + 15 + 1 + simpleTestPackage_services_filepolling_importFile + off + no + $null + no + 0 + 0 + none + none + 0 + + + + + + 0 + false + false + true + + 1 + + true + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/node.idf new file mode 100755 index 000000000..8bb5a2805 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage.services.filepolling + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/invokeJdbcTest/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/invokeJdbcTest/flow.xml new file mode 100755 index 000000000..c233b4a64 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/invokeJdbcTest/flow.xml @@ -0,0 +1,302 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + record + false + record + 0 + true + false + false + + + unknown + false + msg + string + 0 + true + false + false + + + unknown + false + success + string + 0 + true + false + false + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + record + false + selectTestOutput + record + 0 + true + false + false + + + record + false + results + record + 1 + true + false + false + false + + + true + + + true + + + true + + + + + + + + + + + + + + Successfully connected to database. + + unknown + false + msg + string + 0 + true + false + false + + + + + + + + + + true + + unknown + false + success + string + 0 + true + false + false + + + + + + + + + + + + + + + + + + + record + false + record + 0 + true + false + false + + + record + false + selectTestOutput + record + 0 + true + false + false + + + true + + + record + + + true + false + false + + false + msg + string + 0 + + + true + false + false + + + record + + + true + false + false + + false + success + string + 0 + + + true + false + false + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + true + + + + + + + + + + + Failed to connect to database. Please configure the database adapter simpleTestPackage.adapter.connection:jdbcConnection in IntegrationServer. + + record + + + true + false + false + + false + msg + string + 0 + + + true + false + false + + + + + + + + + + false + + record + + + true + false + false + + false + success + string + 0 + + + true + false + false + + + + + + + + + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/invokeJdbcTest/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/invokeJdbcTest/node.ndf new file mode 100755 index 000000000..7dd48e20f --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/invokeJdbcTest/node.ndf @@ -0,0 +1,101 @@ + + + + flow + default + java 3.5 + + + record + + false + record + 0 + true + false + false + + + true + + + record + + false + record + 0 + true + false + false + + + record + + + true + false + false + + false + msg + string + 0 + + + true + false + false + + + record + + + true + false + false + + false + success + string + 0 + + + true + false + false + + + true + + + + no + no + no + 15 + 1 + simpleTestPackage_services_jdbc_invokeJdbcTest + off + no + $null + no + 0 + 0 + none + none + 0 + + + + + + 0 + false + false + true + + 1 + + true + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/node.idf new file mode 100755 index 000000000..20a7fde44 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage.services.jdbc + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/node.idf new file mode 100755 index 000000000..80095f064 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage.services.jms + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/receiveInvalidAddress/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/receiveInvalidAddress/flow.xml new file mode 100755 index 000000000..537930394 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/receiveInvalidAddress/flow.xml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + record + false + debugLogInput + record + 0 + true + false + false + + + unknown + false + message + string + 0 + true + true + false + false + + + unknown + false + function + string + 0 + true + true + false + false + + + unknown + false + level + string + 0 + true + + Fatal + Error + Warn + Info + Debug + Trace + Off + + true + false + false + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + true + + + + + + + + + + + simpleTestPackage.services.jms:receiveInvalidAddress + + unknown + false + function + string + 0 + true + true + false + false + + + + + + + + + + Received JMS Message + + unknown + false + message + string + 0 + true + true + false + false + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/receiveInvalidAddress/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/receiveInvalidAddress/node.ndf new file mode 100755 index 000000000..690b5c30c --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/receiveInvalidAddress/node.ndf @@ -0,0 +1,38 @@ + + + + flow + default + java 3.5 + pub.jms:triggerSpec + + no + no + no + 15 + 1 + simpleTestPackage_services_jms_receiveInvalidAddress + off + no + $null + no + 0 + 0 + none + none + 0 + + + + + + 0 + false + false + true + + 1 + + true + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/simpleTestJmsTriggerQueue/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/simpleTestJmsTriggerQueue/node.ndf new file mode 100755 index 000000000..97127dbaa --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/simpleTestJmsTriggerQueue/node.ndf @@ -0,0 +1,58 @@ + + + + webMethods/trigger + simpleTestPackage.services.jms:simpleTestJmsTriggerQueue + SimpleTestPackage + + false + jms-trigger + + false + false + 0 + 0 + + 0 + false + false + true + + + 0 + 10000 + 0 + + 86400000 + 1 + false + false + 7200000 + bYUYYvY9RCtgnmldB0rjbn8tvGY= + SimpleTest_JmsConnectionAlias + 0 + true + 10 + 1 + 1500 + 1 + 2 + false + 3 + Administrator + + + Rule1 + simpleTestPackage.services.jms:receiveInvalidAddress + + + + + + SimpleTest_Queue + + 0 + + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/addIntegers/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/addIntegers/flow.xml new file mode 100755 index 000000000..efc298c1e --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/addIntegers/flow.xml @@ -0,0 +1,289 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + record + false + addIntsInput + record + 0 + true + false + false + + + unknown + false + num1 + string + 0 + true + false + false + + + unknown + false + num2 + string + 0 + true + false + false + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + record + + + true + false + false + + false + int1 + string + 0 + + + true + false + false + + + record + + + true + false + false + + false + int2 + string + 0 + + + true + false + false + + + true + + + + + + + + + + + + + + + + + + + record + false + record + 0 + true + false + false + + + unknown + false + num1 + string + 0 + true + false + false + + + unknown + false + num2 + string + 0 + true + false + false + + + record + + + true + false + false + + false + int1 + string + 0 + + + true + false + false + + + record + + + true + false + false + + false + sum + string + 0 + + + true + false + false + + + record + + + true + false + false + + false + int2 + string + 0 + + + true + false + false + + + unknown + false + value + string + 0 + true + false + false + + + true + + + + + + + + record + false + addIntsOutput + record + 0 + true + false + false + + + unknown + false + value + string + 0 + true + false + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/addIntegers/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/addIntegers/node.ndf new file mode 100755 index 000000000..ffc01563b --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/addIntegers/node.ndf @@ -0,0 +1,117 @@ + + + + flow + default + java 3.5 + + + record + + false + record + 0 + true + false + false + + + record + + + true + false + false + + false + int1 + string + 0 + + + true + false + false + + + record + + + true + false + false + + false + int2 + string + 0 + + + true + false + false + + + true + + + record + + false + record + 0 + true + false + false + + + record + + + true + false + false + + false + sum + string + 0 + + + true + false + false + + + true + + + + no + no + no + 15 + 1 + simpleTestPackage_services_math_addIntegers + off + no + $null + no + 0 + 0 + none + none + 0 + + + + 0 + false + false + true + + 1 + + true + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/calculateFibonacciNumber/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/calculateFibonacciNumber/flow.xml new file mode 100755 index 000000000..260e99897 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/calculateFibonacciNumber/flow.xml @@ -0,0 +1,258 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + record + + false + record + 0 + true + false + false + + + record + + + true + false + false + + false + n + string + 0 + + + true + false + false + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + record + + + true + false + false + + false + number + string + 0 + + + true + false + false + + + true + + + + + + + + + + + + + + + + record + false + record + 0 + true + false + false + + + unknown + false + n + string + 0 + true + false + false + + + record + + + true + false + false + + false + number + string + 0 + + + true + false + false + + + record + + + true + false + false + + false + fibonacciNumber + string + 0 + + + true + false + false + + + record + + + true + false + false + + false + fib + string + 0 + + + true + false + false + + + true + + + + + + + + record + + false + record + 0 + true + false + false + + + record + + + true + false + false + + false + fib + string + 0 + + + true + false + false + + + true + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/calculateFibonacciNumber/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/calculateFibonacciNumber/node.ndf new file mode 100755 index 000000000..b230043cf --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/calculateFibonacciNumber/node.ndf @@ -0,0 +1,99 @@ + + + + flow + default + java 3.5 + + + record + + false + record + 0 + true + false + false + + + record + + + true + false + false + + false + number + string + 0 + + + true + false + false + + + true + + + record + + false + record + 0 + true + false + false + + + record + + + true + false + false + + false + fibonacciNumber + string + 0 + + + true + false + false + + + true + + + + no + no + no + 15 + 1 + simpleTestPackage_services_math_calculateFibonacciNumber + off + no + $null + no + 0 + 0 + none + none + 0 + + + + 0 + false + false + true + + 1 + + true + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/node.idf new file mode 100755 index 000000000..e26f2386c --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage.services.math + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/node.idf new file mode 100755 index 000000000..c02cb0078 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/node.idf @@ -0,0 +1,4 @@ + + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/getStringLength/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/getStringLength/flow.xml new file mode 100755 index 000000000..72ce321c0 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/getStringLength/flow.xml @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + record + false + lengthInput + record + 0 + true + false + false + + + unknown + false + inString + string + 0 + true + false + false + + + true + + + + + + + + record + false + record + 0 + true + false + false + + + record + + + true + false + false + + false + strIn + string + 0 + + + true + false + false + + + true + + + + + + + + + + + + + + + + record + false + record + 0 + true + false + false + + + unknown + false + inString + string + 0 + true + false + false + + + record + + + true + false + false + + false + strIn + string + 0 + + + true + false + false + + + unknown + false + value + string + 0 + true + false + false + + + unknown + false + length + string + 0 + true + false + false + + + true + + + + + + + + record + false + lengthOutput + record + 0 + true + false + false + + + unknown + false + value + string + 0 + true + false + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/getStringLength/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/getStringLength/node.ndf new file mode 100755 index 000000000..9ced4990c --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/getStringLength/node.ndf @@ -0,0 +1,101 @@ + + + + flow + default + java 3.5 + + + record + + false + record + 0 + true + false + false + + + record + + + true + false + false + + false + strIn + string + 0 + + + true + false + false + + + true + + + record + + false + record + 0 + true + false + false + + + record + + + true + false + false + + false + length + string + 0 + + + true + false + false + + + true + + + + no + no + no + 15 + 1 + simpleTestPackage_services_string_getStringLength + off + no + $null + no + 0 + 0 + none + none + 0 + + + + + + 0 + false + false + true + + 1 + + true + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/node.idf new file mode 100755 index 000000000..d093719c1 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage.services.string + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/node.idf new file mode 100755 index 000000000..bc126ee37 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage.webservice.jdbc + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/provider/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/provider/node.idf new file mode 100755 index 000000000..0697bcea4 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/provider/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage.webservice.jdbc.provider + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/provider/testJdbcConnection/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/provider/testJdbcConnection/node.ndf new file mode 100755 index 000000000..a59517409 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/provider/testJdbcConnection/node.ndf @@ -0,0 +1,94 @@ + + + + webServiceDescriptor + simpleTestPackage.webservice.jdbc.provider:testJdbcConnection + SimpleTestPackage + false + true + false + SOAP 1.1 Protocol + http://sles11.softwareag.com/simpleTestPackage.webservice.jdbc.provider:testJdbcConnection + false + 0 + + + http://sles11.softwareag.com:5555/ws/simpleTestPackage.webservice.jdbc.provider:testJdbcConnection?WSDL + testJdbcConnection + _8_2 + + true + + + + + simpleTestPackage_webservice_jdbc_provider_testJdbcConnection_Binder + http://localhost:5555/ws/simpleTestPackage.webservice.jdbc.provider:testJdbcConnection/simpleTestPackage_webservice_jdbc_provider_testJdbcConnection_Port + simpleTestPackage_webservice_jdbc_provider_testJdbcConnection_Binder + document + literal + SOAP + simpleTestPackage_webservice_jdbc_provider_testJdbcConnection_Port + testJdbcConnection_PortType + http://schemas.xmlsoap.org/soap/http + http + + invokeJdbcTest + + SOAP 1.1 Protocol + ws + false + + + + + invokeJdbcTest + simpleTestPackage.services.jdbc:invokeJdbcTest + + + + + invokeJdbcTest + simpleTestPackage.services.jdbc:invokeJdbcTest + 1 + false + + + + + + + + + + invokeJdbcTestResponse + simpleTestPackage.services.jdbc:invokeJdbcTest + 2 + false + + + + + + + + + http://sles11.softwareag.com/simpleTestPackage.webservice.jdbc.provider:testJdbcConnection + http://schemas.xmlsoap.org/wsdl/ + http://www.w3.org/2001/XMLSchema + http://schemas.xmlsoap.org/wsdl/http/ + http://schemas.xmlsoap.org/wsdl/mime/ + http://schemas.xmlsoap.org/soap/encoding/ + http://schemas.xmlsoap.org/wsdl/soap12/ + http://schemas.xmlsoap.org/wsdl/soap/ + http://www.w3.org/2010/soapjms/ + + false + true + false + false + false + false + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/node.idf new file mode 100755 index 000000000..8c5e528fb --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage.webservice.math + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/provider/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/provider/node.idf new file mode 100755 index 000000000..cb45828c7 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/provider/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage.webservice.math.provider + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/provider/simpleMathOperations/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/provider/simpleMathOperations/node.ndf new file mode 100755 index 000000000..40d748384 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/provider/simpleMathOperations/node.ndf @@ -0,0 +1,129 @@ + + + + webServiceDescriptor + simpleTestPackage.webservice.math.provider:simpleMathOperations + SimpleTestPackage + + false + true + false + SOAP 1.1 Protocol + http://sles11.softwareag.com/simpleTestPackage.webservice.math.provider:simpleMathOperations + false + 0 + + + http://sles11.softwareag.com:5555/ws/simpleTestPackage.webservice.math.provider:simpleMathOperations?WSDL + simpleMathOperations + _8_2 + + true + + + + + simpleTestPackage_webservice_math_provider_simpleMathOperations_Binder + http://localhost:5555/ws/simpleTestPackage.webservice.math.provider:simpleMathOperations/simpleTestPackage_webservice_math_provider_simpleMathOperations_Port + + simpleTestPackage_webservice_math_provider_simpleMathOperations_Binder + document + literal + SOAP + simpleTestPackage_webservice_math_provider_simpleMathOperations_Port + simpleMathOperations_PortType + http://schemas.xmlsoap.org/soap/http + http + + addIntegers + calculateFibonacciNumber + + SOAP 1.1 Protocol + ws + false + + + + + calculateFibonacciNumber + simpleTestPackage.services.math:calculateFibonacciNumber + + + + + calculateFibonacciNumber + simpleTestPackage.services.math:calculateFibonacciNumber + 1 + false + + + + + + + + + + calculateFibonacciNumberResponse + simpleTestPackage.services.math:calculateFibonacciNumber + 2 + false + + + + + + + + addIntegers + simpleTestPackage.services.math:addIntegers + + + + + addIntegers + simpleTestPackage.services.math:addIntegers + 1 + false + + + + + + + + + + addIntegersResponse + simpleTestPackage.services.math:addIntegers + 2 + false + + + + + + + + + http://sles11.softwareag.com/simpleTestPackage.webservice.math.provider:simpleMathOperations + http://schemas.xmlsoap.org/wsdl/ + http://www.w3.org/2001/XMLSchema + http://schemas.xmlsoap.org/wsdl/http/ + http://schemas.xmlsoap.org/wsdl/mime/ + http://schemas.xmlsoap.org/soap/encoding/ + http://schemas.xmlsoap.org/wsdl/soap12/ + http://schemas.xmlsoap.org/wsdl/soap/ + http://www.w3.org/2010/soapjms/ + + false + true + false + + + false + false + false + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/node.idf new file mode 100755 index 000000000..dec14a59f --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage.webservice + false + diff --git a/assets/IS/Packages/SimpleTestPackage/pub/index.html b/assets/IS/Packages/SimpleTestPackage/pub/index.html new file mode 100755 index 000000000..13bebaf89 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/pub/index.html @@ -0,0 +1,2 @@ + +

Welcome to the Home Page for the SimpleTestPackage Package.

\ No newline at end of file diff --git a/assets/IS/Packages/SimpleTestPackage/resources/autoconfig.cnf b/assets/IS/Packages/SimpleTestPackage/resources/autoconfig.cnf new file mode 100755 index 000000000..f094e39a6 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/resources/autoconfig.cnf @@ -0,0 +1,77 @@ + + + + + + localhost + 6849 + Broker #1 + + + + + + + + + + + + + + + + + + + + + wmjmsnaming://Broker #1@localhost6849 + topic + + + + + + + + + + + + + wmjmsnaming://Broker #1@localhost6849 + queue + + + + + wmjmsnaming://Broker #1@localhost6849 + Broker #1 + 6849 + Broker #1 + SimpleTest_ClientGroup + + + + + + JndiAliasDescription + com.webmethods.jms.naming.WmJmsNamingCtxFactory + wmjmsnaming://Broker #1@localhost:6849 + + + + + SimpleTest_JmsConnectionAlias + SimpleTest_JmsClientId + 0 + + SimpleTest_JndiAlias + SimpleTest_ConnectionFactory + + + + + + \ No newline at end of file diff --git a/assets/IS/Packages/SimpleTestPackage/resources/properties.cnf b/assets/IS/Packages/SimpleTestPackage/resources/properties.cnf new file mode 100755 index 000000000..2eb71adc7 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/resources/properties.cnf @@ -0,0 +1,6 @@ +# This is a new config file. Please add new entries in the following format +# key = value +# +simpletest.jms.connectionAlias=SimpleTest_JmsConnectionAlias +simpletest.jms.topic.destinationName=SimpleTest_Topic +simpletest.jms.queue.destinationName=SimpleTest_Queue \ No newline at end of file diff --git a/assets/IS/Packages/SimpleTestPackage/resources/wxconfig.cnf b/assets/IS/Packages/SimpleTestPackage/resources/wxconfig.cnf new file mode 100755 index 000000000..fda3ce883 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/resources/wxconfig.cnf @@ -0,0 +1,77 @@ + + + + + + localhost + 6849 + Broker #1 + + + + + + + + + + + + + + + + + + + + + wmjmsnaming://Broker #1@localhost6849 + topic + + + + + + + + + + + + + wmjmsnaming://Broker #1@localhost6849 + queue + + + + + wmjmsnaming://Broker #1@localhost6849 + Broker #1 + 6849 + Broker #1 + SimpleTest_ClientGroup + + + + + + JndiAliasDescription + com.webmethods.jms.naming.WmJmsNamingCtxFactory + wmjmsnaming://Broker #1@localhost:6849 + + + + + SimpleTest_JmsConnectionAlias + SimpleTest_JmsClientId + 0 + + SimpleTest_JndiAlias + SimpleTest_ConnectionFactory + + + + + + From 9fb0bc6289206f0293266835fb9d2adade2a180b Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Tue, 18 Apr 2017 18:16:14 +0200 Subject: [PATCH 12/50] removed dependency to WxConfig --- assets/IS/Packages/SimpleTestPackage/manifest.v3 | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/IS/Packages/SimpleTestPackage/manifest.v3 b/assets/IS/Packages/SimpleTestPackage/manifest.v3 index 150b928c3..014ccc5ed 100755 --- a/assets/IS/Packages/SimpleTestPackage/manifest.v3 +++ b/assets/IS/Packages/SimpleTestPackage/manifest.v3 @@ -10,7 +10,6 @@ - *.* Default yes From a50a8243e2a6e08ef5151e30357581f831a02d03 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Tue, 18 Apr 2017 18:24:24 +0200 Subject: [PATCH 13/50] removed jdbc adapter for simpler tests --- .../connection/jdbcConnection/node.ndf | 10 - .../adapter/connection/node.idf | 7 - .../ns/simpleTestPackage/adapter/node.idf | 7 - .../adapter/selectTest/node.ndf | 171 ------------------ 4 files changed, 195 deletions(-) delete mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/jdbcConnection/node.ndf delete mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/node.idf delete mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/node.idf delete mode 100755 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/selectTest/node.ndf diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/jdbcConnection/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/jdbcConnection/node.ndf deleted file mode 100755 index 624181049..000000000 --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/jdbcConnection/node.ndf +++ /dev/null @@ -1,10 +0,0 @@ - - - - ConnectionData - simpleTestPackage.adapter.connection:jdbcConnection - SimpleTestPackage - false - 2 - CwQAAAABBQEEGQBjAG8AbQAuAHcAbQAuAGQAYQB0AGEALgBJAFMATQBlAG0ARABhAHQAYQBJAG0AcABsBBUAYwBvAG4AbgBlAGMAdABpAG8AbgBOAG8AZABlAFYAZQByAHMAaQBvAG4LBAAAAAIEDwBhAGQAYQBwAHQAZQByAFQAeQBwAGUATgBhAG0AZQQLAEoARABCAEMAQQBkAGEAcAB0AGUAcgQZAGMAbwBuAG4AZQBjAHQAaQBvAG4ARgBhAGMAdABvAHIAeQBUAHkAcABlAE4AYQBtAGUENgBjAG8AbQAuAHcAbQAuAGEAZABhAHAAdABlAHIALgB3AG0AagBkAGIAYwAuAGMAbwBuAG4AZQBjAHQAaQBvAG4ALgBKAEQAQgBDAEMAbwBuAG4AZQBjAHQAaQBvAG4ARgBhAGMAdABvAHIAeQQUAGMAbwBuAG4AZQBjAHQAaQBvAG4AUAByAG8AcABlAHIAdABpAGUAcwUBAAIEDwBvAHQAaABlAHIAUAByAG8AcABlAHIAdABpAGUAcwQPAGQAcgBpAHYAZQByAFQAeQBwAGUAPQB0AGgAaQBuBA8AbgBlAHQAdwBvAHIAawBQAHIAbwB0AG8AYwBvAGwEAAQKAHAAbwByAHQATgB1AG0AYgBlAHIEBAAxADUAMgAxBAwAZABhAHQAYQBiAGEAcwBlAE4AYQBtAGUEAgBYAEUECABwAGEAcwBzAHcAbwByAGQEPABwAGEAcwBzAHcAbwByAGQALgBzAGkAbQBwAGwAZQBUAGUAcwB0AFAAYQBjAGsAYQBnAGUALgBhAGQAYQBwAHQAZQByAC4AYwBvAG4AbgBlAGMAdABpAG8AbgA6AGoAZABiAGMAQwBvAG4AbgBlAGMAdABpAG8AbgQEAHUAcwBlAHIEDABwAGgAaQBsAF8AYwBmAHMAXwBpAG4AdAQKAHMAZQByAHYAZQByAE4AYQBtAGUEDgAxADkAMgAuADEANgA4AC4ANQAwAC4AMQAyADkEDwBkAGEAdABhAHMAbwB1AHIAYwBlAEMAbABhAHMAcwQvAG8AcgBhAGMAbABlAC4AagBkAGIAYwAuAHAAbwBvAGwALgBPAHIAYQBjAGwAZQBDAG8AbgBuAGUAYwB0AGkAbwBuAFAAbwBvAGwARABhAHQAYQBTAG8AdQByAGMAZQQPAHQAcgBhAG4AcwBhAGMAdABpAG8AbgBUAHkAcABlBBEATABPAEMAQQBMAF8AVABSAEEATgBTAEEAQwBUAEkATwBOAgAEGwBjAG8AbgBuAGUAYwB0AGkAbwBuAE0AYQBuAGEAZwBlAHIAUAByAG8AcABlAHIAdABpAGUAcwUBAAIEEgBzAHQAYQByAHQAdQBwAEIAYQBjAGsAbwBmAGYAUwBlAGMAcwQCADEAMAQRAHMAdABhAHIAdAB1AHAAUgBlAHQAcgB5AEMAbwB1AG4AdAQBADAEDQBlAHgAcABpAHIAZQBUAGkAbQBlAG8AdQB0BAUAMwAwADAAMAAwBA8AYgBsAG8AYwBrAGkAbgBnAFQAaQBtAGUAbwB1AHQEBQA2ADAAMAAwADAEEQBwAG8AbwBsAEkAbgBjAHIAZQBtAGUAbgB0AFMAaQB6AGUEAQAxBA8AbQBhAHgAaQBtAHUAbQBQAG8AbwBsAFMAaQB6AGUEAwAxADAAMAQPAG0AaQBuAGkAbQB1AG0AUABvAG8AbABTAGkAegBlACUECABwAG8AbwBsAGEAYgBsAGUEBAB0AHIAdQBlAgAEEQBjAG8AbgBuAGUAYwB0AGkAbwBuAEUAbgBhAGIAbABlAGQEBQBmAGEAbABzAGUEBQB4AGYAbABkAHMKAQQQAGoAYQB2AGEALgBsAGEAbgBnAC4AUwB0AHIAaQBuAGcAFAIA - diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/node.idf deleted file mode 100755 index dbfaf5d06..000000000 --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/node.idf +++ /dev/null @@ -1,7 +0,0 @@ - - - - interface - simpleTestPackage.adapter.connection - false - diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/node.idf deleted file mode 100755 index e1879eb6e..000000000 --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/node.idf +++ /dev/null @@ -1,7 +0,0 @@ - - - - interface - simpleTestPackage.adapter - false - diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/selectTest/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/selectTest/node.ndf deleted file mode 100755 index 7f6958a09..000000000 --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/selectTest/node.ndf +++ /dev/null @@ -1,171 +0,0 @@ - - - - AdapterService - unknown - unknown - - - record - - - false - false - - false - selectTestInput - record - 0 - true - false - false - - - record - false - selectTestInput - record - 0 - true - false - false - - - record - false - overrideCredentials - record - 0 - true - false - false - - - unknown - false - $dbUser - string - 0 - true - false - false - - - unknown - false - $dbPassword - string - 0 - true - false - false - - - true - - - true - - - record - false - $connectionName - string - 0 - true - false - false - false - - - true - - - record - - - false - false - - false - selectTestOutput - record - 0 - true - false - false - - - record - false - selectTestOutput - record - 0 - true - false - false - - - record - false - results - record - 1 - true - false - false - false - - - unknown - false - CREATED_ON - string - 0 - true - false - false - - - true - - - true - - - true - - - - no - no - no - 15 - 1 - off - no - $null - no - 0 - 0 - none - none - 0 - - - - - - 0 - false - false - true - - 1 - - true - false - service - 1 - CwQAAAABBQEEGQBjAG8AbQAuAHcAbQAuAGQAYQB0AGEALgBJAFMATQBlAG0ARABhAHQAYQBJAG0AcABsBBMAcwBlAHIAdgBpAGMAZQBUAGUAbQBwAGwAYQB0AGUATgBhAG0AZQQlAGMAbwBtAC4AdwBtAC4AYQBkAGEAcAB0AGUAcgAuAHcAbQBqAGQAYgBjAC4AcwBlAHIAdgBpAGMAZQBzAC4AUwBlAGwAZQBjAHQEDgBjAG8AbgBuAGUAYwB0AGkAbwBuAE4AYQBtAGUEMwBzAGkAbQBwAGwAZQBUAGUAcwB0AFAAYQBjAGsAYQBnAGUALgBhAGQAYQBwAHQAZQByAC4AYwBvAG4AbgBlAGMAdABpAG8AbgA6AGoAZABiAGMAQwBvAG4AbgBlAGMAdABpAG8AbgQSAHQAZQBtAHAAbABhAHQAZQBQAHIAbwBwAGUAcgB0AGkAZQBzBQEAAgQTAHQAYQBiAGwAZQBzAC4AdABhAGIAbABlAEkAbgBkAGUAeABlAHMKAQQQAGoAYQB2AGEALgBsAGEAbgBnAC4AUwB0AHIAaQBuAGcEAgB0ADEEEgB0AGEAYgBsAGUAcwAuAGMAYQB0AGEAbABvAGcATgBhAG0AZQoBAAwEEQA8AGMAdQByAHIAZQBuAHQAIABjAGEAdABhAGwAbwBnAD4EEQB0AGEAYgBsAGUAcwAuAHMAYwBoAGUAbQBhAE4AYQBtAGUKAQAMBBAAPABjAHUAcgByAGUAbgB0ACAAcwBjAGgAZQBtAGEAPgQQAHQAYQBiAGwAZQBzAC4AdABhAGIAbABlAE4AYQBtAGUKAQAMBAoAVABFAFMAVABfAFQAQQBCAEwARQQQAHQAYQBiAGwAZQBzAC4AdABhAGIAbABlAFQAeQBwAGUKAQAMBAUAVABBAEIATABFBBEAdABhAGIAbABlAHMALgBjAG8AbAB1AG0AbgBJAG4AZgBvCgEADAQiAEMAUgBFAEEAVABFAEQAXwBPAE4AXABuAFYAQQBSAEMASABBAFIAMgAoADIAMAApAFwAbgAxADIAXABuADEAXABuAAoEFQB0AGEAYgBsAGUAcwAuAHIAZQBhAGwAUwBjAGgAZQBtAGEATgBhAG0AZQoBAAwEDABQAEgASQBMAF8AQwBGAFMAXwBJAE4AVAQQAGoAbwBpAG4AcwAuAGwAZQBmAHQAQwBvAGwAdQBtAG4KAAAMBA4AagBvAGkAbgBzAC4AbwBwAGUAcgBhAHQAbwByCgAADAQRAGoAbwBpAG4AcwAuAHIAaQBnAGgAdABDAG8AbAB1AG0AbgoAAAwEEgBzAGUAbABlAGMAdAAuAGEAbABsAEQAaQBzAHQAaQBuAGMAdAQABBEAcwBlAGwAZQBjAHQALgBlAHgAcAByAGUAcwBzAGkAbwBuCgEADAQNAHQAMQAuAEMAUgBFAEEAVABFAEQAXwBPAE4EEABzAGUAbABlAGMAdAAuAHIAZQBmAEMAbwBsAHUAbQBuCgEADAA0BBEAcwBlAGwAZQBjAHQALgBjAG8AbAB1AG0AbgBUAHkAcABlCgEADAQMAFYAQQBSAEMASABBAFIAMgAoADIAMAApBA8AcwBlAGwAZQBjAHQALgBKAEQAQgBDAFQAeQBwAGUKAQAMBAcAVgBBAFIAQwBIAEEAUgQWAHMAZQBsAGUAYwB0AC4AbwB1AHQAcAB1AHQARgBpAGUAbABkAFQAeQBwAGUKAQAMAAwEFgBzAGUAbABlAGMAdAAuAHIAZQBzAHUAbAB0AEYAaQBlAGwAZABUAHkAcABlCgEADAQSAGoAYQB2AGEALgBsAGEAbgBnAC4AUwB0AHIAaQBuAGcAWwBdBBIAcwBlAGwAZQBjAHQALgBvAHUAdABwAHUAdABGAGkAZQBsAGQKAQAMBAoAQwBSAEUAQQBUAEUARABfAE8ATgQSAHMAZQBsAGUAYwB0AC4AcgBlAHMAdQBsAHQARgBpAGUAbABkCgEADAQUAHIAZQBzAHUAbAB0AHMAWwBdAC4AQwBSAEUAQQBUAEUARABfAE8ATgQWAHMAZQBsAGUAYwB0AC4AcgBlAGEAbABPAHUAdABwAHUAdABGAGkAZQBsAGQKAQAMAFAEEABzAGUAbABlAGMAdAAuAHMAbwByAHQATwByAGQAZQByCgEADAAwBA0AcwBlAGwAZQBjAHQALgBtAGEAeABSAG8AdwQBADAEEwBzAGUAbABlAGMAdAAuAHEAdQBlAHIAeQBUAGkAbQBlAE8AdQB0BAIALQAxBBUAcwBlAGwAZQBjAHQALgByAGUAcwB1AGwAdABSAG8AdwBGAGkAZQBsAGQAMAQZAHMAZQBsAGUAYwB0AC4AcgBlAHMAdQBsAHQAUgBvAHcARgBpAGUAbABkAFQAeQBwAGUEEQBqAGEAdgBhAC4AbABhAG4AZwAuAEkAbgB0AGUAZwBlAHIEFQBzAGUAbABlAGMAdAAuAG4AbwB0AGkAZgB5AE8AbgBVAHAAZABhAHQAZQoAAAwEFwBzAGUAbABlAGMAdAAuAG8AdQB0AHAAdQB0AFYAYQBsAHUAZQBUAHkAcABlAHMKAAAMBBEAcwBlAGwAZQBjAHQALgBhAHUAdABvAEQAZQBsAGUAdABlBAUAZgBhAGwAcwBlBAsAdwBoAGUAcgBlAC4AYQBuAGQATwByCgAADAQPAHcAaABlAHIAZQAuAGwAZQBmAHQAUABhAHIAZQBuCgAADAQOAHcAaABlAHIAZQAuAGwAZQBmAHQARQB4AHAAcgoAAAwEDgB3AGgAZQByAGUALgBvAHAAZQByAGEAdABvAHIKAAAMBA8AdwBoAGUAcgBlAC4AcgBpAGcAaAB0AEUAeABwAHIKAAAMBBAAdwBoAGUAcgBlAC4AcgBpAGcAaAB0AFAAYQByAGUAbgoAAAwEDgB3AGgAZQByAGUALgBKAEQAQgBDAFQAeQBwAGUKAAAMBA8AdwBoAGUAcgBlAC4AaQBuAHAAdQB0AFQAeQBwAGUKAAAMBBAAdwBoAGUAcgBlAC4AaQBuAHAAdQB0AEYAaQBlAGwAZAoAAAwEBgB1AHMAZQByAGkAZAQbAG8AdgBlAHIAcgBpAGQAZQBDAHIAZQBkAGUAbgB0AGkAYQBsAHMALgAkAGQAYgBVAHMAZQByBAoAdQBzAGUAcgBpAGQAVAB5AHAAZQAMBA8AaQBuAHAAdQB0AFUAcwBlAHIAaQBkAFMAaQBnAG4AhQQIAHAAYQBzAHMAdwBvAHIAZAQfAG8AdgBlAHIAcgBpAGQAZQBDAHIAZQBkAGUAbgB0AGkAYQBsAHMALgAkAGQAYgBQAGEAcwBzAHcAbwByAGQEDABwAGEAcwBzAHcAbwByAGQAVAB5AHAAZQAMBBEAaQBuAHAAdQB0AFAAYQBzAHMAdwBvAHIAZABTAGkAZwBuAIsEEABkAGUAcwBpAGcAbgBUAGkAbQBlAEwAbwBjAGEAbABlBAUAZQBuAF8AVQBTAgAEGQBhAGQAYQBwAHQAZQByAFMAZQByAHYAaQBjAGUATgBvAGQAZQBWAGUAcgBzAGkAbwBuCwQAAAACBAsAYQBkAGEAcAB0AGUAcgBUAHkAcABlBAsASgBEAEIAQwBBAGQAYQBwAHQAZQByBA8AaQBuAHAAdQB0AFIAZQBjAG8AcgBkAE4AYQBtAGUEDwBzAGUAbABlAGMAdABUAGUAcwB0AEkAbgBwAHUAdAQQAG8AdQB0AHAAdQB0AFIAZQBjAG8AcgBkAE4AYQBtAGUEEABzAGUAbABlAGMAdABUAGUAcwB0AE8AdQB0AHAAdQB0AgA= - From fbb62a5a9586ded0c93a386e0f78b6f7eb2ace81 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Tue, 18 Apr 2017 18:31:03 +0200 Subject: [PATCH 14/50] added http port to test package for varsub demonstration --- .../implementation/filepolling.class | Bin 3336 -> 2751 bytes .../implementation/math.class | Bin 1822 -> 1534 bytes .../implementation/filepolling.java | 0 .../implementation/math.java | 0 .../SimpleTestPackage/config/auto-config.xml | 0 .../SimpleTestPackage/config/listeners.cnf | 47 ++++++++++++++++++ .../SimpleTestPackage/config/properties.cnf | 0 .../SimpleTestPackage/config/wxconfig.cnf | 0 .../IS/Packages/SimpleTestPackage/manifest.v3 | 8 +-- .../documents/address/node.ndf | 0 .../documents/flatfile/invalidRecord/node.ndf | 0 .../documents/flatfile/node.idf | 0 .../ns/simpleTestPackage/documents/node.idf | 0 .../filepolling/checkErrorDirectory/java.frag | 18 +++---- .../filepolling/checkErrorDirectory/node.ndf | 8 ++- .../filepolling/ffInvalidRecord/node.idf | 0 .../implementation/filepolling/node.idf | 0 .../filepolling/sendAddressToBackend/flow.xml | 0 .../filepolling/sendAddressToBackend/node.ndf | 0 .../filepolling/validateAddress/flow.xml | 0 .../filepolling/validateAddress/node.ndf | 0 .../filepolling/writeErrorFile/flow.xml | 0 .../filepolling/writeErrorFile/node.ndf | 0 .../writeInvalidRecordsToFile/java.frag | 37 +++++++------- .../writeInvalidRecordsToFile/node.ndf | 8 ++- .../math/calculateFibonacci/java.frag | 12 ++--- .../math/calculateFibonacci/node.ndf | 8 ++- .../implementation/math/node.idf | 4 +- .../simpleTestPackage/implementation/node.idf | 0 .../ns/simpleTestPackage/node.idf | 0 .../services/config/autosetup/flow.xml | 0 .../services/config/autosetup/node.ndf | 0 .../services/config/node.idf | 0 .../filepolling/ffDictionary/node.ndf | 0 .../services/filepolling/ffSchema/node.ndf | 0 .../services/filepolling/ffSchemaDT/node.ndf | 0 .../services/filepolling/importFile/flow.xml | 0 .../services/filepolling/importFile/node.ndf | 0 .../services/filepolling/node.idf | 0 .../services/jdbc/invokeJdbcTest/flow.xml | 0 .../services/jdbc/invokeJdbcTest/node.ndf | 0 .../simpleTestPackage/services/jdbc/node.idf | 0 .../simpleTestPackage/services/jms/node.idf | 0 .../jms/receiveInvalidAddress/flow.xml | 0 .../jms/receiveInvalidAddress/node.ndf | 0 .../jms/simpleTestJmsTriggerQueue/node.ndf | 0 .../services/math/addIntegers/flow.xml | 0 .../services/math/addIntegers/node.ndf | 0 .../math/calculateFibonacciNumber/flow.xml | 0 .../math/calculateFibonacciNumber/node.ndf | 0 .../simpleTestPackage/services/math/node.idf | 0 .../ns/simpleTestPackage/services/node.idf | 0 .../services/string/getStringLength/flow.xml | 0 .../services/string/getStringLength/node.ndf | 0 .../services/string/node.idf | 0 .../webservice/jdbc/node.idf | 0 .../webservice/jdbc/provider/node.idf | 0 .../jdbc/provider/testJdbcConnection/node.ndf | 0 .../webservice/math/node.idf | 0 .../webservice/math/provider/node.idf | 0 .../provider/simpleMathOperations/node.ndf | 0 .../ns/simpleTestPackage/webservice/node.idf | 0 .../Packages/SimpleTestPackage/pub/index.html | 0 .../resources/autoconfig.cnf | 0 .../resources/properties.cnf | 0 .../SimpleTestPackage/resources/wxconfig.cnf | 0 66 files changed, 104 insertions(+), 46 deletions(-) mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/code/classes/simpleTestPackage/implementation/filepolling.class mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/code/classes/simpleTestPackage/implementation/math.class mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/code/source/simpleTestPackage/implementation/filepolling.java mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/code/source/simpleTestPackage/implementation/math.java mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/config/auto-config.xml mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/config/listeners.cnf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/config/properties.cnf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/config/wxconfig.cnf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/manifest.v3 mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/address/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/flatfile/invalidRecord/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/flatfile/node.idf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/node.idf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/java.frag mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/ffInvalidRecord/node.idf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/node.idf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/sendAddressToBackend/flow.xml mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/sendAddressToBackend/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/validateAddress/flow.xml mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/validateAddress/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeErrorFile/flow.xml mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeErrorFile/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/java.frag mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/java.frag mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/node.idf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/node.idf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/node.idf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/autosetup/flow.xml mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/autosetup/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/node.idf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffDictionary/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffSchema/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffSchemaDT/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/importFile/flow.xml mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/importFile/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/node.idf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/invokeJdbcTest/flow.xml mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/invokeJdbcTest/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/node.idf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/node.idf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/receiveInvalidAddress/flow.xml mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/receiveInvalidAddress/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/simpleTestJmsTriggerQueue/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/addIntegers/flow.xml mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/addIntegers/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/calculateFibonacciNumber/flow.xml mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/calculateFibonacciNumber/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/node.idf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/node.idf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/getStringLength/flow.xml mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/getStringLength/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/node.idf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/node.idf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/provider/node.idf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/provider/testJdbcConnection/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/node.idf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/provider/node.idf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/provider/simpleMathOperations/node.ndf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/node.idf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/pub/index.html mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/resources/autoconfig.cnf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/resources/properties.cnf mode change 100755 => 100644 assets/IS/Packages/SimpleTestPackage/resources/wxconfig.cnf diff --git a/assets/IS/Packages/SimpleTestPackage/code/classes/simpleTestPackage/implementation/filepolling.class b/assets/IS/Packages/SimpleTestPackage/code/classes/simpleTestPackage/implementation/filepolling.class old mode 100755 new mode 100644 index 8274edfc4f015e698694306026e973de4c463a31..1074ff85d334df571fe818fb4a971c4fc3d5ec46 GIT binary patch delta 800 zcmZva*-z9^6vn?>81AK0NsJ(IeVUkvLU98TMZp;qSyTqxaO+IVaABs!P6ym@a0T~h z{}ByF6HU~_H+}NeH~$Lbi{rUX42hbw=k}cQ`%b^)p2f8v8p@x4y?qa0C!XkNLW-kT zhlW%fhj3V+Psb7T3k+}!>JS)G;i$kdbsiTOR%cp4BXNx4guqEvImL0BWW%3S($1%-uiEKw!{AgM+d{t$YJp%zs3~}jZypn78 zN+p;vFpJ9!Vw}<;tKcvglh%x7O3ze;fo5DWa23}WVvg^7zN%bjsEd-M^qp+r`Gm~j zhJiBX$$^2JXknZ5rF3VkytId%tmoSUvKSb+i+f~a+AGRH zdM>F8#T-LpWF~L9IWryj(#`dhWZrgY?gADW*j5Ag)sG)2mk-fm;8FOadZKCpkHbuC ztf78vAnO&(*@9_Xfo1k3DRwTsi+$4)8$f#6fmqWUu$T0~&`Pl;DmKt{Zo~HQi`de( zgVuz>q~5aRBeWNPNj72)cA<@KN}=;%S8bZH@Of=>V>{*5G$KL7?mvVUUrOlf8Pme< z_*}VzkUT^MDF}`|9Gx6{qh}vS7sq~b`V*tHkOz|Vj&pQZPzU2*mIeXT1|yDD$WG0F Sp=DD7J>gfQl^-ObhU9M_XOiv! delta 1297 zcmZWoO>-1g6g_WxGVi6+WRWI(RW8((Rl0Cxm0E5rt6caK+!)VmGJ%v;)A!xE_uO;ty|4S* z^xUe(kN*npX3SYJAioV& zJf^VML;{JLL}=qW)NOQPR^f32I;t?Fuv_Aojn&A}^x(L{6XxHO26)1lr;KSxJT38z z!m|p`nf&uM)R3SXdOc*>o1 zvt_qZ%8uryynGmaBDx(_)m5*oE5vt3XH)5p_GVy5J*fGCKqmSlnPIw3S8{&6QrM*p z`L%RoVW2CeEdr{@+=x5Fyj(;Jv|ka{e%4eH)oxH#zf9FqK~q6_LEr}iI*5J~UA>*U zGV7LgVV{@xgF>?lRrPB+)P6<4nyHlpgyu6OuwofJa+8^crG0jgUeX;J-FYG}0g;QA%p_Ik1C1zzDmphGVpbj4Wc=BM|#)p(;4Cne@2Ug8@N-|9$wF{dO> zafYpV&ZEOVfv6`je)yz=mvLI+6$fYVs(=%3e{l&8HsY*MOL*jD=t|hr)8A%WBVm^braSu_Z_^0R>IVKWOm)htVxk1R-ZoyWb z68-2!ABEaku?_dKD$N%9=~-BdTd*BFkmR`*1N2(hR0np_OJNu5ldN1vz5AMaiA$G# zwMGalI^BArVFb^R`XI#yDWi}h`4GulG0l&EH$9tl6SyD4Y^E1Sum>X~|CE)Zc!1t# zxOvh0Ycb~V{2R>y{#+X1_qc5{z|Yug258_${D6J&1UKP(jA5J;>}PoyYJs{+VnX78 z#Dnqgpu|HGhj?NCVE?eh;Q>BHiH8?BgY$nZiOdR*KoBPuxVzLcP#T7jn5(N&cqE#$ LH_1mCO~CyRlz;v- diff --git a/assets/IS/Packages/SimpleTestPackage/code/classes/simpleTestPackage/implementation/math.class b/assets/IS/Packages/SimpleTestPackage/code/classes/simpleTestPackage/implementation/math.class old mode 100755 new mode 100644 index d48b6c90051f1afac814786e2bd9f505a52d1104..8225a94d0983303c6518f6610988f00096f1eff1 GIT binary patch delta 417 zcmZ9IOD}^#7=@qts-5~ev5+RNt-C5!_oD9VuI{y#YAUHvl6GN5{DkIP*!c~_LSi9y z68?j&KOthKkw|RLocGK*@4WBaR(<=f-oBrnfnoM+{DdXlHWpzYJw&|p+C=HI>1V*l zAVY=?8^ef~Hc8Az5%w}_&M^by2I3|)QK@Z{k|{yuK`vh?rt_JsAe1cRPR~!WscfOR zoz9f55~Yu8=R!pN_Toh*dtS_)s?z~$~)k!uKNj4Q*Y%6xyefY9kt@Z%AiC)&-{fM~NL{P8MQx>c6(mIpiXPfx!LX~ClF2k8ttpa1{> delta 682 zcmY*XO;giQ6g@9ZOi15!oT_L+rPdE9MbiRBq>4yE2u1y5z}dtP7^$v~b<*AlZzHS%!`^&krNp zcU*>EEA*PJhP&j3(Sq%4ZdAL{R^Zr;6}#=(HEIZ8kfRq~xVindlLZWEt8TxtjfU;7 z8}qfg>qPMcD-CHaujMv8pX5g@Cukb4o5nLcvJG>Ju)>h~FQ~q3he4Ym6aSJjGYrfZ zmc3BZkKA>)O_s!SuSR{7;qXE8T8TlQe&e{U$P4^Xg&DtN^}acdTd-8z=D34-6$>1T zxU1qG#}ZC(EMtYEfMVP&^`uvEpJNpdI3D5=$74MCY)Lt3!~l(?ub}jQ0sBOSgf7BE zyJQO8RP(f-10iRSqkaZwagJ2N{5Ae9 zFEc4NmHeU@Hw=Yv4(D-!P8C)3qK^ipF^W9;$(1E6U;qi?bGS$-;}U6QQW?<2&i^iE q#qX7DF|oUn_;-LYO04X=(J{&#AihLT0!*d-2IC(}Q5_;e!tfuUopEUZ diff --git a/assets/IS/Packages/SimpleTestPackage/code/source/simpleTestPackage/implementation/filepolling.java b/assets/IS/Packages/SimpleTestPackage/code/source/simpleTestPackage/implementation/filepolling.java old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/code/source/simpleTestPackage/implementation/math.java b/assets/IS/Packages/SimpleTestPackage/code/source/simpleTestPackage/implementation/math.java old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/config/auto-config.xml b/assets/IS/Packages/SimpleTestPackage/config/auto-config.xml old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/config/listeners.cnf b/assets/IS/Packages/SimpleTestPackage/config/listeners.cnf old mode 100755 new mode 100644 index 7bf12efd2..6e662e501 --- a/assets/IS/Packages/SimpleTestPackage/config/listeners.cnf +++ b/assets/IS/Packages/SimpleTestPackage/config/listeners.cnf @@ -8,6 +8,8 @@ SimpleTestPackage true FilePollingListener:c:\tmp\citrus\csv\import + FilePollingListener_0_SimpleTestPackage_c:\tmp\citrus\csv\import + Integration Server FilePolling port: 0 webMethods/FilePolling /WmFlatFile/configFilePolling.dsp webMethods @@ -26,6 +28,30 @@ 1 .lock + + 5111 + HTTP + SimpleTestPackage + true + HTTPListener@5111 + d2f5ff3cffbffbdc15b80e589f5 + SimpleTestPort + SimpleTestPort + webMethods/HTTP + /WmRoot/configHTTP.dsp + webMethods + Regular + none + salesforce.com + false + 200 + 20000 + -1 + 0 + 10000 + false + + @@ -37,5 +63,26 @@ FilePollingListener:c:\tmp\citrus\csv\import + + + exclude + + + wm.server:disconnect + wm.server:ping + wm.server.tx:end + wm.server:getClusterNodes + wm.server:getServerNodes + wm.server.csrfguard:isCSRFGuardEnabled + wm.server:noop + wm.server.csrfguard:getCSRFSecretToken + wm.server.tx:execute + wm.server.tx:start + wm.server:connect + wm.server.tx:restart + + + HTTPListener@5111 + diff --git a/assets/IS/Packages/SimpleTestPackage/config/properties.cnf b/assets/IS/Packages/SimpleTestPackage/config/properties.cnf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/config/wxconfig.cnf b/assets/IS/Packages/SimpleTestPackage/config/wxconfig.cnf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/manifest.v3 b/assets/IS/Packages/SimpleTestPackage/manifest.v3 old mode 100755 new mode 100644 index 014ccc5ed..096a5c919 --- a/assets/IS/Packages/SimpleTestPackage/manifest.v3 +++ b/assets/IS/Packages/SimpleTestPackage/manifest.v3 @@ -14,10 +14,10 @@ Default yes SimpleTestPackage - 8.2.234 + 1.0.110 - 2014-01-30 16:06:14 CET - 1.6.0_27 - sagbase.eur.ad.sag + 2017-04-18 18:24:50 CEST + 1.8.0_121 + localhost.localdomain diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/address/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/address/node.ndf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/flatfile/invalidRecord/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/flatfile/invalidRecord/node.ndf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/flatfile/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/flatfile/node.idf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/documents/node.idf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/java.frag b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/java.frag old mode 100755 new mode 100644 index 315fbbe0d..6b78f9d98 --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/java.frag +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/java.frag @@ -8,13 +8,13 @@ java 3.5 true - Ly8gcGlwZWxpbmUNCklEYXRhQ3Vyc29yIHBpcGVsaW5lQ3Vyc29yID0gcGlwZWxpbmUuZ2V0Q3Vy -c29yKCk7DQpTdHJpbmcJaW5ib3VuZEZpbGUgPSBJRGF0YVV0aWwuZ2V0U3RyaW5nKCBwaXBlbGlu -ZUN1cnNvciwgImluYm91bmRGaWxlIik7DQpTdHJpbmcJZmlsZU5hbWUgPSBJRGF0YVV0aWwuZ2V0 -U3RyaW5nKCBwaXBlbGluZUN1cnNvciwgImZpbGVOYW1lIiApOw0KDQpGaWxlIGluYm91bmQgPSBu -ZXcgRmlsZShpbmJvdW5kRmlsZSk7DQpGaWxlIGZpbGVwb2xsaW5nZGlyID0gaW5ib3VuZC5nZXRQ -YXJlbnRGaWxlKCkuZ2V0UGFyZW50RmlsZSgpOw0KRmlsZSBlcnJvckRpciA9IG5ldyBGaWxlKGZp -bGVwb2xsaW5nZGlyLCAiZXJyb3IiKTsNCg0KLy8gcGlwZWxpbmUNCklEYXRhVXRpbC5wdXQoIHBp -cGVsaW5lQ3Vyc29yLCAiZXJyb3JEaXJlY3RvcnkiLCBlcnJvckRpci5nZXRBYnNvbHV0ZVBhdGgo -KSApOw0KcGlwZWxpbmVDdXJzb3IuZGVzdHJveSgpOw0KDQoJDQo= + Ly8gcGlwZWxpbmUKSURhdGFDdXJzb3IgcGlwZWxpbmVDdXJzb3IgPSBwaXBlbGluZS5nZXRDdXJz +b3IoKTsKU3RyaW5nCWluYm91bmRGaWxlID0gSURhdGFVdGlsLmdldFN0cmluZyggcGlwZWxpbmVD +dXJzb3IsICJpbmJvdW5kRmlsZSIpOwpTdHJpbmcJZmlsZU5hbWUgPSBJRGF0YVV0aWwuZ2V0U3Ry +aW5nKCBwaXBlbGluZUN1cnNvciwgImZpbGVOYW1lIiApOwoKRmlsZSBpbmJvdW5kID0gbmV3IEZp +bGUoaW5ib3VuZEZpbGUpOwpGaWxlIGZpbGVwb2xsaW5nZGlyID0gaW5ib3VuZC5nZXRQYXJlbnRG +aWxlKCkuZ2V0UGFyZW50RmlsZSgpOwpGaWxlIGVycm9yRGlyID0gbmV3IEZpbGUoZmlsZXBvbGxp +bmdkaXIsICJlcnJvciIpOwoKLy8gcGlwZWxpbmUKSURhdGFVdGlsLnB1dCggcGlwZWxpbmVDdXJz +b3IsICJlcnJvckRpcmVjdG9yeSIsIGVycm9yRGlyLmdldEFic29sdXRlUGF0aCgpICk7CnBpcGVs +aW5lQ3Vyc29yLmRlc3Ryb3koKTsKCgkK diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/node.ndf old mode 100755 new mode 100644 index 6deec36f5..c3a8c52df --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/node.ndf +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/node.ndf @@ -7,6 +7,7 @@ record + unknown false checkErrorDirectoryInput record @@ -16,7 +17,8 @@ false - unknown + field + unknown false inboundFile string @@ -30,6 +32,7 @@ record + unknown false checkErrorDirectoryOutput record @@ -39,7 +42,8 @@ false - unknown + field + unknown false errorDirectory string diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/ffInvalidRecord/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/ffInvalidRecord/node.idf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/node.idf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/sendAddressToBackend/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/sendAddressToBackend/flow.xml old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/sendAddressToBackend/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/sendAddressToBackend/node.ndf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/validateAddress/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/validateAddress/flow.xml old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/validateAddress/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/validateAddress/node.ndf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeErrorFile/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeErrorFile/flow.xml old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeErrorFile/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeErrorFile/node.ndf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/java.frag b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/java.frag old mode 100755 new mode 100644 index c23d13061..ad5ceedcd --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/java.frag +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/java.frag @@ -9,23 +9,22 @@ java 3.5 true - SURhdGFDdXJzb3IgcGlwZWxpbmVDdXJzb3IgPSBwaXBlbGluZS5nZXRDdXJzb3IoKTsNClN0cmlu -ZwlmaWxlTmFtZSA9IElEYXRhVXRpbC5nZXRTdHJpbmcoIHBpcGVsaW5lQ3Vyc29yLCAiZmlsZU5h -bWUiICk7DQpTdHJpbmcJZGlyID0gSURhdGFVdGlsLmdldFN0cmluZyggcGlwZWxpbmVDdXJzb3Is -ICJkaXIiICk7DQoNCkZpbGUgZiA9IG5ldyBGaWxlKGRpciwgZmlsZU5hbWUpOw0KQnVmZmVyZWRX -cml0ZXIgb3V0ID0gbnVsbDsNCnRyeSB7DQoJb3V0ID0gbmV3IEJ1ZmZlcmVkV3JpdGVyKG5ldyBG -aWxlV3JpdGVyKGYpKTsNCglJRGF0YVtdCWludmFsaWRSZWNvcmQgPSBJRGF0YVV0aWwuZ2V0SURh -dGFBcnJheSggcGlwZWxpbmVDdXJzb3IsICJpbnZhbGlkUmVjb3JkTGlzdCIgKTsNCglpZiAoIGlu -dmFsaWRSZWNvcmQgIT0gbnVsbCkNCgl7DQoJCWZvciAoIGludCBpID0gMDsgaSA8IGludmFsaWRS -ZWNvcmQubGVuZ3RoOyBpKysgKQ0KCQl7DQoJCQlJRGF0YUN1cnNvciBpbnZhbGlkUmVjb3JkQ3Vy -c29yID0gaW52YWxpZFJlY29yZFtpXS5nZXRDdXJzb3IoKTsNCgkJCVN0cmluZwlwb3NpdGlvbiA9 -IElEYXRhVXRpbC5nZXRTdHJpbmcoIGludmFsaWRSZWNvcmRDdXJzb3IsICJwb3NpdGlvbiIgKTsN -CgkJCVN0cmluZwltc2cgPSBJRGF0YVV0aWwuZ2V0U3RyaW5nKCBpbnZhbGlkUmVjb3JkQ3Vyc29y -LCAibXNnIiApOw0KCQkJaW52YWxpZFJlY29yZEN1cnNvci5kZXN0cm95KCk7DQoNCgkJCW91dC53 -cml0ZShwb3NpdGlvbiArICIsIiArIG1zZyk7DQoJCQlvdXQubmV3TGluZSgpOw0KCQl9DQoJfQ0K -CQ0KfSBjYXRjaCggSU9FeGNlcHRpb24gaW9lICkgew0KCXRocm93IG5ldyBTZXJ2aWNlRXhjZXB0 -aW9uKCJjb3VsZCBub3Qgd3JpdGUgZmlsZSB0byBwYXRoICIgKyBmaWxlTmFtZSArICI6ICIgKyBp -b2UpOw0KfSBmaW5hbGx5IHsNCglpZiggb3V0ICE9IG51bGwgKSB7DQoJCXRyeSB7DQoJCQlvdXQu -Y2xvc2UoKTsJCQkJCQ0KCQl9IGNhdGNoKCBJT0V4Y2VwdGlvbiBpb2UgKSB7DQoJCQkvLyBpZ25v -cmUNCgkJfQ0KCX0NCn0NCg== + SURhdGFDdXJzb3IgcGlwZWxpbmVDdXJzb3IgPSBwaXBlbGluZS5nZXRDdXJzb3IoKTsKU3RyaW5n +CWZpbGVOYW1lID0gSURhdGFVdGlsLmdldFN0cmluZyggcGlwZWxpbmVDdXJzb3IsICJmaWxlTmFt +ZSIgKTsKU3RyaW5nCWRpciA9IElEYXRhVXRpbC5nZXRTdHJpbmcoIHBpcGVsaW5lQ3Vyc29yLCAi +ZGlyIiApOwoKRmlsZSBmID0gbmV3IEZpbGUoZGlyLCBmaWxlTmFtZSk7CkJ1ZmZlcmVkV3JpdGVy +IG91dCA9IG51bGw7CnRyeSB7CglvdXQgPSBuZXcgQnVmZmVyZWRXcml0ZXIobmV3IEZpbGVXcml0 +ZXIoZikpOwoJSURhdGFbXQlpbnZhbGlkUmVjb3JkID0gSURhdGFVdGlsLmdldElEYXRhQXJyYXko +IHBpcGVsaW5lQ3Vyc29yLCAiaW52YWxpZFJlY29yZExpc3QiICk7CglpZiAoIGludmFsaWRSZWNv +cmQgIT0gbnVsbCkKCXsKCQlmb3IgKCBpbnQgaSA9IDA7IGkgPCBpbnZhbGlkUmVjb3JkLmxlbmd0 +aDsgaSsrICkKCQl7CgkJCUlEYXRhQ3Vyc29yIGludmFsaWRSZWNvcmRDdXJzb3IgPSBpbnZhbGlk +UmVjb3JkW2ldLmdldEN1cnNvcigpOwoJCQlTdHJpbmcJcG9zaXRpb24gPSBJRGF0YVV0aWwuZ2V0 +U3RyaW5nKCBpbnZhbGlkUmVjb3JkQ3Vyc29yLCAicG9zaXRpb24iICk7CgkJCVN0cmluZwltc2cg +PSBJRGF0YVV0aWwuZ2V0U3RyaW5nKCBpbnZhbGlkUmVjb3JkQ3Vyc29yLCAibXNnIiApOwoJCQlp +bnZhbGlkUmVjb3JkQ3Vyc29yLmRlc3Ryb3koKTsKCgkJCW91dC53cml0ZShwb3NpdGlvbiArICIs +IiArIG1zZyk7CgkJCW91dC5uZXdMaW5lKCk7CgkJfQoJfQoJCn0gY2F0Y2goIElPRXhjZXB0aW9u +IGlvZSApIHsKCXRocm93IG5ldyBTZXJ2aWNlRXhjZXB0aW9uKCJjb3VsZCBub3Qgd3JpdGUgZmls +ZSB0byBwYXRoICIgKyBmaWxlTmFtZSArICI6ICIgKyBpb2UpOwp9IGZpbmFsbHkgewoJaWYoIG91 +dCAhPSBudWxsICkgewoJCXRyeSB7CgkJCW91dC5jbG9zZSgpOwkJCQkJCgkJfSBjYXRjaCggSU9F +eGNlcHRpb24gaW9lICkgewoJCQkvLyBpZ25vcmUKCQl9Cgl9Cn0K diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/node.ndf old mode 100755 new mode 100644 index 24422d960..bfe2382af --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/node.ndf +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/node.ndf @@ -7,6 +7,7 @@ record + unknown false writeInvalidRecordsToFileInput record @@ -16,7 +17,8 @@ false - unknown + field + unknown false fileName string @@ -26,7 +28,8 @@ false - unknown + field + unknown false dir string @@ -37,6 +40,7 @@ record + unknown false invalidRecordList recref diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/java.frag b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/java.frag old mode 100755 new mode 100644 index 42cefa2e2..f5a889f04 --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/java.frag +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/java.frag @@ -8,10 +8,10 @@ java 3.5 true - Ly8gcGlwZWxpbmUNCklEYXRhQ3Vyc29yIHBpcGVsaW5lQ3Vyc29yID0gcGlwZWxpbmUuZ2V0Q3Vy -c29yKCk7DQpJbnRlZ2VyIG4gPSBJRGF0YVV0aWwuZ2V0SW50KCBwaXBlbGluZUN1cnNvciwgIm4i -LDAgKTsNCnBpcGVsaW5lQ3Vyc29yLmRlc3Ryb3koKTsNCg0KaW50IGZpYiA9IGZpYihuKTsNCg0K -Ly8gcGlwZWxpbmUNCklEYXRhQ3Vyc29yIHBpcGVsaW5lQ3Vyc29yXzEgPSBwaXBlbGluZS5nZXRD -dXJzb3IoKTsNCklEYXRhVXRpbC5wdXQoIHBpcGVsaW5lQ3Vyc29yXzEsICJmaWIiLCAiIiArIGZp -YiApOw0KcGlwZWxpbmVDdXJzb3JfMS5kZXN0cm95KCk7DQoNCiAgICANCg== + Ly8gcGlwZWxpbmUKSURhdGFDdXJzb3IgcGlwZWxpbmVDdXJzb3IgPSBwaXBlbGluZS5nZXRDdXJz +b3IoKTsKSW50ZWdlciBuID0gSURhdGFVdGlsLmdldEludCggcGlwZWxpbmVDdXJzb3IsICJuIiww +ICk7CnBpcGVsaW5lQ3Vyc29yLmRlc3Ryb3koKTsKCmludCBmaWIgPSBmaWIobik7CgovLyBwaXBl +bGluZQpJRGF0YUN1cnNvciBwaXBlbGluZUN1cnNvcl8xID0gcGlwZWxpbmUuZ2V0Q3Vyc29yKCk7 +CklEYXRhVXRpbC5wdXQoIHBpcGVsaW5lQ3Vyc29yXzEsICJmaWIiLCAiIiArIGZpYiApOwpwaXBl +bGluZUN1cnNvcl8xLmRlc3Ryb3koKTsKCiAgICAK diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/node.ndf old mode 100755 new mode 100644 index 9ab6b38f7..a7a6473af --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/node.ndf +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/node.ndf @@ -7,6 +7,7 @@ record + unknown false calculateFibonacciInput record @@ -16,7 +17,8 @@ false - unknown + field + unknown false n string @@ -30,6 +32,7 @@ record + unknown false calculateFibonacciOutput record @@ -39,7 +42,8 @@ false - unknown + field + unknown false fib string diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/node.idf old mode 100755 new mode 100644 index d5af4107c..e8ccb3e3e --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/node.idf +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/node.idf @@ -1,7 +1,7 @@ - DQpwcml2YXRlIHN0YXRpYyBpbnQgZmliKGludCBuICkgew0KCWlmIChuIDw9IDEpIHJldHVybiBu -Ow0KICAgIGVsc2UgcmV0dXJuIGZpYihuLTEpICsgZmliKG4tMik7DQp9DQo= + CnByaXZhdGUgc3RhdGljIGludCBmaWIoaW50IG4gKSB7CglpZiAobiA8PSAxKSByZXR1cm4gbjsK +ICAgIGVsc2UgcmV0dXJuIGZpYihuLTEpICsgZmliKG4tMik7Cn0K true diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/node.idf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/node.idf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/autosetup/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/autosetup/flow.xml old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/autosetup/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/autosetup/node.ndf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/config/node.idf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffDictionary/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffDictionary/node.ndf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffSchema/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffSchema/node.ndf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffSchemaDT/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/ffSchemaDT/node.ndf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/importFile/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/importFile/flow.xml old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/importFile/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/importFile/node.ndf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/filepolling/node.idf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/invokeJdbcTest/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/invokeJdbcTest/flow.xml old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/invokeJdbcTest/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/invokeJdbcTest/node.ndf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jdbc/node.idf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/node.idf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/receiveInvalidAddress/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/receiveInvalidAddress/flow.xml old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/receiveInvalidAddress/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/receiveInvalidAddress/node.ndf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/simpleTestJmsTriggerQueue/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/simpleTestJmsTriggerQueue/node.ndf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/addIntegers/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/addIntegers/flow.xml old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/addIntegers/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/addIntegers/node.ndf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/calculateFibonacciNumber/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/calculateFibonacciNumber/flow.xml old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/calculateFibonacciNumber/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/calculateFibonacciNumber/node.ndf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/math/node.idf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/node.idf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/getStringLength/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/getStringLength/flow.xml old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/getStringLength/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/getStringLength/node.ndf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/string/node.idf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/node.idf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/provider/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/provider/node.idf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/provider/testJdbcConnection/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/jdbc/provider/testJdbcConnection/node.ndf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/node.idf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/provider/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/provider/node.idf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/provider/simpleMathOperations/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/math/provider/simpleMathOperations/node.ndf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/webservice/node.idf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/pub/index.html b/assets/IS/Packages/SimpleTestPackage/pub/index.html old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/resources/autoconfig.cnf b/assets/IS/Packages/SimpleTestPackage/resources/autoconfig.cnf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/resources/properties.cnf b/assets/IS/Packages/SimpleTestPackage/resources/properties.cnf old mode 100755 new mode 100644 diff --git a/assets/IS/Packages/SimpleTestPackage/resources/wxconfig.cnf b/assets/IS/Packages/SimpleTestPackage/resources/wxconfig.cnf old mode 100755 new mode 100644 From 4cfc1e68a0651c8456b69f096a86c8c2f80bed18 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Tue, 18 Apr 2017 18:43:37 +0200 Subject: [PATCH 15/50] added dummy config assets for varsub --- assets/IS/config/configPassman.cnf | 36 +++++++++++++++++++++++++++++ assets/IS/config/empw.dat | Bin 0 -> 2415 bytes assets/IS/config/passman.cnf | 33 ++++++++++++++++++++++++++ assets/IS/config/txnPassStore.dat | Bin 0 -> 1459 bytes assets/IS/configPassman.cnf | 36 +++++++++++++++++++++++++++++ 5 files changed, 105 insertions(+) create mode 100644 assets/IS/config/configPassman.cnf create mode 100644 assets/IS/config/empw.dat create mode 100644 assets/IS/config/passman.cnf create mode 100644 assets/IS/config/txnPassStore.dat create mode 100644 assets/IS/configPassman.cnf diff --git a/assets/IS/config/configPassman.cnf b/assets/IS/config/configPassman.cnf new file mode 100644 index 000000000..d765170de --- /dev/null +++ b/assets/IS/config/configPassman.cnf @@ -0,0 +1,36 @@ +# This file contains additional configuration settings for outbound +# password encryption that are not contained in the Integration Server +# Administrator. The file consists of a number of properties, some of +# which are commented out in the default configuration. + +# +# Specify the directory and file name for storing outbound passwords. +# + +outbound.password.store.field.fileName=config/txnPassStore.dat + +# +# +# Is the master password persisted in a file? Default is 'true'. +# + +master.password.storeInFile=true + +# +# Specify other configuration information for a master password that is +# persisted in a file; only used when 'storeInFile' is true. +# +# Specify the directory and file name and the repeat limit. +# + +master.password.field.fileName=config/empw.dat +master.password.field.repeatLimit=3 + +# +# +# Uncomment one line to choose the encryptor to be used as default. +# + +default.encryptor=EntrustPbePlus +#default.encryptor=Base64 +#default.encryptor=None diff --git a/assets/IS/config/empw.dat b/assets/IS/config/empw.dat new file mode 100644 index 0000000000000000000000000000000000000000..0bb36c1a809bfd68db44798c539046d01246317f GIT binary patch literal 2415 zcmb7FOHUI~6ux~4N`sGRz?}=@MpFzR#9$Xtp$<&b252;PQHORYCGAX^nYM!q_pV&I zb?1(iOSk?J7bYggM+{L=(R$7$_g;>}RBbYuo^!tMJCA#MyYqo1+764B=5}^R_D>A1 zzK$~Hw-{rINR-9m5Q~*c+Q{CU{KY4aZ;9Y6=V-Z?53Y3Hy?8F%5#YtzTkH{w!#A{; zv;f2SBRw(1^m@Gmc)mz4Vvre?9;(wX2aRzh(C$ekp-pR~nZjbcb`bj^)o8Y(-5i8q zkP((m)OM0^6^y~ibk)`ylt(`@{tAda8G5Wc|Rn@&W{H<*!j#CKcj3q|z)l-_=IiXN5fzhwL> zwFO_z0X0+l+&zs#`+SfAKY(w9i zT!%~KMoF*O%~aQ1YntAMU3F7#CFPoxwo~`EQ!T@Fn}(Gtz`JWZ)w_<-YMIVVeD~7Z zXZcs>p&ou$MO=rC|G!Qm^7NN>dEri!#Wi-iT=z`J@andevD=oXvt-${D$aJxvmLGK zv2*&S(J{svhE*F|@tnFTW)>Ro zX346#?%(&F+Y`&Vw8us}zBX0V*Eh3u)6ZqHOO48GezKcR^Hac?-wZhqu~Wl*k7sm^}-JV|Dp5K~pZq=@L=W3aSiH9p2SI0VObNM&Q`KLhu literal 0 HcmV?d00001 diff --git a/assets/IS/config/passman.cnf b/assets/IS/config/passman.cnf new file mode 100644 index 000000000..24f146b72 --- /dev/null +++ b/assets/IS/config/passman.cnf @@ -0,0 +1,33 @@ + + + + + com.webmethods.sc.security.passman.impl.datastore.DefaultDataStore + + config/txnPassStore.dat + + com.webmethods.sc.security.passman.impl.masterpw.entrust.EntrustMasterPassword + + 3 + config/empw.dat + + + EntrustPbePlus + EntrustPbePlus + + + com.webmethods.sc.security.passman.impl.encryption.EncryptorImpl + + + com.webmethods.sc.security.passman.impl.encryption.DefaultEncryptor + + + com.webmethods.sc.security.passman.impl.encryption.entrust.EntrustEncryptor + + 7DNfGVKvRf+nSLk8haVi6w== + + + + + + diff --git a/assets/IS/config/txnPassStore.dat b/assets/IS/config/txnPassStore.dat new file mode 100644 index 0000000000000000000000000000000000000000..a1ea83376a1eef0ed03783dd478e8320b30aeb08 GIT binary patch literal 1459 zcmcgs-A>yu7&QzgCeSABVw$#Ts}R#B*c@6q7))GLX@IPulqR%-o5)Q}n>Mk7{k3U# zvA5V;?A7)P)0~b{{)dFLD=T(<&UemtKL7lMrUAW4A{wI4h(e3|5=&40;dMm-0~`}6Bf@Y+tqB)?U644YVtV4oZ*yU5XA(`B=!qKu z6$Ap#blzoPp*fc_PYhzwc4adw2-i-W`hV=^NWQZxN&lVzN1MC&AO6=@b_f6 z)sGRHL4Y0`3`AE#r9ms9TG3oKN|sK(^-Fxm+ywM|tyn(Zu9bS#<0WQWozE>&3s#d& zbu@po?m)VX`!pw0u8IG^lpQmrl#edyNcUy|ZJkyuVCZ`4HkLsYht#3U0^)T@ld49N zSh^}!dpkAR4(NETH73gJp}YpfsJzFaiQ`>n97dcqF(0;z=t)cX`jNc)w&)fQ9E7_ zPn`AKs$a|H_Xl;ow9Px(N~6$>^QB}&kf|3BaYgX95?ts4kBABuE);jovTNGzeqqdV zugttxLe7%kp#!OCC@vaXg#*h;nM%f??d(;JF<{0Gu~eAD(%OCpcav!x6~w4UnPZ($dH=WsWN92(6bdSm)Ejunfyj> zWh1wmsqAKS!-)Yc{>u@kdSE+ucX~X;)rc)2Ua0USBWOWNOfQ>WNIR gs&@hnF%|($t}iP!+O2BpySlY^P;_sSbnPSX2S|*>ivR!s literal 0 HcmV?d00001 diff --git a/assets/IS/configPassman.cnf b/assets/IS/configPassman.cnf new file mode 100644 index 000000000..d765170de --- /dev/null +++ b/assets/IS/configPassman.cnf @@ -0,0 +1,36 @@ +# This file contains additional configuration settings for outbound +# password encryption that are not contained in the Integration Server +# Administrator. The file consists of a number of properties, some of +# which are commented out in the default configuration. + +# +# Specify the directory and file name for storing outbound passwords. +# + +outbound.password.store.field.fileName=config/txnPassStore.dat + +# +# +# Is the master password persisted in a file? Default is 'true'. +# + +master.password.storeInFile=true + +# +# Specify other configuration information for a master password that is +# persisted in a file; only used when 'storeInFile' is true. +# +# Specify the directory and file name and the repeat limit. +# + +master.password.field.fileName=config/empw.dat +master.password.field.repeatLimit=3 + +# +# +# Uncomment one line to choose the encryptor to be used as default. +# + +default.encryptor=EntrustPbePlus +#default.encryptor=Base64 +#default.encryptor=None From 72322ad12a2d3b775ce0d2b84bc76d7f08679127 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Tue, 18 Apr 2017 18:45:05 +0200 Subject: [PATCH 16/50] added dummy config assets for varsub --- project.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/project.properties b/project.properties index a3390c533..1cfdc9e5d 100755 --- a/project.properties +++ b/project.properties @@ -4,6 +4,7 @@ #Asset paths # Use slash "/" as path separator. Example: Use "C:/SoftwareAG", instead of "C:\SoftwareAG". isPackages=./assets/IS/Packages +isConfig=./assets/IS/config # location of the WmTestSuite tests isTests=./assets/IS/Tests bpmProjects=./assets/BPM/ From 5787add416ce018c8434c469aeb5dbae1be574d7 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Tue, 18 Apr 2017 19:16:54 +0200 Subject: [PATCH 17/50] added http port to test package for varsub demonstration --- project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.properties b/project.properties index 1cfdc9e5d..da6d7dd5e 100755 --- a/project.properties +++ b/project.properties @@ -4,7 +4,7 @@ #Asset paths # Use slash "/" as path separator. Example: Use "C:/SoftwareAG", instead of "C:\SoftwareAG". isPackages=./assets/IS/Packages -isConfig=./assets/IS/config +isConfigDir=./assets/IS/config # location of the WmTestSuite tests isTests=./assets/IS/Tests bpmProjects=./assets/BPM/ From 83338109663623477f5d663d4feaa3dfbad469a9 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Tue, 18 Apr 2017 19:54:23 +0200 Subject: [PATCH 18/50] added http port to test package for varsub demonstration --- build.xml | 1 + project.properties | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 9f9023603..1b861e9d5 100755 --- a/build.xml +++ b/build.xml @@ -9,6 +9,7 @@ + diff --git a/project.properties b/project.properties index da6d7dd5e..1cfdc9e5d 100755 --- a/project.properties +++ b/project.properties @@ -4,7 +4,7 @@ #Asset paths # Use slash "/" as path separator. Example: Use "C:/SoftwareAG", instead of "C:\SoftwareAG". isPackages=./assets/IS/Packages -isConfigDir=./assets/IS/config +isConfig=./assets/IS/config # location of the WmTestSuite tests isTests=./assets/IS/Tests bpmProjects=./assets/BPM/ From eb225d9b79a8dcd61eb53345100777e6934e2a40 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Wed, 19 Apr 2017 11:07:32 +0200 Subject: [PATCH 19/50] enabled varsub by adding default config folder to Packages asset dir --- assets/IS/Packages/config/readme.md | 2 ++ assets/IS/config/configPassman.cnf | 36 ---------------------------- assets/IS/config/empw.dat | Bin 2415 -> 0 bytes assets/IS/config/passman.cnf | 33 ------------------------- assets/IS/config/txnPassStore.dat | Bin 1459 -> 0 bytes assets/IS/configPassman.cnf | 36 ---------------------------- 6 files changed, 2 insertions(+), 105 deletions(-) create mode 100644 assets/IS/Packages/config/readme.md delete mode 100644 assets/IS/config/configPassman.cnf delete mode 100644 assets/IS/config/empw.dat delete mode 100644 assets/IS/config/passman.cnf delete mode 100644 assets/IS/config/txnPassStore.dat delete mode 100644 assets/IS/configPassman.cnf diff --git a/assets/IS/Packages/config/readme.md b/assets/IS/Packages/config/readme.md new file mode 100644 index 000000000..1c579d659 --- /dev/null +++ b/assets/IS/Packages/config/readme.md @@ -0,0 +1,2 @@ +The folder "config" in the "Packages" folder is necessary/mandatory so that ABE creates the isconfiguration composites, which are a prerequisite for variable substitution of IS assets like ports, JDBC adapters etc. +Note: ABE (or rather the ABE IS Plugin) creates default files in this folder at runtime if these files are not existing. This is expected. Place files like acls.cnf etc. in here from the IntegrationServer/instances/default/config folder as required (see Deployer documentation). \ No newline at end of file diff --git a/assets/IS/config/configPassman.cnf b/assets/IS/config/configPassman.cnf deleted file mode 100644 index d765170de..000000000 --- a/assets/IS/config/configPassman.cnf +++ /dev/null @@ -1,36 +0,0 @@ -# This file contains additional configuration settings for outbound -# password encryption that are not contained in the Integration Server -# Administrator. The file consists of a number of properties, some of -# which are commented out in the default configuration. - -# -# Specify the directory and file name for storing outbound passwords. -# - -outbound.password.store.field.fileName=config/txnPassStore.dat - -# -# -# Is the master password persisted in a file? Default is 'true'. -# - -master.password.storeInFile=true - -# -# Specify other configuration information for a master password that is -# persisted in a file; only used when 'storeInFile' is true. -# -# Specify the directory and file name and the repeat limit. -# - -master.password.field.fileName=config/empw.dat -master.password.field.repeatLimit=3 - -# -# -# Uncomment one line to choose the encryptor to be used as default. -# - -default.encryptor=EntrustPbePlus -#default.encryptor=Base64 -#default.encryptor=None diff --git a/assets/IS/config/empw.dat b/assets/IS/config/empw.dat deleted file mode 100644 index 0bb36c1a809bfd68db44798c539046d01246317f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2415 zcmb7FOHUI~6ux~4N`sGRz?}=@MpFzR#9$Xtp$<&b252;PQHORYCGAX^nYM!q_pV&I zb?1(iOSk?J7bYggM+{L=(R$7$_g;>}RBbYuo^!tMJCA#MyYqo1+764B=5}^R_D>A1 zzK$~Hw-{rINR-9m5Q~*c+Q{CU{KY4aZ;9Y6=V-Z?53Y3Hy?8F%5#YtzTkH{w!#A{; zv;f2SBRw(1^m@Gmc)mz4Vvre?9;(wX2aRzh(C$ekp-pR~nZjbcb`bj^)o8Y(-5i8q zkP((m)OM0^6^y~ibk)`ylt(`@{tAda8G5Wc|Rn@&W{H<*!j#CKcj3q|z)l-_=IiXN5fzhwL> zwFO_z0X0+l+&zs#`+SfAKY(w9i zT!%~KMoF*O%~aQ1YntAMU3F7#CFPoxwo~`EQ!T@Fn}(Gtz`JWZ)w_<-YMIVVeD~7Z zXZcs>p&ou$MO=rC|G!Qm^7NN>dEri!#Wi-iT=z`J@andevD=oXvt-${D$aJxvmLGK zv2*&S(J{svhE*F|@tnFTW)>Ro zX346#?%(&F+Y`&Vw8us}zBX0V*Eh3u)6ZqHOO48GezKcR^Hac?-wZhqu~Wl*k7sm^}-JV|Dp5K~pZq=@L=W3aSiH9p2SI0VObNM&Q`KLhu diff --git a/assets/IS/config/passman.cnf b/assets/IS/config/passman.cnf deleted file mode 100644 index 24f146b72..000000000 --- a/assets/IS/config/passman.cnf +++ /dev/null @@ -1,33 +0,0 @@ - - - - - com.webmethods.sc.security.passman.impl.datastore.DefaultDataStore - - config/txnPassStore.dat - - com.webmethods.sc.security.passman.impl.masterpw.entrust.EntrustMasterPassword - - 3 - config/empw.dat - - - EntrustPbePlus - EntrustPbePlus - - - com.webmethods.sc.security.passman.impl.encryption.EncryptorImpl - - - com.webmethods.sc.security.passman.impl.encryption.DefaultEncryptor - - - com.webmethods.sc.security.passman.impl.encryption.entrust.EntrustEncryptor - - 7DNfGVKvRf+nSLk8haVi6w== - - - - - - diff --git a/assets/IS/config/txnPassStore.dat b/assets/IS/config/txnPassStore.dat deleted file mode 100644 index a1ea83376a1eef0ed03783dd478e8320b30aeb08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1459 zcmcgs-A>yu7&QzgCeSABVw$#Ts}R#B*c@6q7))GLX@IPulqR%-o5)Q}n>Mk7{k3U# zvA5V;?A7)P)0~b{{)dFLD=T(<&UemtKL7lMrUAW4A{wI4h(e3|5=&40;dMm-0~`}6Bf@Y+tqB)?U644YVtV4oZ*yU5XA(`B=!qKu z6$Ap#blzoPp*fc_PYhzwc4adw2-i-W`hV=^NWQZxN&lVzN1MC&AO6=@b_f6 z)sGRHL4Y0`3`AE#r9ms9TG3oKN|sK(^-Fxm+ywM|tyn(Zu9bS#<0WQWozE>&3s#d& zbu@po?m)VX`!pw0u8IG^lpQmrl#edyNcUy|ZJkyuVCZ`4HkLsYht#3U0^)T@ld49N zSh^}!dpkAR4(NETH73gJp}YpfsJzFaiQ`>n97dcqF(0;z=t)cX`jNc)w&)fQ9E7_ zPn`AKs$a|H_Xl;ow9Px(N~6$>^QB}&kf|3BaYgX95?ts4kBABuE);jovTNGzeqqdV zugttxLe7%kp#!OCC@vaXg#*h;nM%f??d(;JF<{0Gu~eAD(%OCpcav!x6~w4UnPZ($dH=WsWN92(6bdSm)Ejunfyj> zWh1wmsqAKS!-)Yc{>u@kdSE+ucX~X;)rc)2Ua0USBWOWNOfQ>WNIR gs&@hnF%|($t}iP!+O2BpySlY^P;_sSbnPSX2S|*>ivR!s diff --git a/assets/IS/configPassman.cnf b/assets/IS/configPassman.cnf deleted file mode 100644 index d765170de..000000000 --- a/assets/IS/configPassman.cnf +++ /dev/null @@ -1,36 +0,0 @@ -# This file contains additional configuration settings for outbound -# password encryption that are not contained in the Integration Server -# Administrator. The file consists of a number of properties, some of -# which are commented out in the default configuration. - -# -# Specify the directory and file name for storing outbound passwords. -# - -outbound.password.store.field.fileName=config/txnPassStore.dat - -# -# -# Is the master password persisted in a file? Default is 'true'. -# - -master.password.storeInFile=true - -# -# Specify other configuration information for a master password that is -# persisted in a file; only used when 'storeInFile' is true. -# -# Specify the directory and file name and the repeat limit. -# - -master.password.field.fileName=config/empw.dat -master.password.field.repeatLimit=3 - -# -# -# Uncomment one line to choose the encryptor to be used as default. -# - -default.encryptor=EntrustPbePlus -#default.encryptor=Base64 -#default.encryptor=None From 7e881c808b0758f5feffff33037d684c8de26d7c Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Wed, 19 Apr 2017 11:13:42 +0200 Subject: [PATCH 20/50] enabling varsub for is configuration assets --- .gitignore | 1 + project.properties | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c38e3d635..9c4ba00c8 100755 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /logs /assets/IS/**/resources/reports/* /bin/ +/assets/IS/Packages/config/* diff --git a/project.properties b/project.properties index 1cfdc9e5d..a3390c533 100755 --- a/project.properties +++ b/project.properties @@ -4,7 +4,6 @@ #Asset paths # Use slash "/" as path separator. Example: Use "C:/SoftwareAG", instead of "C:\SoftwareAG". isPackages=./assets/IS/Packages -isConfig=./assets/IS/config # location of the WmTestSuite tests isTests=./assets/IS/Tests bpmProjects=./assets/BPM/ From 41137c631ec01e05765604641352332a12281845 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Wed, 19 Apr 2017 11:50:12 +0200 Subject: [PATCH 21/50] removed class files ffrom IS package code/classes folder --- .../implementation/filepolling.class | Bin 2751 -> 0 bytes .../simpleTestPackage/implementation/math.class | Bin 1534 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 assets/IS/Packages/SimpleTestPackage/code/classes/simpleTestPackage/implementation/filepolling.class delete mode 100644 assets/IS/Packages/SimpleTestPackage/code/classes/simpleTestPackage/implementation/math.class diff --git a/assets/IS/Packages/SimpleTestPackage/code/classes/simpleTestPackage/implementation/filepolling.class b/assets/IS/Packages/SimpleTestPackage/code/classes/simpleTestPackage/implementation/filepolling.class deleted file mode 100644 index 1074ff85d334df571fe818fb4a971c4fc3d5ec46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2751 zcmb7G+jA3D82_EN$!?RBOG<$S3Q-Vx51^u^+V1JDa49v_7;+&$oN_JHPMy{m%ED z%}@XQa38=^_%wtj^e8wMLIrxlcpk@9^oDQ(Csp(*=np}~fE-S#7?k$3iZjvvU8qp8>T>8U(U*8)8??5^9FTeQXe9b$ zJ3eNm&8(A7TlRRnK=7btTi#)T%7(^s0##j3iZE;YEZZE&XOgBntS8f)iHzFjbnjxE zy$y}4jT9I)^qeQq+0b`IpVH%L-5!shN?tJyuYJ{EwZ?>LO!m00<91svAsqLbz{Z9? z!^y;_Gx3z}>G9rfj_s0GsOPF-W+nZcfHv(~p4n?p>1iu<#xxu^l^b@BQ5J!kA&;u{ z>sg<+0!Kks!OPrpe;-|cFNmQYG$^1iTxiJ2yM|dWg&Lvt#ry{0`K8{0nrk{2QtGCC7qAZ7Qx3d z$J$c--cyVFDX_b^<$5+7Pwr2~bEZ3Gy73_z%P`9v>kTKLPQ`4;i}@80lQPCUCzjQ{ ziI_k|A|?~~B!XtN2&`L5vQVXDxU9O!W!YR;-px6bs|=vPQeeZy6$-RO%-3Uh!gZz# zEmu8mdL^u_?6?03#3rs=_UNog1nh)X{Y226Wm!`S}fF+A`)mVfjW{oC!P1qLGB6lDnXUi3gIfVc^)K3 zSHq}`Q0dHJL?y*@(sg)r>{)?a*_txC>mT7F&zIVzxk6v~r;ZfHKZ814S7(fl)g;`w za;XGa=BAwzXk8)U<=a+lENZ5DPJsl^2EY8to=3Vo=s9DgogD3dKubC;lc5BPeS8Ns z@s%mCS@sOCg1qK|$1%>kdRjpnXqtn#<2&vxIstWjJMP2&qHBy$@=u*d#mF2gzvH#Q zlJ_=xKgoCVqrg9+;!)S_(C{=45K!iD165FHk2l>zl|Wx}G;kNe{^qDcGcXTzq-74( zi7KsX79oBU0Xe4yqTxA262azZjTW56n!8xrd=KjcmT2roHE~;s-i9@dRYy8INT`vC z9^j_~&+wgKR95onHXx{J+;pcZ_HOO*$dIz!Ij#FQ7k_#5 z2`*}p5W6J=W!giCIW#;-gyqtj;?h7OqJl9Z6~4w!er{o=Xn&>%zv4Ii&ifhs z0(oEI@B9=C2TigUk39IwKj3Y%=x)qmSVa+CO3AIYv!GT|f_11qlW13J&_;LkbQn zIKrC#8)x}T@Mt&x#}srdFu}-jUjl*YcR|_QOT&(K0Av&5ia(`_h?+I PKG|u&7LHxC73lsKQw^sx diff --git a/assets/IS/Packages/SimpleTestPackage/code/classes/simpleTestPackage/implementation/math.class b/assets/IS/Packages/SimpleTestPackage/code/classes/simpleTestPackage/implementation/math.class deleted file mode 100644 index 8225a94d0983303c6518f6610988f00096f1eff1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1534 zcmb7EOH&g;5dH=>>}FX+A~6ub7Ya!b)(7|?hzO!a!$YG~dBVwNh>M#|D%qf3{4-uX zXjuh8sw~g`D9fH?A(42%9C|v_&+qG={q_6%4**lh=;%jWMM6gh;@ud>6%7+QCSmHh zifi4tjvG>&k`B`vMpWF?VIZ#ImOO7uaYu?78I=r@+pLPa48aZCt$5tE1jAUmVi!t| zcp)m@8n@o^yfEt*1>t(!vx}}-;NF`gL)WbB+TI*PXDq(Xpez=16yKY+U9nOvWJUP} z&pLEtY`EfG>aajO7C&~0z=p*u9z!yg-s0Qbbhw*0SF>Bf@{-5T60*2sRUPh$hjzB; za?7$APRG(#v0%O{m^tooGxdOEQsU5;-dmz1fmT#VbendT(8W^m6hlwOBTkli$;YP6 zT8__xo+(z#7L|~ggOa03*|UKN1{f|Mi&Yi(49w#`19Md@7+Ayu6-x#l;*pBS22vO> z@B~i{jNlSOq{&LgE8A{ih)(E8F+^02EsVaaIzWI;F4j~=Yp3? zX7+m4tcdcqD4Q8NY)c$6!qC@78iCCVZ?Rgg6shhRnr@p*!$>O=ZZo~~Y=>5fGNfD@ zwE2&z_|YvJ(7>9kPo%F2hBAn}1g~y$rz%!A<&;zLmO$TwI*GJ(a)3b1(dL(n9~d;- z_10yk`ij%^yNDj)<`^bg_tEdBwa#C|plU;Zw{g_0dBw&RLqGA?MC7NY`lTwdGygyA zw4^zBG3&TSZ@!;CCkz8}7f9!@ApIMrla>d8#4gy^x?|LL0!~1~84UTZ=P8x^ zY5VASwTsR#q%$@&)s66)TEK~408PVAs}cn2qU&{sofP^kwrfn21ffKjLzLkKa# zouIlCq)lQ0CcUp|Tp$mH+P(-~zA_)c3_3{z!cpZD0@2S=B}Y9(15&>JOoom+cKPiE nW~e|Cmr0`_m1>S2GCbnbMjh8_`-W4^_T(^tQzXag8DoC{ALU{~ From 7edb01d9209e821639bd0306145a67e4ff424cf0 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Wed, 19 Apr 2017 11:51:10 +0200 Subject: [PATCH 22/50] removed class files ffrom IS package code/classes folder --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 9c4ba00c8..4c54d0fb8 100755 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /assets/IS/**/resources/reports/* /bin/ /assets/IS/Packages/config/* +/assets/IS/Packages/**/code/classes/**/*.class + From eb227425e91b47514afaac0f99ff2c33e645cf14 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Wed, 19 Apr 2017 16:44:01 +0200 Subject: [PATCH 23/50] changed deployment to QA env to contain one server only, see SR 5278431 --- ENV.groovy | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ENV.groovy b/ENV.groovy index 9a5a75d1c..1a71ea7f4 100755 --- a/ENV.groovy +++ b/ENV.groovy @@ -58,13 +58,6 @@ environments { host = "localhost" port = "8094" username = "Administrator" - //pwd = "manage" - pwdHandle = "ADMIN_IS_QA" - } - is_node2 { - host = "localhost" - port = "8094" - username = "Administrator" //pwd = "manage" pwdHandle = "ADMIN_IS_QA" } From db524ffeb5605e37a14d17341c7a00799d4ec038 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Wed, 19 Apr 2017 16:59:42 +0200 Subject: [PATCH 24/50] removed varsub templates from henning_sagdevops-ci-assets and moved to webmethods-sample-project-layout, so that these are project specific --- Jenkinsfile.unix | 16 +------ .../resources/reports/TEST-FibonachiTest.xml | 43 ++++++++++--------- build.xml | 1 + project.properties | 3 ++ resources/vs/DEV/is/Fibonachi.vs.xml | 7 +++ resources/vs/DEV/is/SimpleTestPackage.vs.xml | 30 +++++++++++++ resources/vs/DEV/is/isconfiguration.vs.xml | 37 ++++++++++++++++ resources/vs/QA/is/Fibonachi.vs.xml | 7 +++ resources/vs/QA/is/SimpleTestPackage.vs.xml | 30 +++++++++++++ resources/vs/QA/is/isconfiguration.vs.xml | 37 ++++++++++++++++ resources/vs/TEST/is/Fibonachi.vs.xml | 7 +++ resources/vs/TEST/is/SimpleTestPackage.vs.xml | 30 +++++++++++++ resources/vs/TEST/is/isconfiguration.vs.xml | 37 ++++++++++++++++ 13 files changed, 250 insertions(+), 35 deletions(-) create mode 100755 resources/vs/DEV/is/Fibonachi.vs.xml create mode 100755 resources/vs/DEV/is/SimpleTestPackage.vs.xml create mode 100644 resources/vs/DEV/is/isconfiguration.vs.xml create mode 100755 resources/vs/QA/is/Fibonachi.vs.xml create mode 100755 resources/vs/QA/is/SimpleTestPackage.vs.xml create mode 100644 resources/vs/QA/is/isconfiguration.vs.xml create mode 100755 resources/vs/TEST/is/Fibonachi.vs.xml create mode 100755 resources/vs/TEST/is/SimpleTestPackage.vs.xml create mode 100644 resources/vs/TEST/is/isconfiguration.vs.xml diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index 36e18ac0b..84450ef58 100755 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -21,8 +21,7 @@ pipeline { def uploadSpec = readFile "${artifactoryUploadFileSpecName}" def buildInfo = Artifactory.newBuildInfo() buildInfo.env.capture = true - buildInfo.env.collect() - + buildInfo.env.collect() // Upload to Artifactory. server.upload spec: uploadSpec, buildInfo: buildInfo server.publishBuildInfo buildInfo @@ -32,19 +31,6 @@ pipeline { stage('DeployToTest') { steps { echo "Deploy stage" -// sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST prepareArtifactoryDownloadSpec" -// script { -// def server = Artifactory.server "${artifactoryServerName}" -// def downloadSpec = readFile "${artifactoryDownloadFileSpecName}" -// def buildInfo = Artifactory.newBuildInfo() -// buildInfo.env.capture = true -// buildInfo.env.collect() -// -// // download from Artifactory. -// server.download spec: downloadSpec, buildInfo: buildInfo -// server.publishBuildInfo buildInfo -// } -// sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST deploy" echo "Executing tests" sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST test" diff --git a/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml b/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml index 2785b1bda..f81958b99 100644 --- a/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml +++ b/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml @@ -1,20 +1,22 @@ - + - + + - + + @@ -23,13 +25,13 @@ - + - + @@ -53,11 +55,11 @@ - - + + - + @@ -73,14 +75,14 @@ - + - - + + @@ -91,11 +93,12 @@ - + + - + @@ -114,8 +117,8 @@ - - + + @@ -141,7 +144,7 @@ - + @@ -152,8 +155,8 @@ - + @@ -175,12 +178,12 @@ - + - - + + diff --git a/build.xml b/build.xml index 1b861e9d5..7c67d00a8 100755 --- a/build.xml +++ b/build.xml @@ -15,6 +15,7 @@ + diff --git a/project.properties b/project.properties index a3390c533..3740990cd 100755 --- a/project.properties +++ b/project.properties @@ -15,6 +15,9 @@ umExport=./assets/UniversalMessaging config.environments=ENV.groovy +config.deployer.varsubDir=resources/vs + + diff --git a/resources/vs/DEV/is/Fibonachi.vs.xml b/resources/vs/DEV/is/Fibonachi.vs.xml new file mode 100755 index 000000000..a067ccaa4 --- /dev/null +++ b/resources/vs/DEV/is/Fibonachi.vs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/vs/DEV/is/SimpleTestPackage.vs.xml b/resources/vs/DEV/is/SimpleTestPackage.vs.xml new file mode 100755 index 000000000..107c53721 --- /dev/null +++ b/resources/vs/DEV/is/SimpleTestPackage.vs.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + diff --git a/resources/vs/DEV/is/isconfiguration.vs.xml b/resources/vs/DEV/is/isconfiguration.vs.xml new file mode 100644 index 000000000..e21c6b506 --- /dev/null +++ b/resources/vs/DEV/is/isconfiguration.vs.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/vs/QA/is/Fibonachi.vs.xml b/resources/vs/QA/is/Fibonachi.vs.xml new file mode 100755 index 000000000..a067ccaa4 --- /dev/null +++ b/resources/vs/QA/is/Fibonachi.vs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/vs/QA/is/SimpleTestPackage.vs.xml b/resources/vs/QA/is/SimpleTestPackage.vs.xml new file mode 100755 index 000000000..107c53721 --- /dev/null +++ b/resources/vs/QA/is/SimpleTestPackage.vs.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + diff --git a/resources/vs/QA/is/isconfiguration.vs.xml b/resources/vs/QA/is/isconfiguration.vs.xml new file mode 100644 index 000000000..97e8a9487 --- /dev/null +++ b/resources/vs/QA/is/isconfiguration.vs.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/vs/TEST/is/Fibonachi.vs.xml b/resources/vs/TEST/is/Fibonachi.vs.xml new file mode 100755 index 000000000..a067ccaa4 --- /dev/null +++ b/resources/vs/TEST/is/Fibonachi.vs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/vs/TEST/is/SimpleTestPackage.vs.xml b/resources/vs/TEST/is/SimpleTestPackage.vs.xml new file mode 100755 index 000000000..107c53721 --- /dev/null +++ b/resources/vs/TEST/is/SimpleTestPackage.vs.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + diff --git a/resources/vs/TEST/is/isconfiguration.vs.xml b/resources/vs/TEST/is/isconfiguration.vs.xml new file mode 100644 index 000000000..54e6d4ef4 --- /dev/null +++ b/resources/vs/TEST/is/isconfiguration.vs.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 8f4fb32c317dc60972952c52822b84e21dd616c3 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Wed, 19 Apr 2017 17:21:44 +0200 Subject: [PATCH 25/50] added Jenkinsfile which demonstrates how to donwload a fbr artifact from Artifactory --- Jenkinsfile.artifactoryDownload.unix | 59 +++++++++++++++++++ Jenkinsfile.unix | 13 ---- .../resources/reports/TEST-FibonachiTest.xml | 42 ++++++------- 3 files changed, 81 insertions(+), 33 deletions(-) create mode 100644 Jenkinsfile.artifactoryDownload.unix diff --git a/Jenkinsfile.artifactoryDownload.unix b/Jenkinsfile.artifactoryDownload.unix new file mode 100644 index 000000000..f62382b84 --- /dev/null +++ b/Jenkinsfile.artifactoryDownload.unix @@ -0,0 +1,59 @@ +pipeline { + agent any + + environment { + // currentDir can be set to specific dir for non github testing + //currentDir = "/home/waa/cce/henning_webmethods-sample-project-layout" + currentDir = "." + artifactoryServerName = "localArtifactory" + artifactoryFileSpecName = "${env.JOB_NAME}.${env.BUILD_NUMBER}.filespec.json" + artifactoryUploadFileSpecName = "upload.${artifactoryFileSpecName}" + artifactoryDownloadFileSpecName = "download.${artifactoryFileSpecName}" + } + + stages { + stage('Build'){ + steps { + echo "Build stage" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} build" + script { + def server = Artifactory.server "${artifactoryServerName}" + def uploadSpec = readFile "${artifactoryUploadFileSpecName}" + def buildInfo = Artifactory.newBuildInfo() + buildInfo.env.capture = true + buildInfo.env.collect() + // Upload to Artifactory. + server.upload spec: uploadSpec, buildInfo: buildInfo + server.publishBuildInfo buildInfo + } + } + } + stage('DeployToTest') { + steps { + echo "Deploy stage" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST deploy" + echo "Executing tests" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST test" + junit 'report/' + } + } + stage('QA') { + steps { + echo "QA stage" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA prepareArtifactoryDownloadSpec" + script { + def server = Artifactory.server "${artifactoryServerName}" + def downloadSpec = readFile "${artifactoryDownloadFileSpecName}" + def buildInfo = Artifactory.newBuildInfo() + buildInfo.env.capture = true + buildInfo.env.collect() + + // download from Artifactory. + server.download spec: downloadSpec, buildInfo: buildInfo + server.publishBuildInfo buildInfo + } + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA deploy" + } + } + } +} \ No newline at end of file diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index 84450ef58..cc533b119 100755 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -8,7 +8,6 @@ pipeline { artifactoryServerName = "localArtifactory" artifactoryFileSpecName = "${env.JOB_NAME}.${env.BUILD_NUMBER}.filespec.json" artifactoryUploadFileSpecName = "upload.${artifactoryFileSpecName}" - artifactoryDownloadFileSpecName = "download.${env.JOB_NAME}.${env.BUILD_NUMBER}.filespec.json" } stages { @@ -40,18 +39,6 @@ pipeline { stage('QA') { steps { echo "QA stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA prepareArtifactoryDownloadSpec" - script { - def server = Artifactory.server "${artifactoryServerName}" - def downloadSpec = readFile "${artifactoryDownloadFileSpecName}" - def buildInfo = Artifactory.newBuildInfo() - buildInfo.env.capture = true - buildInfo.env.collect() - - // download from Artifactory. - server.download spec: downloadSpec, buildInfo: buildInfo - server.publishBuildInfo buildInfo - } sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA deploy" } } diff --git a/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml b/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml index f81958b99..ece85aaec 100644 --- a/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml +++ b/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml @@ -1,21 +1,22 @@ - + - + - + - + + @@ -25,7 +26,7 @@ - + @@ -55,11 +56,11 @@ - - + + - + @@ -75,14 +76,14 @@ - + - - + + @@ -94,11 +95,11 @@ - + - + @@ -117,8 +118,8 @@ - - + + @@ -156,11 +157,12 @@ - - + + + @@ -178,12 +180,12 @@ - + - - + + From b4cb403f8f1cf4f5be26ae3ed330f556a4148e59 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Wed, 19 Apr 2017 19:57:51 +0200 Subject: [PATCH 26/50] unified and simplified configuration. Added parameter to Jenkinsfile to reduce duplicate configuration entries --- Jenkinsfile.artifacctoryUpload.unix | 47 ++++++++++++++ Jenkinsfile.artifactoryDownload.unix | 13 ++-- Jenkinsfile.unix | 22 ++----- Jenkinsfile.win | 9 +-- README.md | 91 ++++++++++++++++++++++++++-- project.properties | 19 +++--- 6 files changed, 163 insertions(+), 38 deletions(-) create mode 100755 Jenkinsfile.artifacctoryUpload.unix diff --git a/Jenkinsfile.artifacctoryUpload.unix b/Jenkinsfile.artifacctoryUpload.unix new file mode 100755 index 000000000..b8a32e1b1 --- /dev/null +++ b/Jenkinsfile.artifacctoryUpload.unix @@ -0,0 +1,47 @@ +pipeline { + agent any + + environment { + // currentDir can be set to specific dir for non github testing + //currentDir = "/home/waa/cce/henning_webmethods-sample-project-layout" + currentDir = "." + artifactoryServerName = "localArtifactory" + artifactoryFileSpecName = "${env.JOB_NAME}.${env.BUILD_NUMBER}.filespec.json" + artifactoryUploadFileSpecName = "upload.${artifactoryFileSpecName}" + fbrType = "artifactory" + } + + stages { + stage('Build'){ + steps { + echo "Build stage" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.fbr.type=${fbrType} -Dbda.artifactoryFileSpecName=${artifactoryFileSpecName} build" + script { + def server = Artifactory.server "${artifactoryServerName}" + def uploadSpec = readFile "${artifactoryUploadFileSpecName}" + def buildInfo = Artifactory.newBuildInfo() + buildInfo.env.capture = true + buildInfo.env.collect() + // Upload to Artifactory. + server.upload spec: uploadSpec, buildInfo: buildInfo + server.publishBuildInfo buildInfo + } + } + } + stage('DeployToTest') { + steps { + echo "Deploy stage" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.fbr.type=${fbrType} deploy" + echo "Executing tests" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.fbr.type=${fbrType} test" + junit 'report/' + } + } + stage('QA') { + steps { + echo "QA stage" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA -Dconfig.fbr.type=${fbrType} deploy" + } + } + } +} \ No newline at end of file diff --git a/Jenkinsfile.artifactoryDownload.unix b/Jenkinsfile.artifactoryDownload.unix index f62382b84..68b527994 100644 --- a/Jenkinsfile.artifactoryDownload.unix +++ b/Jenkinsfile.artifactoryDownload.unix @@ -8,14 +8,15 @@ pipeline { artifactoryServerName = "localArtifactory" artifactoryFileSpecName = "${env.JOB_NAME}.${env.BUILD_NUMBER}.filespec.json" artifactoryUploadFileSpecName = "upload.${artifactoryFileSpecName}" - artifactoryDownloadFileSpecName = "download.${artifactoryFileSpecName}" + artifactoryDownloadFileSpecName = "download.${artifactoryFileSpecName}" + fbrType = "artifactory" } stages { stage('Build'){ steps { echo "Build stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} build" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.fbr.type=${fbrType} -Dbda.artifactoryFileSpecName=${artifactoryFileSpecName} build" script { def server = Artifactory.server "${artifactoryServerName}" def uploadSpec = readFile "${artifactoryUploadFileSpecName}" @@ -31,16 +32,16 @@ pipeline { stage('DeployToTest') { steps { echo "Deploy stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST deploy" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.fbr.type=${fbrType} deploy" echo "Executing tests" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST test" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.fbr.type=${fbrType} test" junit 'report/' } } stage('QA') { steps { echo "QA stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA prepareArtifactoryDownloadSpec" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA -Dconfig.fbr.type=${fbrType} -Dbda.artifactoryFileSpecName=${artifactoryFileSpecName} prepareArtifactoryDownloadSpec" script { def server = Artifactory.server "${artifactoryServerName}" def downloadSpec = readFile "${artifactoryDownloadFileSpecName}" @@ -52,7 +53,7 @@ pipeline { server.download spec: downloadSpec, buildInfo: buildInfo server.publishBuildInfo buildInfo } - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA deploy" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA -Dconfig.fbr.type=${fbrType} deploy" } } } diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index cc533b119..526defdda 100755 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -5,41 +5,29 @@ pipeline { // currentDir can be set to specific dir for non github testing //currentDir = "/home/waa/cce/henning_webmethods-sample-project-layout" currentDir = "." - artifactoryServerName = "localArtifactory" - artifactoryFileSpecName = "${env.JOB_NAME}.${env.BUILD_NUMBER}.filespec.json" - artifactoryUploadFileSpecName = "upload.${artifactoryFileSpecName}" + fbrType = "local" } stages { stage('Build'){ steps { echo "Build stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} build" - script { - def server = Artifactory.server "${artifactoryServerName}" - def uploadSpec = readFile "${artifactoryUploadFileSpecName}" - def buildInfo = Artifactory.newBuildInfo() - buildInfo.env.capture = true - buildInfo.env.collect() - // Upload to Artifactory. - server.upload spec: uploadSpec, buildInfo: buildInfo - server.publishBuildInfo buildInfo - } + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.fbr.type=${fbrType} build" } } stage('DeployToTest') { steps { echo "Deploy stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST deploy" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.fbr.type=${fbrType} -Dbda.targetEnv=TEST deploy" echo "Executing tests" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST test" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.fbr.type=${fbrType} -Dbda.targetEnv=TEST test" junit 'report/' } } stage('QA') { steps { echo "QA stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA deploy" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.fbr.type=${fbrType} -Dbda.targetEnv=QA deploy" } } } diff --git a/Jenkinsfile.win b/Jenkinsfile.win index 325d308a7..a3f427f54 100755 --- a/Jenkinsfile.win +++ b/Jenkinsfile.win @@ -3,28 +3,29 @@ pipeline { environment { currentDir = "." + fbrType = "local" } stages { stage('Build'){ steps { echo "Build stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} build" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.fbr.type=${fbrType} build" } } stage('DeployToTest') { steps { echo "Deploy stage" - bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST deploy" + bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.fbr.type=${fbrType} deploy" echo "Executing tests" - bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} test" + bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.fbr.type=${fbrType} test" junit 'report/' } } stage('QA') { steps { echo "QA stage" - bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA deploy" + bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA -Dconfig.fbr.type=${fbrType} deploy" } } } diff --git a/README.md b/README.md index dad668865..d168056f8 100755 --- a/README.md +++ b/README.md @@ -1,21 +1,104 @@ # webmethods-sample-project-layout -Sample project layout for webMethods assets. This sample also demonstrates CI quick set up together with https://github.com/SoftwareAG/sagdevops-ci-assets +Sample project layout for webMethods assets. This sample demonstrates CI quick set up together with [https://github.com/SoftwareAG/sagdevops-ci-assets](https://github.com/SoftwareAG/sagdevops-ci-assets). + +**Note**: this project is just a sample GIT setup for a typical webMethods project. Use this as your starting point. This project should include everything which is project specific, like variable substitution files for _this_ project, or the target environment specification, which defines the target servers applicable for _this_ project. Anything not project specific, i.e. all the generic deployment scripts etc. are part of the "https://github.com/SoftwareAG/sagdevops-ci-assets](https://github.com/SoftwareAG/sagdevops-ci-assets" project, which is invoked by this project. ## Jump Start with webMethods Structure -The best way to start your webMethods project would be to fork this repo directly in github. This will allow you to directly have a set-up copy of layout that will be completely under your control. +The best way to start your webMethods project would be to fork this repository directly in Github. This will allow you to directly have a set-up copy of layout that will be completely under your control. ## Description This sample webMethods project layout should serve as a template for organizing webMethods projects. It contains demo Integration Server packages with flow services and wM Unit Tests that are covering those. + Fork the repository to easily create a basis for you webMethods project. +## Process + +1. Checkout +2. Build + 1. Copy file [master_build_Reference/build.properties](./master_build_Reference/build.properties) to "${ABE_HOME}/master_build/" + 2. Invoke default ANT target in build.xml located at "${ABE_HOME}/master_build/build.xml" +3. Deploy to Test +3. Test WmTestSuite on Test +4. Deploy to QA + +## Configuration + +The project specific configuration is stored in the file [projects.properties](./projects.properties). It contains the following configurations: + +* __The location of the source assets__, like IS Packages, BPM Processes, etc. These relative paths are mapped to absolute paths in the build.xml. The absolute paths are substituted in the Asset Build Environment's build.properties file intot the property "build.source.dir". Please see the file [master_build_Reference/build.properties](./master_build_Reference/build.properties). Examples are: +** isPackages: defines where the IntegrationServer packages are located, relative to this project +** isTests: defines where the WmTestSuite tests are located +** bpmProjects: defines where the BPM Process Models are located +** etc. +* __config.environments__: The location of the environments groovy defintion file, e.g. "[ENV.groovy](./ENV.groovy)". +* __config.deployer.varsubDir__: The location of the variable substitions files, please see below for details. +* __config.build.version__: The build version in the form of "${MAJOR}.${MINOR}.${PATCH}". Adjust to your liking, has to be changed for each release manually in this file. This build version is used to mark the FBRs, and it is passed along to ABE, which for example sets the build property of package's manifest.v3 file to this value. +* __config.build.artifactory.*__: If you are using Artifactory as a build repository, set these parameter accordingly: + * __config.build.artifactory.repository__: The artifactory repository name + * __config.build.artifactory.path.org__: Since the default implementation uses the standard Ivy notation, provide a dot-separated organization, e.g. "com.softwareag". + ## CI (continuous integration) Jenkinsfiles.win and Jenkinfiles.unix in the root of the project contain Jenkins Pipeline declaration. With these and our [DevOps asset library for version 9.x and 10.0](https://github.com/SoftwareAG/sagdevops-ci-assets) you will be able to set up you CI in a matter of minutes. +The following Jenkinsfile examples are available: + +* __Jenkinsfile.unix, Jenkinsfile.win__: A basic build and deployment pipeline which stores the File-based Repository (FBR) created by the Asset Build Environment in a temporary folder of the Jenkins Workspace. This local FBR is then used for all deployments. +* __Jenkisfile.artifactoryUpload.unix__: An extension to the basic build and deployment pipeline, where the FBR is uploaded to an Artifactory repository after a successful build by the ABE. +* __Jenkinsfile.artifactoryDownload.unix__: An extension to the _Jenkisfile.artifactoryUpload.unix_ file, where an uploaded FBR is later downloaded again from Artifactory. + ## Environments -The file ENV.groovy defines all you environments, e.g. DEV, TEST, QA, PROD. Adjust this file to your infrastructure, i.e. change hosts and ports, adjust the Administrator user and password. +The file ENV.groovy defines all your **target environments**, e.g. DEV, TEST, QA, PROD. Adjust this file to your infrastructure, i.e. add/remove/change target environments, change hosts and ports, adjust the Administrator user and password etc. The environments defined in the ENV.groovy file are used for creating the Project Automator templates, which define the Deployer Projects. The ENV.groovy file also is used for creating the variable substituation files at runtime, as well as executing WmTestSuite tests an all servers of a target environment. + +Note that the Jenkinsfiles references the target environments defined in the EVN.groovy by using the parameter "bda.targetEnv". E.g., the command + +> _sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -D**bda.targetEnv=TEST** deploy_ + +will deploy the current pipeline to the **TEST** environment. + +### Default values + +For parameters in the environment file which are the same for many servers, you can use the default section. E.g. if all IntegrationServers are of version 9.12, instead of adding _"version='9.12'"_ to all IntegrationServer definitions, you can add _"version:'9.12'"_ to the "IntegrationServer > default" array: + +```javascript +IntegrationServer { + defaults = + [version : "9.12", + installDeployerResource: 'true', + test : 'true', + executeACL : 'Administrators', + useSSL : 'false'] +} +environments { + DEV { + IntegrationServers { + is_node1 { + host = "localhost" + port = "8094" + username = "Administrator" + pwd = "manage" + } + } + } + TEST { + IntegrationServers { + is_node1 { + host = "localhost" + port = "8093" + username = "Administrator" + pwdHandle = "ADMIN_IS_TEST", + useSSL = "true" + } + } + } +} +``` + +### Passwords + +ProjectAutomator can handle cleartext passwords (see above "**pwd**"), but also password handles. A password handle must be defined in Deployer and can be referenced in a Project Automator template by using "**pwdHandle**" instead of "pwd". Please refer to the [webMethods Deployer documentation](http://documentation.softwareag.com/webmethods/wmsuites/wmsuite9-12/Deployer/9-12_Deployer_Users_Guide.pdf) "**Automating Project Creation**". -Note that the Jenkinsfiles reference the environments defined in the EVN.groovy by using the parameter "bda.targetEnv". +## Variable Substitution diff --git a/project.properties b/project.properties index 3740990cd..9645fff74 100755 --- a/project.properties +++ b/project.properties @@ -1,23 +1,28 @@ #CI Project Layout #mofidy only if you diviate from the standard structure -#Asset paths +# Asset paths # Use slash "/" as path separator. Example: Use "C:/SoftwareAG", instead of "C:\SoftwareAG". isPackages=./assets/IS/Packages # location of the WmTestSuite tests isTests=./assets/IS/Tests +# location of BPM Processes bpmProjects=./assets/BPM/ +# location of MWS assets like CAF Task projects mwsProjects=./assets/MWS/ +# location of webMethods Business Rules rulesProjects=./assets/Rules/ -#Should always be named UniversalMessaging +#S hould always be named UniversalMessaging umExport=./assets/UniversalMessaging config.environments=ENV.groovy - config.deployer.varsubDir=resources/vs - - - - +config.build.version=1.0.0 +# The parameter "config.fbr.type" is in the example overwritten by the Jenkinsfile +# config.fbr.type=local +config.fbr.type=artifactory +### Artifactory configuration +config.build.artifactory.repository=sag +config.build.artifactory.path.org=com.sag From afb2c3143ea449ff118193f8def2f05e4788db99 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Thu, 20 Apr 2017 13:30:25 +0200 Subject: [PATCH 27/50] added extensive documentation --- Jenkinsfile.artifacctoryUpload.unix | 8 +- Jenkinsfile.artifactoryDownload.unix | 10 +- Jenkinsfile.unix | 8 +- Jenkinsfile.win | 8 +- README.md | 196 ++++++++++++++++++++++++++- project.properties | 6 +- resources/vs/DEV/is/Fibonachi.vs.xml | 0 7 files changed, 211 insertions(+), 25 deletions(-) mode change 100755 => 100644 resources/vs/DEV/is/Fibonachi.vs.xml diff --git a/Jenkinsfile.artifacctoryUpload.unix b/Jenkinsfile.artifacctoryUpload.unix index b8a32e1b1..a73d43654 100755 --- a/Jenkinsfile.artifacctoryUpload.unix +++ b/Jenkinsfile.artifacctoryUpload.unix @@ -15,7 +15,7 @@ pipeline { stage('Build'){ steps { echo "Build stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.fbr.type=${fbrType} -Dbda.artifactoryFileSpecName=${artifactoryFileSpecName} build" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} -Dbda.artifactoryFileSpecName=${artifactoryFileSpecName} build" script { def server = Artifactory.server "${artifactoryServerName}" def uploadSpec = readFile "${artifactoryUploadFileSpecName}" @@ -31,16 +31,16 @@ pipeline { stage('DeployToTest') { steps { echo "Deploy stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.fbr.type=${fbrType} deploy" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.build.fbr.type=${fbrType} deploy" echo "Executing tests" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.fbr.type=${fbrType} test" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.build.fbr.type=${fbrType} test" junit 'report/' } } stage('QA') { steps { echo "QA stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA -Dconfig.fbr.type=${fbrType} deploy" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA -Dconfig.build.fbr.type=${fbrType} deploy" } } } diff --git a/Jenkinsfile.artifactoryDownload.unix b/Jenkinsfile.artifactoryDownload.unix index 68b527994..4b13027b1 100644 --- a/Jenkinsfile.artifactoryDownload.unix +++ b/Jenkinsfile.artifactoryDownload.unix @@ -16,7 +16,7 @@ pipeline { stage('Build'){ steps { echo "Build stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.fbr.type=${fbrType} -Dbda.artifactoryFileSpecName=${artifactoryFileSpecName} build" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} -Dbda.artifactoryFileSpecName=${artifactoryFileSpecName} build" script { def server = Artifactory.server "${artifactoryServerName}" def uploadSpec = readFile "${artifactoryUploadFileSpecName}" @@ -32,16 +32,16 @@ pipeline { stage('DeployToTest') { steps { echo "Deploy stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.fbr.type=${fbrType} deploy" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.build.fbr.type=${fbrType} deploy" echo "Executing tests" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.fbr.type=${fbrType} test" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.build.fbr.type=${fbrType} test" junit 'report/' } } stage('QA') { steps { echo "QA stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA -Dconfig.fbr.type=${fbrType} -Dbda.artifactoryFileSpecName=${artifactoryFileSpecName} prepareArtifactoryDownloadSpec" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA -Dconfig.build.fbr.type=${fbrType} -Dbda.artifactoryFileSpecName=${artifactoryFileSpecName} prepareArtifactoryDownloadSpec" script { def server = Artifactory.server "${artifactoryServerName}" def downloadSpec = readFile "${artifactoryDownloadFileSpecName}" @@ -53,7 +53,7 @@ pipeline { server.download spec: downloadSpec, buildInfo: buildInfo server.publishBuildInfo buildInfo } - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA -Dconfig.fbr.type=${fbrType} deploy" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA -Dconfig.build.fbr.type=${fbrType} deploy" } } } diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index 526defdda..84dd7800c 100755 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -12,22 +12,22 @@ pipeline { stage('Build'){ steps { echo "Build stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.fbr.type=${fbrType} build" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} build" } } stage('DeployToTest') { steps { echo "Deploy stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.fbr.type=${fbrType} -Dbda.targetEnv=TEST deploy" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} -Dbda.targetEnv=TEST deploy" echo "Executing tests" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.fbr.type=${fbrType} -Dbda.targetEnv=TEST test" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} -Dbda.targetEnv=TEST test" junit 'report/' } } stage('QA') { steps { echo "QA stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.fbr.type=${fbrType} -Dbda.targetEnv=QA deploy" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} -Dbda.targetEnv=QA deploy" } } } diff --git a/Jenkinsfile.win b/Jenkinsfile.win index a3f427f54..37d7a33ab 100755 --- a/Jenkinsfile.win +++ b/Jenkinsfile.win @@ -10,22 +10,22 @@ pipeline { stage('Build'){ steps { echo "Build stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.fbr.type=${fbrType} build" + sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} build" } } stage('DeployToTest') { steps { echo "Deploy stage" - bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.fbr.type=${fbrType} deploy" + bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.build.fbr.type=${fbrType} deploy" echo "Executing tests" - bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.fbr.type=${fbrType} test" + bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.build.fbr.type=${fbrType} test" junit 'report/' } } stage('QA') { steps { echo "QA stage" - bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA -Dconfig.fbr.type=${fbrType} deploy" + bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA -Dconfig.build.fbr.type=${fbrType} deploy" } } } diff --git a/README.md b/README.md index d168056f8..a843d453e 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # webmethods-sample-project-layout Sample project layout for webMethods assets. This sample demonstrates CI quick set up together with [https://github.com/SoftwareAG/sagdevops-ci-assets](https://github.com/SoftwareAG/sagdevops-ci-assets). -**Note**: this project is just a sample GIT setup for a typical webMethods project. Use this as your starting point. This project should include everything which is project specific, like variable substitution files for _this_ project, or the target environment specification, which defines the target servers applicable for _this_ project. Anything not project specific, i.e. all the generic deployment scripts etc. are part of the "https://github.com/SoftwareAG/sagdevops-ci-assets](https://github.com/SoftwareAG/sagdevops-ci-assets" project, which is invoked by this project. +**Note**: this project is just a sample GIT setup for a typical webMethods project. Use this as your starting point. This project should include everything which is project specific, like variable substitution files for _this_ project, or the target environment specification, which defines the target servers applicable for _this_ project. Anything not project specific, i.e. all the generic deployment scripts etc. are part of the "[https://github.com/SoftwareAG/sagdevops-ci-assets](https://github.com/SoftwareAG/sagdevops-ci-assets)" project, which is invoked by this project. ## Jump Start with webMethods Structure The best way to start your webMethods project would be to fork this repository directly in Github. This will allow you to directly have a set-up copy of layout that will be completely under your control. @@ -26,19 +26,39 @@ Fork the repository to easily create a basis for you webMethods project. The project specific configuration is stored in the file [projects.properties](./projects.properties). It contains the following configurations: -* __The location of the source assets__, like IS Packages, BPM Processes, etc. These relative paths are mapped to absolute paths in the build.xml. The absolute paths are substituted in the Asset Build Environment's build.properties file intot the property "build.source.dir". Please see the file [master_build_Reference/build.properties](./master_build_Reference/build.properties). Examples are: +* __The location of the source assets__, like IS Packages, BPM Processes, etc. These relative paths are mapped to absolute paths in the build.xml. The absolute paths are substituted in the Asset Build Environment's build.properties file into the property "build.source.dir". Please see the file [master_build_Reference/build.properties](./master_build_Reference/build.properties). Examples are: ** isPackages: defines where the IntegrationServer packages are located, relative to this project ** isTests: defines where the WmTestSuite tests are located ** bpmProjects: defines where the BPM Process Models are located ** etc. -* __config.environments__: The location of the environments groovy defintion file, e.g. "[ENV.groovy](./ENV.groovy)". +* __config.environments__: The location of the environments groovy definition file, e.g. "[ENV.groovy](./ENV.groovy)". * __config.deployer.varsubDir__: The location of the variable substitions files, please see below for details. * __config.build.version__: The build version in the form of "${MAJOR}.${MINOR}.${PATCH}". Adjust to your liking, has to be changed for each release manually in this file. This build version is used to mark the FBRs, and it is passed along to ABE, which for example sets the build property of package's manifest.v3 file to this value. -* __config.build.artifactory.*__: If you are using Artifactory as a build repository, set these parameter accordingly: +* __config.build.fbr.type__: Either "local" or "artifactory": + * __local__: The File-based Repository is stored in the Jenkins workspace and referenced by all build steps + * __artifactory__: The File-based Repository is uploaded to Artifactory after ABE has finished creating it. See below for details on Artifactory settings. _Note: Further build steps still use the local FBR._ +* __config.build.artifactory.*__: If you are using Artifactory as a build repository, set these parameter accordingly. _Note: the Artifactory server is configured in Jenkins itself and is referenced by the Jenkinsfile build pipeline via its name_ * __config.build.artifactory.repository__: The artifactory repository name * __config.build.artifactory.path.org__: Since the default implementation uses the standard Ivy notation, provide a dot-separated organization, e.g. "com.softwareag". + + +## Assets -## CI (continuous integration) +Assets mustn't necessarily be stored in a predefined structure, although the layout provided in this example project is recommended, i.e.: + +* __assets__: Base folder containing sub folders for the different asset types + * __BPM__: BPM Business Processe Projects + * __IS__: IntegrationServer assets + * __Packages__: IntegrationServer packages (not zipped!) + * __config__: Container for configuration assets, copied to this location from _${SAG_HOME}/IntegrationServer/instances/${INSTANCE}/config_. Note: this folder can be empty, but it must exists! + * __Tests__: Contains IS Test packages, see below [WmTestSuite Tests](#wmtestsuite-tests) section for details + * __MWS__: MWS assets like Open CAF projects, CAF Process Tasks etc. + +The asset folder structure is injected into the Asset Build Environment. The paths to the assets are substituted in the Asset Build Environment's build.properties file into the property "build.source.dir". Please see the file [master_build_Reference/build.properties](./master_build_Reference/build.properties). + +If you want to add other assets, like Trading Networks, Business Rules, Universal Messaging assets etc., create such a named folder and put your assets into it. Then create a property in the project.properties file which points to the respective asset folder. Now add the newly created property to master_build_Reference/build.properties](./master_build_Reference/build.properties) file, which is used by the ABE at runtime. + +## Continuous Integration Pipelines Jenkinsfiles.win and Jenkinfiles.unix in the root of the project contain Jenkins Pipeline declaration. With these and our [DevOps asset library for version 9.x and 10.0](https://github.com/SoftwareAG/sagdevops-ci-assets) you will be able to set up you CI in a matter of minutes. @@ -100,5 +120,171 @@ environments { ProjectAutomator can handle cleartext passwords (see above "**pwd**"), but also password handles. A password handle must be defined in Deployer and can be referenced in a Project Automator template by using "**pwdHandle**" instead of "pwd". Please refer to the [webMethods Deployer documentation](http://documentation.softwareag.com/webmethods/wmsuites/wmsuite9-12/Deployer/9-12_Deployer_Users_Guide.pdf) "**Automating Project Creation**". + +## WmTestSuite Tests + +WmTestSuite Tests are referenced by convention, and therefore must be placed in the following folder structure: + +* __assets__ + * __IS__ + * __Tests__ + * __${TESET_PACKAGE_NAME}__: Create an IS package for tests, test stubs, supporting services etc. Name this package the same as the package for which these tests are, suffixed with "Test". E.g., tests for the example IS package "Fibonachi" should be placed in a test IS package named "FibonachiTest". + * __resources__ + * __reports__: Auto generated at test execution time, the Unit test results are placed here + * __test__: Folder containing all test assets, i.e. not only WmTestSuite tests, but also JMeter tests, SoapUI tests etc. Each test type is placed in its own sub-folder + * __xml__: Sub-folder for the WmTestSuite tests. + * __data__: Input and output test pipelines. + * __setup__: WmTestSuite test files. + +Tests are executed by invoking the "test" target in the build.xml. Test results are published to Jenkins and are available for analysis in the Job overview. + + ## Variable Substitution +In order to ease variable substitution, so called "Variable Substitution Template" files can be stored in a "Variable Substitution Repository". + +_**Note**: currently only IntegrationServer package variable substitutions are supported!_ + +### Variable Substitution Repository structure + +The VarSub Repository is stored for each project and has the following structure: + +* __resources/vs__: Base directory for the VarSub Repository + * __${TARGET_ENV}__: For each target environment (e.g. DEV, TEST, QA, PROD) a separate folder must exist which will contain varsub templates for the given target environment. + * __${ASSET_TYPE}__: For each asset type (e.g. "is", "mws", "bpm") a separate folder must exist which will contain varsub templates of the given asset type + * __${COMPOSITE_NAME}.vs.xml__: For each composite for which a variable substitution exists a separate file must exist with the name of the composiste and the file extension "vs.xml". + +### Variable Substitution Templates + +Variable Substitution Templates are Composite and Target Environment specific XML files. + +* "_Composite specific_" means that each composite has its own template which describes the variable substitutions for this composite only +* "_Target Environemnt specific_" means that varsub templates must exist for all possible target environments and must differ only in target environment specific values + +Varsub templates therefore are a "stripped down" version of a "real" variable substitution file (as created by Deployer), i.e. they contain only variable substitution values for one specific composite and one specific target environment. + +A varsub template has the following setup: + +```xml + + + + + + .... + + +``` + +Note: + +* The root node is named "VarSub". This differs from a standard Deployer varsub file, whose root node is "Root" +* There are no "DeploementSet" child nodes, since each varsub template only contains the variable substitution values of a single composite, which in a regular Deployer varsub file are represented by a "DeploementSet" node. +* The variable substitution values are exactly the same as in a regular Deployer varsub file. Note: When values are omitted, then Deployer uses the values provided by the source asset. + +### Examples + +Taking a standard Deployer varsub file like the following, which represents a deployment set containing one IS package named "SimpleTestPackage", which contains a file polling port and a http port: + +```xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +``` + +Creating a varsub repository for the target environment DEV out of this varsub file will result in two files: + +"resources/vs/DEV/is/SimpleTestPackage.vs.xml": + +```xml + + + + + + + + + + + + + +``` + +"resources/vs/DEV/is/isconfiguration.vs.xml": + +```xml + + + + + + + + + + + + + + + + + + + + + + + + + + + > + + +``` + +These two varsub files can now be copied to other target environment specific folders (e.g. "resources/vs/TEST") and adjusted accordingly (e.g. by changing the http port number for TEST from "5114" to "5115"). + +In order to create such varsub templates, you can either export a variable substitution file from Deployer and splitting it manually as explained above, or you can use the utility ANT script "buildDeployer_Varsub.xml" provided in the project "[https://github.com/SoftwareAG/sagdevops-ci-assets](https://github.com/SoftwareAG/sagdevops-ci-assets)". + diff --git a/project.properties b/project.properties index 9645fff74..4634b72be 100755 --- a/project.properties +++ b/project.properties @@ -20,9 +20,9 @@ config.environments=ENV.groovy config.deployer.varsubDir=resources/vs config.build.version=1.0.0 -# The parameter "config.fbr.type" is in the example overwritten by the Jenkinsfile -# config.fbr.type=local -config.fbr.type=artifactory +# The parameter "config.build.fbr.type" is in the example overwritten by the Jenkinsfile +# config.build.fbr.type=local +config.build.fbr.type=artifactory ### Artifactory configuration config.build.artifactory.repository=sag config.build.artifactory.path.org=com.sag diff --git a/resources/vs/DEV/is/Fibonachi.vs.xml b/resources/vs/DEV/is/Fibonachi.vs.xml old mode 100755 new mode 100644 From 51b44ed65215a95d4161d335a11df0f5e955bdab Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Thu, 20 Apr 2017 14:07:54 +0200 Subject: [PATCH 28/50] extended documentation --- README.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a843d453e..ec8f2d232 100755 --- a/README.md +++ b/README.md @@ -12,15 +12,18 @@ This sample webMethods project layout should serve as a template for organizing Fork the repository to easily create a basis for you webMethods project. -## Process +## Deployment Pipeline Process -1. Checkout -2. Build +The basic example deployment pipeline process is as follows: + +1. __Checkout__: Checkout this project from GitHub +2. __Build__ 1. Copy file [master_build_Reference/build.properties](./master_build_Reference/build.properties) to "${ABE_HOME}/master_build/" 2. Invoke default ANT target in build.xml located at "${ABE_HOME}/master_build/build.xml" -3. Deploy to Test -3. Test WmTestSuite on Test -4. Deploy to QA + 3. Store resulting File-based Repository in Jenkins workspace +3. __Deploy__: Deploy to Test +3. __Test__: Execute WmTestSuite tests on Test target environment +4. __Deploy__: If WmTestSuite tests have been successfull, deploy to QA ## Configuration From 8d56583f6f2e1146c71943726b9da41f6ea0f104 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Tue, 25 Apr 2017 20:11:29 +0200 Subject: [PATCH 29/50] first version using splitDelpoymentSets --- ENV.groovy | 11 +++- .../resources/reports/TEST-FibonachiTest.xml | 48 +++++++------- resources/vs/QA/is/Fibonachi.vs.xml | 18 +++--- resources/vs/QA/is/Fibonachi.vs.xml.bak | 7 +++ resources/vs/QA/is/SimpleTestPackage.vs.xml | 41 ++++-------- .../vs/QA/is/SimpleTestPackage.vs.xml.bak | 30 +++++++++ resources/vs/QA/is/isconfiguration.vs.xml | 62 ++++++++----------- resources/vs/QA/is/isconfiguration.vs.xml.bak | 37 +++++++++++ 8 files changed, 153 insertions(+), 101 deletions(-) create mode 100644 resources/vs/QA/is/Fibonachi.vs.xml.bak create mode 100644 resources/vs/QA/is/SimpleTestPackage.vs.xml.bak create mode 100644 resources/vs/QA/is/isconfiguration.vs.xml.bak diff --git a/ENV.groovy b/ENV.groovy index 1a71ea7f4..9f9dd7e8e 100755 --- a/ENV.groovy +++ b/ENV.groovy @@ -1,8 +1,8 @@ IntegrationServer { defaults = [version : "9.12", - installDeployerResource: 'true', - test : 'true', + installDeployerResource: 'false', + test : 'false', executeACL : 'Administrators', useSSL : 'false'] } @@ -58,6 +58,13 @@ environments { host = "localhost" port = "8094" username = "Administrator" + //pwd = "manage" + pwdHandle = "ADMIN_IS_QA" + } + is_node2 { + host = "localhost" + port = "8094" + username = "Administrator" //pwd = "manage" pwdHandle = "ADMIN_IS_QA" } diff --git a/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml b/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml index ece85aaec..d6efa2a8c 100644 --- a/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml +++ b/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml @@ -1,22 +1,20 @@ - + - - + - - + @@ -24,12 +22,12 @@ + - + - @@ -56,11 +54,11 @@ - - + + - + @@ -70,20 +68,19 @@ + - + - - - + @@ -95,11 +92,10 @@ - - + @@ -118,8 +114,8 @@ - - + + @@ -144,9 +140,9 @@ + - @@ -157,18 +153,18 @@ - - + + - + - + @@ -180,12 +176,12 @@ - + - - + + diff --git a/resources/vs/QA/is/Fibonachi.vs.xml b/resources/vs/QA/is/Fibonachi.vs.xml index a067ccaa4..57c8cd260 100755 --- a/resources/vs/QA/is/Fibonachi.vs.xml +++ b/resources/vs/QA/is/Fibonachi.vs.xml @@ -1,7 +1,11 @@ - - - - - - - + + + + + + + + + + + diff --git a/resources/vs/QA/is/Fibonachi.vs.xml.bak b/resources/vs/QA/is/Fibonachi.vs.xml.bak new file mode 100644 index 000000000..a067ccaa4 --- /dev/null +++ b/resources/vs/QA/is/Fibonachi.vs.xml.bak @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/vs/QA/is/SimpleTestPackage.vs.xml b/resources/vs/QA/is/SimpleTestPackage.vs.xml index 107c53721..2d20c6bb1 100755 --- a/resources/vs/QA/is/SimpleTestPackage.vs.xml +++ b/resources/vs/QA/is/SimpleTestPackage.vs.xml @@ -1,30 +1,11 @@ - - - - - - - - - - - - + + + + + + + + + + + diff --git a/resources/vs/QA/is/SimpleTestPackage.vs.xml.bak b/resources/vs/QA/is/SimpleTestPackage.vs.xml.bak new file mode 100644 index 000000000..107c53721 --- /dev/null +++ b/resources/vs/QA/is/SimpleTestPackage.vs.xml.bak @@ -0,0 +1,30 @@ + + + + + + + + + + + + diff --git a/resources/vs/QA/is/isconfiguration.vs.xml b/resources/vs/QA/is/isconfiguration.vs.xml index 97e8a9487..76ce4a7a5 100644 --- a/resources/vs/QA/is/isconfiguration.vs.xml +++ b/resources/vs/QA/is/isconfiguration.vs.xml @@ -1,37 +1,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/vs/QA/is/isconfiguration.vs.xml.bak b/resources/vs/QA/is/isconfiguration.vs.xml.bak new file mode 100644 index 000000000..97e8a9487 --- /dev/null +++ b/resources/vs/QA/is/isconfiguration.vs.xml.bak @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 7c57f76f171d5c5c4fc6513be2e55cb7be98a6e7 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Wed, 26 Apr 2017 13:58:27 +0200 Subject: [PATCH 30/50] added property to control the deployer project name prefix --- project.properties | 3 ++- resources/vs/QA/is/isconfiguration.vs.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/project.properties b/project.properties index 4634b72be..0a06f774c 100755 --- a/project.properties +++ b/project.properties @@ -16,7 +16,8 @@ rulesProjects=./assets/Rules/ umExport=./assets/UniversalMessaging config.environments=ENV.groovy - +# use splitDelpoymentSets=true if for each IS target server a separate DeploymentMap should be used for consecutive deployments +config.deployer.splitDelpoymentSets=false config.deployer.varsubDir=resources/vs config.build.version=1.0.0 diff --git a/resources/vs/QA/is/isconfiguration.vs.xml b/resources/vs/QA/is/isconfiguration.vs.xml index 76ce4a7a5..0e1f821c4 100644 --- a/resources/vs/QA/is/isconfiguration.vs.xml +++ b/resources/vs/QA/is/isconfiguration.vs.xml @@ -17,7 +17,7 @@ - + From 744c7ffb98b0b29e7358faf582cd8fded29b410a Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Wed, 26 Apr 2017 14:14:09 +0200 Subject: [PATCH 31/50] added property to control the deployer project name prefix --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index ec8f2d232..c91a6acb8 100755 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ The project specific configuration is stored in the file [projects.properties](. ** bpmProjects: defines where the BPM Process Models are located ** etc. * __config.environments__: The location of the environments groovy definition file, e.g. "[ENV.groovy](./ENV.groovy)". +* __config.deployer.splitDelpoymentSets__: If "true", deployments are split into in multiple deployment sets with a matching number of deployment candidates. See [Splitting Deployments](#splitting-deployments) for details. * __config.deployer.varsubDir__: The location of the variable substitions files, please see below for details. * __config.build.version__: The build version in the form of "${MAJOR}.${MINOR}.${PATCH}". Adjust to your liking, has to be changed for each release manually in this file. This build version is used to mark the FBRs, and it is passed along to ABE, which for example sets the build property of package's manifest.v3 file to this value. * __config.build.fbr.type__: Either "local" or "artifactory": @@ -123,6 +124,12 @@ environments { ProjectAutomator can handle cleartext passwords (see above "**pwd**"), but also password handles. A password handle must be defined in Deployer and can be referenced in a Project Automator template by using "**pwdHandle**" instead of "pwd". Please refer to the [webMethods Deployer documentation](http://documentation.softwareag.com/webmethods/wmsuites/wmsuite9-12/Deployer/9-12_Deployer_Users_Guide.pdf) "**Automating Project Creation**". +## Splitting Deployments + +By using the configuration parameter "**config.deployer.splitDelpoymentSets**", you can control whether a deployment project should have only one deployment set (and thus only one deployment candidate), which contains all deployment assets to be deployed in one go, or if you want to have multiple deployment sets, one for each target IntegrationServer and one containing all other target nodes (i.e. non-IS nodes). + +* __config.deployer.splitDelpoymentSets=false__: A single DeploymentSet is created, which contains all assets. For this single DeploymentSet a single DeploymentMap is created, which points to all target server specified in the environment definition. And finally, a single DeploymentCandidate is created which references the DeploymentMap, so that the deployment of all assets is done in one go. +* __config.deployer.splitDelpoymentSets=true__: For each IntegrationServer target node specified in the environment definition a separate DeploymentSet, and thus DeploymentMap as well as DeploymentCandiate is created. For all other target nodes (MWS, BPM, TN etc.) a single DelpoymentSet (and DeploymentMap and DeploymentCandidate) is created. Therefore, Deployer does as many deployments as DeploymentSets have been created. Note: variable substitution creation and import is done for each DeploymentMap created. ## WmTestSuite Tests From 5b57c25e7c382f6d61fbfc80371f805286056b67 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Thu, 4 May 2017 22:12:52 +0200 Subject: [PATCH 32/50] clean up Jenkinsfiles for Artifactory integration --- .gitignore | 2 +- Jenkinsfile.artifacctoryUpload.unix | 38 ++-- Jenkinsfile.artifactoryDownload.unix | 64 +++--- .../resources/reports/TEST-FibonachiTest.xml | 187 ------------------ .../test/xml/data/fibExpectedOutput.xml | 7 - .../resources/test/xml/data/fibWrongInput.xml | 7 - .../resources/test/xml/data/finInput.xml | 7 - .../test/xml/data/mockSubstractIntWrong.xml | 7 - .../test/xml/setup/FibonachiTest.xml | 26 --- build.xml | 10 +- resources/vs/DEV/is/Fibonachi.vs.xml | 18 +- resources/vs/DEV/is/SimpleTestPackage.vs.xml | 41 ++-- resources/vs/DEV/is/isconfiguration.vs.xml | 62 +++--- resources/vs/QA/is/isconfiguration.vs.xml | 2 +- 14 files changed, 120 insertions(+), 358 deletions(-) delete mode 100644 assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml delete mode 100755 assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibExpectedOutput.xml delete mode 100755 assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibWrongInput.xml delete mode 100755 assets/IS/Tests/FibonachiTest/resources/test/xml/data/finInput.xml delete mode 100755 assets/IS/Tests/FibonachiTest/resources/test/xml/data/mockSubstractIntWrong.xml delete mode 100755 assets/IS/Tests/FibonachiTest/resources/test/xml/setup/FibonachiTest.xml diff --git a/.gitignore b/.gitignore index 4c54d0fb8..12e8ff8da 100755 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ /bin/ /assets/IS/Packages/config/* /assets/IS/Packages/**/code/classes/**/*.class - +/**/*.bak* diff --git a/Jenkinsfile.artifacctoryUpload.unix b/Jenkinsfile.artifacctoryUpload.unix index a73d43654..3891eecf2 100755 --- a/Jenkinsfile.artifacctoryUpload.unix +++ b/Jenkinsfile.artifacctoryUpload.unix @@ -7,40 +7,48 @@ pipeline { currentDir = "." artifactoryServerName = "localArtifactory" artifactoryFileSpecName = "${env.JOB_NAME}.${env.BUILD_NUMBER}.filespec.json" - artifactoryUploadFileSpecName = "upload.${artifactoryFileSpecName}" + artifactoryUploadFileSpecName = "upload.${artifactoryFileSpecName}" + artifactoryDownloadFileSpecName = "download.${artifactoryFileSpecName}" fbrType = "artifactory" + cmd = "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType}" } stages { stage('Build'){ steps { echo "Build stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} -Dbda.artifactoryFileSpecName=${artifactoryFileSpecName} build" - script { - def server = Artifactory.server "${artifactoryServerName}" - def uploadSpec = readFile "${artifactoryUploadFileSpecName}" - def buildInfo = Artifactory.newBuildInfo() - buildInfo.env.capture = true - buildInfo.env.collect() - // Upload to Artifactory. - server.upload spec: uploadSpec, buildInfo: buildInfo - server.publishBuildInfo buildInfo - } + sh "${cmd} build" } } stage('DeployToTest') { steps { echo "Deploy stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.build.fbr.type=${fbrType} deploy" + sh "${cmd} deploy" echo "Executing tests" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.build.fbr.type=${fbrType} test" + sh "${cmd} test" junit 'report/' } } + stage('Publish') { + steps { + echo "Publish stage" + sh "${cmd} -Dbda.artifactoryFileSpecName=${artifactoryUploadFileSpecName} prepareArtifactoryUploadSpec" + script { + def server = Artifactory.server "${artifactoryServerName}" + def uploadSpec = readFile "${artifactoryUploadFileSpecName}" + def buildInfo = Artifactory.newBuildInfo() + buildInfo.env.capture = true + buildInfo.env.collect() + // Upload to Artifactory. + server.upload spec: uploadSpec, buildInfo: buildInfo + server.publishBuildInfo buildInfo + } + } + } stage('QA') { steps { echo "QA stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA -Dconfig.build.fbr.type=${fbrType} deploy" + sh "${cmd} deploy" } } } diff --git a/Jenkinsfile.artifactoryDownload.unix b/Jenkinsfile.artifactoryDownload.unix index 4b13027b1..d42249dc4 100644 --- a/Jenkinsfile.artifactoryDownload.unix +++ b/Jenkinsfile.artifactoryDownload.unix @@ -10,50 +10,62 @@ pipeline { artifactoryUploadFileSpecName = "upload.${artifactoryFileSpecName}" artifactoryDownloadFileSpecName = "download.${artifactoryFileSpecName}" fbrType = "artifactory" + cmd = "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType}" } stages { stage('Build'){ steps { echo "Build stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} -Dbda.artifactoryFileSpecName=${artifactoryFileSpecName} build" - script { - def server = Artifactory.server "${artifactoryServerName}" - def uploadSpec = readFile "${artifactoryUploadFileSpecName}" - def buildInfo = Artifactory.newBuildInfo() - buildInfo.env.capture = true - buildInfo.env.collect() - // Upload to Artifactory. - server.upload spec: uploadSpec, buildInfo: buildInfo - server.publishBuildInfo buildInfo - } + sh "${cmd} build" } } stage('DeployToTest') { steps { echo "Deploy stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.build.fbr.type=${fbrType} deploy" + sh "${cmd} deploy" echo "Executing tests" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.build.fbr.type=${fbrType} test" + sh "${cmd} test" junit 'report/' } } - stage('QA') { + stage('Publish') { + steps { + echo "Publish stage" + sh "${cmd} -Dbda.artifactoryFileSpecName=${artifactoryUploadFileSpecName} prepareArtifactoryUploadSpec" + script { + def server = Artifactory.server "${artifactoryServerName}" + def uploadSpec = readFile "${artifactoryUploadFileSpecName}" + def buildInfo = Artifactory.newBuildInfo() + buildInfo.env.capture = true + buildInfo.env.collect() + // Upload to Artifactory. + server.upload spec: uploadSpec, buildInfo: buildInfo + server.publishBuildInfo buildInfo + } + } + } + stage('Download') { steps { - echo "QA stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA -Dconfig.build.fbr.type=${fbrType} -Dbda.artifactoryFileSpecName=${artifactoryFileSpecName} prepareArtifactoryDownloadSpec" + echo "Download stage" + sh "${cmd} -Dbda.artifactoryFileSpecName=${artifactoryDownloadFileSpecName} prepareArtifactoryDownloadSpec" script { - def server = Artifactory.server "${artifactoryServerName}" - def downloadSpec = readFile "${artifactoryDownloadFileSpecName}" - def buildInfo = Artifactory.newBuildInfo() - buildInfo.env.capture = true - buildInfo.env.collect() - - // download from Artifactory. - server.download spec: downloadSpec, buildInfo: buildInfo - server.publishBuildInfo buildInfo + def server = Artifactory.server "${artifactoryServerName}" + def downloadSpec = readFile "${artifactoryDownloadFileSpecName}" + def buildInfo = Artifactory.newBuildInfo() + buildInfo.env.capture = true + buildInfo.env.collect() + + // download from Artifactory. + server.download spec: downloadSpec, buildInfo: buildInfo + server.publishBuildInfo buildInfo } - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA -Dconfig.build.fbr.type=${fbrType} deploy" + } + } + stage('QA') { + steps { + echo "QA stage" + sh "${cmd} deploy" } } } diff --git a/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml b/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml deleted file mode 100644 index d6efa2a8c..000000000 --- a/assets/IS/Tests/FibonachiTest/resources/reports/TEST-FibonachiTest.xml +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 100755 index 4b29f776e..000000000 --- a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibExpectedOutput.xml +++ /dev/null @@ -1,7 +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 100755 index 1477c8a74..000000000 --- a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibWrongInput.xml +++ /dev/null @@ -1,7 +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 100755 index 895103e8a..000000000 --- a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/finInput.xml +++ /dev/null @@ -1,7 +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 100755 index 559006ec6..000000000 --- a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/mockSubstractIntWrong.xml +++ /dev/null @@ -1,7 +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 100755 index f8fa3a7b6..000000000 --- a/assets/IS/Tests/FibonachiTest/resources/test/xml/setup/FibonachiTest.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build.xml b/build.xml index 7c67d00a8..9b8fac8f8 100755 --- a/build.xml +++ b/build.xml @@ -25,6 +25,9 @@ + + + @@ -35,11 +38,16 @@ - + + + + + + diff --git a/resources/vs/DEV/is/Fibonachi.vs.xml b/resources/vs/DEV/is/Fibonachi.vs.xml index a067ccaa4..57c8cd260 100644 --- a/resources/vs/DEV/is/Fibonachi.vs.xml +++ b/resources/vs/DEV/is/Fibonachi.vs.xml @@ -1,7 +1,11 @@ - - - - - - - + + + + + + + + + + + diff --git a/resources/vs/DEV/is/SimpleTestPackage.vs.xml b/resources/vs/DEV/is/SimpleTestPackage.vs.xml index 107c53721..2d20c6bb1 100755 --- a/resources/vs/DEV/is/SimpleTestPackage.vs.xml +++ b/resources/vs/DEV/is/SimpleTestPackage.vs.xml @@ -1,30 +1,11 @@ - - - - - - - - - - - - + + + + + + + + + + + diff --git a/resources/vs/DEV/is/isconfiguration.vs.xml b/resources/vs/DEV/is/isconfiguration.vs.xml index e21c6b506..76ce4a7a5 100644 --- a/resources/vs/DEV/is/isconfiguration.vs.xml +++ b/resources/vs/DEV/is/isconfiguration.vs.xml @@ -1,37 +1,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/vs/QA/is/isconfiguration.vs.xml b/resources/vs/QA/is/isconfiguration.vs.xml index 0e1f821c4..76ce4a7a5 100644 --- a/resources/vs/QA/is/isconfiguration.vs.xml +++ b/resources/vs/QA/is/isconfiguration.vs.xml @@ -17,7 +17,7 @@ - + From c88fbc32b0d813d9bca85cec1851968b242593f0 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Thu, 4 May 2017 22:16:49 +0200 Subject: [PATCH 33/50] clean up Jenkinsfiles --- Jenkinsfile.artifacctoryUpload.unix | 1 - Jenkinsfile.artifactoryDownload.unix | 1 - Jenkinsfile.unix | 10 +++++----- Jenkinsfile.win | 16 +++++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Jenkinsfile.artifacctoryUpload.unix b/Jenkinsfile.artifacctoryUpload.unix index 3891eecf2..3d1211ca4 100755 --- a/Jenkinsfile.artifacctoryUpload.unix +++ b/Jenkinsfile.artifacctoryUpload.unix @@ -3,7 +3,6 @@ pipeline { environment { // currentDir can be set to specific dir for non github testing - //currentDir = "/home/waa/cce/henning_webmethods-sample-project-layout" currentDir = "." artifactoryServerName = "localArtifactory" artifactoryFileSpecName = "${env.JOB_NAME}.${env.BUILD_NUMBER}.filespec.json" diff --git a/Jenkinsfile.artifactoryDownload.unix b/Jenkinsfile.artifactoryDownload.unix index d42249dc4..8b315b828 100644 --- a/Jenkinsfile.artifactoryDownload.unix +++ b/Jenkinsfile.artifactoryDownload.unix @@ -3,7 +3,6 @@ pipeline { environment { // currentDir can be set to specific dir for non github testing - //currentDir = "/home/waa/cce/henning_webmethods-sample-project-layout" currentDir = "." artifactoryServerName = "localArtifactory" artifactoryFileSpecName = "${env.JOB_NAME}.${env.BUILD_NUMBER}.filespec.json" diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index 84dd7800c..b58107fab 100755 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -3,31 +3,31 @@ pipeline { environment { // currentDir can be set to specific dir for non github testing - //currentDir = "/home/waa/cce/henning_webmethods-sample-project-layout" currentDir = "." fbrType = "local" + cmd = "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType}" } stages { stage('Build'){ steps { echo "Build stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} build" + sh "${cmd} build" } } stage('DeployToTest') { steps { echo "Deploy stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} -Dbda.targetEnv=TEST deploy" + sh "${cmd} deploy" echo "Executing tests" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} -Dbda.targetEnv=TEST test" + sh "${cmd} test" junit 'report/' } } stage('QA') { steps { echo "QA stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} -Dbda.targetEnv=QA deploy" + sh "${cmd} deploy" } } } diff --git a/Jenkinsfile.win b/Jenkinsfile.win index 37d7a33ab..b58107fab 100755 --- a/Jenkinsfile.win +++ b/Jenkinsfile.win @@ -1,32 +1,34 @@ pipeline { - agent any + agent any environment { + // currentDir can be set to specific dir for non github testing currentDir = "." fbrType = "local" + cmd = "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType}" } - + stages { stage('Build'){ steps { echo "Build stage" - sh "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} build" + sh "${cmd} build" } } stage('DeployToTest') { steps { echo "Deploy stage" - bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.build.fbr.type=${fbrType} deploy" + sh "${cmd} deploy" echo "Executing tests" - bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=TEST -Dconfig.build.fbr.type=${fbrType} test" + sh "${cmd} test" junit 'report/' } } stage('QA') { steps { echo "QA stage" - bat "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dbda.targetEnv=QA -Dconfig.build.fbr.type=${fbrType} deploy" + sh "${cmd} deploy" } } } -} +} \ No newline at end of file From 55022bfa2f1b3bb2fba040181ceedf81f07f7d47 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Wed, 17 May 2017 14:58:55 +0200 Subject: [PATCH 34/50] cleanupproperties naming: prefixed asset locations with 'config.assets.' --- .gitignore | 4 +-- .../test/xml/data/fibExpectedOutput.xml | 7 +++++ .../resources/test/xml/data/fibWrongInput.xml | 7 +++++ .../resources/test/xml/data/finInput.xml | 7 +++++ .../test/xml/data/mockSubstractIntWrong.xml | 7 +++++ .../test/xml/setup/FibonachiTest.xml | 26 +++++++++++++++++++ build.xml | 13 +++++----- project.properties | 12 ++++----- 8 files changed, 68 insertions(+), 15 deletions(-) create mode 100755 assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibExpectedOutput.xml create mode 100755 assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibWrongInput.xml create mode 100755 assets/IS/Tests/FibonachiTest/resources/test/xml/data/finInput.xml create mode 100755 assets/IS/Tests/FibonachiTest/resources/test/xml/data/mockSubstractIntWrong.xml create mode 100755 assets/IS/Tests/FibonachiTest/resources/test/xml/setup/FibonachiTest.xml diff --git a/.gitignore b/.gitignore index 12e8ff8da..2b136f100 100755 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ /logs -/assets/IS/**/resources/reports/* /bin/ /assets/IS/Packages/config/* -/assets/IS/Packages/**/code/classes/**/*.class +/assets/IS/Packages/*/code/classes/**/*.class /**/*.bak* +assets/IS/Tests/*/resources/reports/**/*.* diff --git a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibExpectedOutput.xml b/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibExpectedOutput.xml new file mode 100755 index 000000000..4b29f776e --- /dev/null +++ b/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibExpectedOutput.xml @@ -0,0 +1,7 @@ + + + + + 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 new file mode 100755 index 000000000..1477c8a74 --- /dev/null +++ b/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibWrongInput.xml @@ -0,0 +1,7 @@ + + + + + -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 new file mode 100755 index 000000000..895103e8a --- /dev/null +++ b/assets/IS/Tests/FibonachiTest/resources/test/xml/data/finInput.xml @@ -0,0 +1,7 @@ + + + + + 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 new file mode 100755 index 000000000..559006ec6 --- /dev/null +++ b/assets/IS/Tests/FibonachiTest/resources/test/xml/data/mockSubstractIntWrong.xml @@ -0,0 +1,7 @@ + + + + + 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 new file mode 100755 index 000000000..f8fa3a7b6 --- /dev/null +++ b/assets/IS/Tests/FibonachiTest/resources/test/xml/setup/FibonachiTest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build.xml b/build.xml index 9b8fac8f8..7798c366d 100755 --- a/build.xml +++ b/build.xml @@ -8,13 +8,12 @@ - - - - - - - + + + + + + diff --git a/project.properties b/project.properties index 0a06f774c..f5a579390 100755 --- a/project.properties +++ b/project.properties @@ -3,17 +3,17 @@ # Asset paths # Use slash "/" as path separator. Example: Use "C:/SoftwareAG", instead of "C:\SoftwareAG". -isPackages=./assets/IS/Packages +config.assets.isPackages=./assets/IS/Packages # location of the WmTestSuite tests -isTests=./assets/IS/Tests +config.assets.isTests=./assets/IS/Tests # location of BPM Processes -bpmProjects=./assets/BPM/ +config.assets.bpmProjects=./assets/BPM/ # location of MWS assets like CAF Task projects -mwsProjects=./assets/MWS/ +config.assets.mwsProjects=./assets/MWS/ # location of webMethods Business Rules -rulesProjects=./assets/Rules/ +config.assets.rulesProjects=./assets/Rules/ #S hould always be named UniversalMessaging -umExport=./assets/UniversalMessaging +config.assets.umExport=./assets/UniversalMessaging config.environments=ENV.groovy # use splitDelpoymentSets=true if for each IS target server a separate DeploymentMap should be used for consecutive deployments From 406a2d44e721619de84908387ec5c58a1893624d Mon Sep 17 00:00:00 2001 From: "Henning Waack (waa)" Date: Wed, 17 May 2017 16:18:24 +0200 Subject: [PATCH 35/50] moved config property config.deployer.doVarSub to webmethods-sample-project-layout since this is a project specific parameter --- project.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/project.properties b/project.properties index f5a579390..20bc85f15 100755 --- a/project.properties +++ b/project.properties @@ -18,6 +18,8 @@ config.assets.umExport=./assets/UniversalMessaging config.environments=ENV.groovy # use splitDelpoymentSets=true if for each IS target server a separate DeploymentMap should be used for consecutive deployments config.deployer.splitDelpoymentSets=false +# variable substitutions +config.deployer.doVarSub=true config.deployer.varsubDir=resources/vs config.build.version=1.0.0 From 8c1af23b621a1e21c04bd7dd14f34fe08dbea51d Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Thu, 18 May 2017 14:05:09 +0200 Subject: [PATCH 36/50] updated documentation --- README.md | 5 +++-- project.properties | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c91a6acb8..70e364bd5 100755 --- a/README.md +++ b/README.md @@ -29,13 +29,14 @@ The basic example deployment pipeline process is as follows: The project specific configuration is stored in the file [projects.properties](./projects.properties). It contains the following configurations: -* __The location of the source assets__, like IS Packages, BPM Processes, etc. These relative paths are mapped to absolute paths in the build.xml. The absolute paths are substituted in the Asset Build Environment's build.properties file into the property "build.source.dir". Please see the file [master_build_Reference/build.properties](./master_build_Reference/build.properties). Examples are: +* __config.assets.*__: The location of the source assets, like IS Packages, BPM Processes, etc. These relative paths are mapped to absolute paths in the build.xml. The absolute paths are substituted in the Asset Build Environment's build.properties file into the property "build.source.dir". Please see the file [master_build_Reference/build.properties](./master_build_Reference/build.properties). Examples are: ** isPackages: defines where the IntegrationServer packages are located, relative to this project ** isTests: defines where the WmTestSuite tests are located ** bpmProjects: defines where the BPM Process Models are located ** etc. * __config.environments__: The location of the environments groovy definition file, e.g. "[ENV.groovy](./ENV.groovy)". * __config.deployer.splitDelpoymentSets__: If "true", deployments are split into in multiple deployment sets with a matching number of deployment candidates. See [Splitting Deployments](#splitting-deployments) for details. +* __config.deployer.doVarSub__: Set to "true" in order to execute variable substitution. * __config.deployer.varsubDir__: The location of the variable substitions files, please see below for details. * __config.build.version__: The build version in the form of "${MAJOR}.${MINOR}.${PATCH}". Adjust to your liking, has to be changed for each release manually in this file. This build version is used to mark the FBRs, and it is passed along to ABE, which for example sets the build property of package's manifest.v3 file to this value. * __config.build.fbr.type__: Either "local" or "artifactory": @@ -159,7 +160,7 @@ _**Note**: currently only IntegrationServer package variable substitutions are s The VarSub Repository is stored for each project and has the following structure: -* __resources/vs__: Base directory for the VarSub Repository +* __resources/vs__: Base directory for the VarSub Repository (specified by property "config.deployer.varsubDir") * __${TARGET_ENV}__: For each target environment (e.g. DEV, TEST, QA, PROD) a separate folder must exist which will contain varsub templates for the given target environment. * __${ASSET_TYPE}__: For each asset type (e.g. "is", "mws", "bpm") a separate folder must exist which will contain varsub templates of the given asset type * __${COMPOSITE_NAME}.vs.xml__: For each composite for which a variable substitution exists a separate file must exist with the name of the composiste and the file extension "vs.xml". diff --git a/project.properties b/project.properties index 20bc85f15..ab5a3bae2 100755 --- a/project.properties +++ b/project.properties @@ -15,14 +15,19 @@ config.assets.rulesProjects=./assets/Rules/ #S hould always be named UniversalMessaging config.assets.umExport=./assets/UniversalMessaging +# the target nodes/environments config.environments=ENV.groovy + # use splitDelpoymentSets=true if for each IS target server a separate DeploymentMap should be used for consecutive deployments config.deployer.splitDelpoymentSets=false + # variable substitutions config.deployer.doVarSub=true config.deployer.varsubDir=resources/vs +# used to set the build version of source artifacts config.build.version=1.0.0 + # The parameter "config.build.fbr.type" is in the example overwritten by the Jenkinsfile # config.build.fbr.type=local config.build.fbr.type=artifactory From 0a68774ebbd21f870c41e3a261ca2c89ff3c0b51 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Thu, 18 May 2017 14:05:51 +0200 Subject: [PATCH 37/50] updated documentation --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 70e364bd5..dac216db9 100755 --- a/README.md +++ b/README.md @@ -30,10 +30,10 @@ The basic example deployment pipeline process is as follows: The project specific configuration is stored in the file [projects.properties](./projects.properties). It contains the following configurations: * __config.assets.*__: The location of the source assets, like IS Packages, BPM Processes, etc. These relative paths are mapped to absolute paths in the build.xml. The absolute paths are substituted in the Asset Build Environment's build.properties file into the property "build.source.dir". Please see the file [master_build_Reference/build.properties](./master_build_Reference/build.properties). Examples are: -** isPackages: defines where the IntegrationServer packages are located, relative to this project -** isTests: defines where the WmTestSuite tests are located -** bpmProjects: defines where the BPM Process Models are located -** etc. + * isPackages: defines where the IntegrationServer packages are located, relative to this project + * isTests: defines where the WmTestSuite tests are located + * bpmProjects: defines where the BPM Process Models are located + * etc. * __config.environments__: The location of the environments groovy definition file, e.g. "[ENV.groovy](./ENV.groovy)". * __config.deployer.splitDelpoymentSets__: If "true", deployments are split into in multiple deployment sets with a matching number of deployment candidates. See [Splitting Deployments](#splitting-deployments) for details. * __config.deployer.doVarSub__: Set to "true" in order to execute variable substitution. From f03365bcc34877a98f84e416285071d36933fa07 Mon Sep 17 00:00:00 2001 From: "Henning Waack (waa)" Date: Wed, 24 May 2017 11:44:06 +0200 Subject: [PATCH 38/50] added config parameter for default project name 'config.project.projectName' --- project.properties | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/project.properties b/project.properties index ab5a3bae2..c0431c9a2 100755 --- a/project.properties +++ b/project.properties @@ -1,5 +1,8 @@ #CI Project Layout -#mofidy only if you diviate from the standard structure +#modify only if you deviate from the standard structure + +# can be overwritten with external property "bda.projectName" +config.project.projectName=MyProject # Asset paths # Use slash "/" as path separator. Example: Use "C:/SoftwareAG", instead of "C:\SoftwareAG". From 446a0ed83758aedf5a14dbce424822946a0ff2c1 Mon Sep 17 00:00:00 2001 From: "Henning Waack (waa)" Date: Wed, 24 May 2017 17:36:43 +0200 Subject: [PATCH 39/50] updated SimpleTestPackage test asset to contain jms and messaging trigger for quiesce tests --- .gitignore | 1 + .../SimpleTestPackage/config/listeners.cnf | 49 +- .../IS/Packages/SimpleTestPackage/manifest.v3 | 6 +- .../connection/jdbcConnection/node.ndf | 10 + .../adapter/connection/node.idf | 7 + .../{services/jms => adapter}/node.idf | 2 +- .../adapter/selectTest/node.ndf | 171 +++ .../filepolling/checkErrorDirectory/java.frag | 18 +- .../filepolling/checkErrorDirectory/node.ndf | 4 - .../writeInvalidRecordsToFile/java.frag | 37 +- .../writeInvalidRecordsToFile/node.ndf | 4 - .../math/calculateFibonacci/java.frag | 12 +- .../math/calculateFibonacci/node.ndf | 4 - .../implementation/math/node.idf | 4 +- .../services/messaging/jms/node.idf | 4 + .../jms/receiveInvalidAddress/flow.xml | 5 +- .../jms/receiveInvalidAddress/node.ndf | 7 +- .../messaging/jms/sendInvalidAdress/flow.xml | 1212 +++++++++++++++++ .../messaging/jms/sendInvalidAdress/node.ndf | 84 ++ .../jms/simpleTestJmsTriggerQueue/node.ndf | 31 +- .../node.ndf.triggerBak | 57 + .../nativeMessaging/addressTrigger/node.ndf | 55 + .../addressTrigger/node.ndf.triggerBak | 55 + .../messaging/nativeMessaging/node.idf | 7 + .../publishableAddress/node.ndf | 60 + .../nativeMessaging/receiveAddress/flow.xml | 216 +++ .../nativeMessaging/receiveAddress/node.ndf | 82 ++ .../nativeMessaging/sendAddress/flow.xml | 243 ++++ .../nativeMessaging/sendAddress/node.ndf | 82 ++ .../services/messaging/node.idf | 7 + project.properties | 2 + resources/vs/DEV/is/isconfiguration.vs.xml | 3 +- resources/vs/TEST/is/isconfiguration.vs.xml | 63 +- 33 files changed, 2446 insertions(+), 158 deletions(-) create mode 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/jdbcConnection/node.ndf create mode 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/node.idf rename assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/{services/jms => adapter}/node.idf (70%) create mode 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/selectTest/node.ndf create mode 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/node.idf rename assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/{ => messaging}/jms/receiveInvalidAddress/flow.xml (95%) rename assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/{ => messaging}/jms/receiveInvalidAddress/node.ndf (84%) create mode 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/sendInvalidAdress/flow.xml create mode 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/sendInvalidAdress/node.ndf rename assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/{ => messaging}/jms/simpleTestJmsTriggerQueue/node.ndf (67%) create mode 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/simpleTestJmsTriggerQueue/node.ndf.triggerBak create mode 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/addressTrigger/node.ndf create mode 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/addressTrigger/node.ndf.triggerBak create mode 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/node.idf create mode 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/publishableAddress/node.ndf create mode 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/receiveAddress/flow.xml create mode 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/receiveAddress/node.ndf create mode 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/sendAddress/flow.xml create mode 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/sendAddress/node.ndf create mode 100644 assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/node.idf diff --git a/.gitignore b/.gitignore index 2b136f100..a651c0c23 100755 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /assets/IS/Packages/*/code/classes/**/*.class /**/*.bak* assets/IS/Tests/*/resources/reports/**/*.* +ENV99.groovy diff --git a/assets/IS/Packages/SimpleTestPackage/config/listeners.cnf b/assets/IS/Packages/SimpleTestPackage/config/listeners.cnf index 6e662e501..b131bff1b 100644 --- a/assets/IS/Packages/SimpleTestPackage/config/listeners.cnf +++ b/assets/IS/Packages/SimpleTestPackage/config/listeners.cnf @@ -6,9 +6,9 @@ c:\tmp\citrus\csv\import FilePolling SimpleTestPackage - true + false FilePollingListener:c:\tmp\citrus\csv\import - FilePollingListener_0_SimpleTestPackage_c:\tmp\citrus\csv\import + FilePollingListener_0_SimpleTestPackage_c__tmp_citrus_csv_import Integration Server FilePolling port: 0 webMethods/FilePolling /WmFlatFile/configFilePolling.dsp @@ -28,30 +28,6 @@ 1 .lock - - 5111 - HTTP - SimpleTestPackage - true - HTTPListener@5111 - d2f5ff3cffbffbdc15b80e589f5 - SimpleTestPort - SimpleTestPort - webMethods/HTTP - /WmRoot/configHTTP.dsp - webMethods - Regular - none - salesforce.com - false - 200 - 20000 - -1 - 0 - 10000 - false - - @@ -63,26 +39,5 @@ FilePollingListener:c:\tmp\citrus\csv\import - - - exclude - - - wm.server:disconnect - wm.server:ping - wm.server.tx:end - wm.server:getClusterNodes - wm.server:getServerNodes - wm.server.csrfguard:isCSRFGuardEnabled - wm.server:noop - wm.server.csrfguard:getCSRFSecretToken - wm.server.tx:execute - wm.server.tx:start - wm.server:connect - wm.server.tx:restart - - - HTTPListener@5111 - diff --git a/assets/IS/Packages/SimpleTestPackage/manifest.v3 b/assets/IS/Packages/SimpleTestPackage/manifest.v3 index 096a5c919..4fc55667d 100644 --- a/assets/IS/Packages/SimpleTestPackage/manifest.v3 +++ b/assets/IS/Packages/SimpleTestPackage/manifest.v3 @@ -14,10 +14,10 @@ Default yes SimpleTestPackage - 1.0.110 + 9.8.10 - 2017-04-18 18:24:50 CEST + 2017-05-23 22:53:40 MESZ 1.8.0_121 - localhost.localdomain + 192.168.100.128 diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/jdbcConnection/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/jdbcConnection/node.ndf new file mode 100644 index 000000000..16c39ee8c --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/jdbcConnection/node.ndf @@ -0,0 +1,10 @@ + + + + ConnectionData + simpleTestPackage.adapter.connection:jdbcConnection + SimpleTestPackage + false + 2 + CwQAAAABBQEEGQBjAG8AbQAuAHcAbQAuAGQAYQB0AGEALgBJAFMATQBlAG0ARABhAHQAYQBJAG0AcABsBBUAYwBvAG4AbgBlAGMAdABpAG8AbgBOAG8AZABlAFYAZQByAHMAaQBvAG4LBAAAAAIEDwBhAGQAYQBwAHQAZQByAFQAeQBwAGUATgBhAG0AZQQLAEoARABCAEMAQQBkAGEAcAB0AGUAcgQZAGMAbwBuAG4AZQBjAHQAaQBvAG4ARgBhAGMAdABvAHIAeQBUAHkAcABlAE4AYQBtAGUENgBjAG8AbQAuAHcAbQAuAGEAZABhAHAAdABlAHIALgB3AG0AagBkAGIAYwAuAGMAbwBuAG4AZQBjAHQAaQBvAG4ALgBKAEQAQgBDAEMAbwBuAG4AZQBjAHQAaQBvAG4ARgBhAGMAdABvAHIAeQQUAGMAbwBuAG4AZQBjAHQAaQBvAG4AUAByAG8AcABlAHIAdABpAGUAcwUBAAIEDwBvAHQAaABlAHIAUAByAG8AcABlAHIAdABpAGUAcwQPAGQAcgBpAHYAZQByAFQAeQBwAGUAPQB0AGgAaQBuBA8AbgBlAHQAdwBvAHIAawBQAHIAbwB0AG8AYwBvAGwEAAQKAHAAbwByAHQATgB1AG0AYgBlAHIEBAAxADUAMgAxBAwAZABhAHQAYQBiAGEAcwBlAE4AYQBtAGUEAwBYAEUAeAQIAHAAYQBzAHMAdwBvAHIAZAQ8AHAAYQBzAHMAdwBvAHIAZAAuAHMAaQBtAHAAbABlAFQAZQBzAHQAUABhAGMAawBhAGcAZQAuAGEAZABhAHAAdABlAHIALgBjAG8AbgBuAGUAYwB0AGkAbwBuADoAagBkAGIAYwBDAG8AbgBuAGUAYwB0AGkAbwBuBAQAdQBzAGUAcgQEAHcAZQBiAG0ECgBzAGUAcgB2AGUAcgBOAGEAbQBlBAkAbABvAGMAYQBsAGgAbwBzAHQEDwBkAGEAdABhAHMAbwB1AHIAYwBlAEMAbABhAHMAcwQvAG8AcgBhAGMAbABlAC4AagBkAGIAYwAuAHAAbwBvAGwALgBPAHIAYQBjAGwAZQBDAG8AbgBuAGUAYwB0AGkAbwBuAFAAbwBvAGwARABhAHQAYQBTAG8AdQByAGMAZQQPAHQAcgBhAG4AcwBhAGMAdABpAG8AbgBUAHkAcABlBBEATABPAEMAQQBMAF8AVABSAEEATgBTAEEAQwBUAEkATwBOAgAEGwBjAG8AbgBuAGUAYwB0AGkAbwBuAE0AYQBuAGEAZwBlAHIAUAByAG8AcABlAHIAdABpAGUAcwUBAAIEEgBzAHQAYQByAHQAdQBwAEIAYQBjAGsAbwBmAGYAUwBlAGMAcwQCADEAMAQRAHMAdABhAHIAdAB1AHAAUgBlAHQAcgB5AEMAbwB1AG4AdAQBADAEDQBlAHgAcABpAHIAZQBUAGkAbQBlAG8AdQB0BAUAMwAwADAAMAAwBA8AYgBsAG8AYwBrAGkAbgBnAFQAaQBtAGUAbwB1AHQEBQA2ADAAMAAwADAEEQBwAG8AbwBsAEkAbgBjAHIAZQBtAGUAbgB0AFMAaQB6AGUEAQAxBA8AbQBhAHgAaQBtAHUAbQBQAG8AbwBsAFMAaQB6AGUEAwAxADAAMAQPAG0AaQBuAGkAbQB1AG0AUABvAG8AbABTAGkAegBlACUECABwAG8AbwBsAGEAYgBsAGUEBAB0AHIAdQBlAgAEEQBjAG8AbgBuAGUAYwB0AGkAbwBuAEUAbgBhAGIAbABlAGQEBQBmAGEAbABzAGUEBQB4AGYAbABkAHMKAQQQAGoAYQB2AGEALgBsAGEAbgBnAC4AUwB0AHIAaQBuAGcAFAIA + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/node.idf new file mode 100644 index 000000000..dbfaf5d06 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/connection/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage.adapter.connection + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/node.idf similarity index 70% rename from assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/node.idf rename to assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/node.idf index 80095f064..e1879eb6e 100644 --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/node.idf +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/node.idf @@ -2,6 +2,6 @@ interface - simpleTestPackage.services.jms + simpleTestPackage.adapter false diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/selectTest/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/selectTest/node.ndf new file mode 100644 index 000000000..7f6958a09 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/adapter/selectTest/node.ndf @@ -0,0 +1,171 @@ + + + + AdapterService + unknown + unknown + + + record + + + false + false + + false + selectTestInput + record + 0 + true + false + false + + + record + false + selectTestInput + record + 0 + true + false + false + + + record + false + overrideCredentials + record + 0 + true + false + false + + + unknown + false + $dbUser + string + 0 + true + false + false + + + unknown + false + $dbPassword + string + 0 + true + false + false + + + true + + + true + + + record + false + $connectionName + string + 0 + true + false + false + false + + + true + + + record + + + false + false + + false + selectTestOutput + record + 0 + true + false + false + + + record + false + selectTestOutput + record + 0 + true + false + false + + + record + false + results + record + 1 + true + false + false + false + + + unknown + false + CREATED_ON + string + 0 + true + false + false + + + true + + + true + + + true + + + + no + no + no + 15 + 1 + off + no + $null + no + 0 + 0 + none + none + 0 + + + + + + 0 + false + false + true + + 1 + + true + false + service + 1 + CwQAAAABBQEEGQBjAG8AbQAuAHcAbQAuAGQAYQB0AGEALgBJAFMATQBlAG0ARABhAHQAYQBJAG0AcABsBBMAcwBlAHIAdgBpAGMAZQBUAGUAbQBwAGwAYQB0AGUATgBhAG0AZQQlAGMAbwBtAC4AdwBtAC4AYQBkAGEAcAB0AGUAcgAuAHcAbQBqAGQAYgBjAC4AcwBlAHIAdgBpAGMAZQBzAC4AUwBlAGwAZQBjAHQEDgBjAG8AbgBuAGUAYwB0AGkAbwBuAE4AYQBtAGUEMwBzAGkAbQBwAGwAZQBUAGUAcwB0AFAAYQBjAGsAYQBnAGUALgBhAGQAYQBwAHQAZQByAC4AYwBvAG4AbgBlAGMAdABpAG8AbgA6AGoAZABiAGMAQwBvAG4AbgBlAGMAdABpAG8AbgQSAHQAZQBtAHAAbABhAHQAZQBQAHIAbwBwAGUAcgB0AGkAZQBzBQEAAgQTAHQAYQBiAGwAZQBzAC4AdABhAGIAbABlAEkAbgBkAGUAeABlAHMKAQQQAGoAYQB2AGEALgBsAGEAbgBnAC4AUwB0AHIAaQBuAGcEAgB0ADEEEgB0AGEAYgBsAGUAcwAuAGMAYQB0AGEAbABvAGcATgBhAG0AZQoBAAwEEQA8AGMAdQByAHIAZQBuAHQAIABjAGEAdABhAGwAbwBnAD4EEQB0AGEAYgBsAGUAcwAuAHMAYwBoAGUAbQBhAE4AYQBtAGUKAQAMBBAAPABjAHUAcgByAGUAbgB0ACAAcwBjAGgAZQBtAGEAPgQQAHQAYQBiAGwAZQBzAC4AdABhAGIAbABlAE4AYQBtAGUKAQAMBAoAVABFAFMAVABfAFQAQQBCAEwARQQQAHQAYQBiAGwAZQBzAC4AdABhAGIAbABlAFQAeQBwAGUKAQAMBAUAVABBAEIATABFBBEAdABhAGIAbABlAHMALgBjAG8AbAB1AG0AbgBJAG4AZgBvCgEADAQiAEMAUgBFAEEAVABFAEQAXwBPAE4AXABuAFYAQQBSAEMASABBAFIAMgAoADIAMAApAFwAbgAxADIAXABuADEAXABuAAoEFQB0AGEAYgBsAGUAcwAuAHIAZQBhAGwAUwBjAGgAZQBtAGEATgBhAG0AZQoBAAwEDABQAEgASQBMAF8AQwBGAFMAXwBJAE4AVAQQAGoAbwBpAG4AcwAuAGwAZQBmAHQAQwBvAGwAdQBtAG4KAAAMBA4AagBvAGkAbgBzAC4AbwBwAGUAcgBhAHQAbwByCgAADAQRAGoAbwBpAG4AcwAuAHIAaQBnAGgAdABDAG8AbAB1AG0AbgoAAAwEEgBzAGUAbABlAGMAdAAuAGEAbABsAEQAaQBzAHQAaQBuAGMAdAQABBEAcwBlAGwAZQBjAHQALgBlAHgAcAByAGUAcwBzAGkAbwBuCgEADAQNAHQAMQAuAEMAUgBFAEEAVABFAEQAXwBPAE4EEABzAGUAbABlAGMAdAAuAHIAZQBmAEMAbwBsAHUAbQBuCgEADAA0BBEAcwBlAGwAZQBjAHQALgBjAG8AbAB1AG0AbgBUAHkAcABlCgEADAQMAFYAQQBSAEMASABBAFIAMgAoADIAMAApBA8AcwBlAGwAZQBjAHQALgBKAEQAQgBDAFQAeQBwAGUKAQAMBAcAVgBBAFIAQwBIAEEAUgQWAHMAZQBsAGUAYwB0AC4AbwB1AHQAcAB1AHQARgBpAGUAbABkAFQAeQBwAGUKAQAMAAwEFgBzAGUAbABlAGMAdAAuAHIAZQBzAHUAbAB0AEYAaQBlAGwAZABUAHkAcABlCgEADAQSAGoAYQB2AGEALgBsAGEAbgBnAC4AUwB0AHIAaQBuAGcAWwBdBBIAcwBlAGwAZQBjAHQALgBvAHUAdABwAHUAdABGAGkAZQBsAGQKAQAMBAoAQwBSAEUAQQBUAEUARABfAE8ATgQSAHMAZQBsAGUAYwB0AC4AcgBlAHMAdQBsAHQARgBpAGUAbABkCgEADAQUAHIAZQBzAHUAbAB0AHMAWwBdAC4AQwBSAEUAQQBUAEUARABfAE8ATgQWAHMAZQBsAGUAYwB0AC4AcgBlAGEAbABPAHUAdABwAHUAdABGAGkAZQBsAGQKAQAMAFAEEABzAGUAbABlAGMAdAAuAHMAbwByAHQATwByAGQAZQByCgEADAAwBA0AcwBlAGwAZQBjAHQALgBtAGEAeABSAG8AdwQBADAEEwBzAGUAbABlAGMAdAAuAHEAdQBlAHIAeQBUAGkAbQBlAE8AdQB0BAIALQAxBBUAcwBlAGwAZQBjAHQALgByAGUAcwB1AGwAdABSAG8AdwBGAGkAZQBsAGQAMAQZAHMAZQBsAGUAYwB0AC4AcgBlAHMAdQBsAHQAUgBvAHcARgBpAGUAbABkAFQAeQBwAGUEEQBqAGEAdgBhAC4AbABhAG4AZwAuAEkAbgB0AGUAZwBlAHIEFQBzAGUAbABlAGMAdAAuAG4AbwB0AGkAZgB5AE8AbgBVAHAAZABhAHQAZQoAAAwEFwBzAGUAbABlAGMAdAAuAG8AdQB0AHAAdQB0AFYAYQBsAHUAZQBUAHkAcABlAHMKAAAMBBEAcwBlAGwAZQBjAHQALgBhAHUAdABvAEQAZQBsAGUAdABlBAUAZgBhAGwAcwBlBAsAdwBoAGUAcgBlAC4AYQBuAGQATwByCgAADAQPAHcAaABlAHIAZQAuAGwAZQBmAHQAUABhAHIAZQBuCgAADAQOAHcAaABlAHIAZQAuAGwAZQBmAHQARQB4AHAAcgoAAAwEDgB3AGgAZQByAGUALgBvAHAAZQByAGEAdABvAHIKAAAMBA8AdwBoAGUAcgBlAC4AcgBpAGcAaAB0AEUAeABwAHIKAAAMBBAAdwBoAGUAcgBlAC4AcgBpAGcAaAB0AFAAYQByAGUAbgoAAAwEDgB3AGgAZQByAGUALgBKAEQAQgBDAFQAeQBwAGUKAAAMBA8AdwBoAGUAcgBlAC4AaQBuAHAAdQB0AFQAeQBwAGUKAAAMBBAAdwBoAGUAcgBlAC4AaQBuAHAAdQB0AEYAaQBlAGwAZAoAAAwEBgB1AHMAZQByAGkAZAQbAG8AdgBlAHIAcgBpAGQAZQBDAHIAZQBkAGUAbgB0AGkAYQBsAHMALgAkAGQAYgBVAHMAZQByBAoAdQBzAGUAcgBpAGQAVAB5AHAAZQAMBA8AaQBuAHAAdQB0AFUAcwBlAHIAaQBkAFMAaQBnAG4AhQQIAHAAYQBzAHMAdwBvAHIAZAQfAG8AdgBlAHIAcgBpAGQAZQBDAHIAZQBkAGUAbgB0AGkAYQBsAHMALgAkAGQAYgBQAGEAcwBzAHcAbwByAGQEDABwAGEAcwBzAHcAbwByAGQAVAB5AHAAZQAMBBEAaQBuAHAAdQB0AFAAYQBzAHMAdwBvAHIAZABTAGkAZwBuAIsEEABkAGUAcwBpAGcAbgBUAGkAbQBlAEwAbwBjAGEAbABlBAUAZQBuAF8AVQBTAgAEGQBhAGQAYQBwAHQAZQByAFMAZQByAHYAaQBjAGUATgBvAGQAZQBWAGUAcgBzAGkAbwBuCwQAAAACBAsAYQBkAGEAcAB0AGUAcgBUAHkAcABlBAsASgBEAEIAQwBBAGQAYQBwAHQAZQByBA8AaQBuAHAAdQB0AFIAZQBjAG8AcgBkAE4AYQBtAGUEDwBzAGUAbABlAGMAdABUAGUAcwB0AEkAbgBwAHUAdAQQAG8AdQB0AHAAdQB0AFIAZQBjAG8AcgBkAE4AYQBtAGUEEABzAGUAbABlAGMAdABUAGUAcwB0AE8AdQB0AHAAdQB0AgA= + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/java.frag b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/java.frag index 6b78f9d98..315fbbe0d 100644 --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/java.frag +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/java.frag @@ -8,13 +8,13 @@ java 3.5 true - Ly8gcGlwZWxpbmUKSURhdGFDdXJzb3IgcGlwZWxpbmVDdXJzb3IgPSBwaXBlbGluZS5nZXRDdXJz -b3IoKTsKU3RyaW5nCWluYm91bmRGaWxlID0gSURhdGFVdGlsLmdldFN0cmluZyggcGlwZWxpbmVD -dXJzb3IsICJpbmJvdW5kRmlsZSIpOwpTdHJpbmcJZmlsZU5hbWUgPSBJRGF0YVV0aWwuZ2V0U3Ry -aW5nKCBwaXBlbGluZUN1cnNvciwgImZpbGVOYW1lIiApOwoKRmlsZSBpbmJvdW5kID0gbmV3IEZp -bGUoaW5ib3VuZEZpbGUpOwpGaWxlIGZpbGVwb2xsaW5nZGlyID0gaW5ib3VuZC5nZXRQYXJlbnRG -aWxlKCkuZ2V0UGFyZW50RmlsZSgpOwpGaWxlIGVycm9yRGlyID0gbmV3IEZpbGUoZmlsZXBvbGxp -bmdkaXIsICJlcnJvciIpOwoKLy8gcGlwZWxpbmUKSURhdGFVdGlsLnB1dCggcGlwZWxpbmVDdXJz -b3IsICJlcnJvckRpcmVjdG9yeSIsIGVycm9yRGlyLmdldEFic29sdXRlUGF0aCgpICk7CnBpcGVs -aW5lQ3Vyc29yLmRlc3Ryb3koKTsKCgkK + Ly8gcGlwZWxpbmUNCklEYXRhQ3Vyc29yIHBpcGVsaW5lQ3Vyc29yID0gcGlwZWxpbmUuZ2V0Q3Vy +c29yKCk7DQpTdHJpbmcJaW5ib3VuZEZpbGUgPSBJRGF0YVV0aWwuZ2V0U3RyaW5nKCBwaXBlbGlu +ZUN1cnNvciwgImluYm91bmRGaWxlIik7DQpTdHJpbmcJZmlsZU5hbWUgPSBJRGF0YVV0aWwuZ2V0 +U3RyaW5nKCBwaXBlbGluZUN1cnNvciwgImZpbGVOYW1lIiApOw0KDQpGaWxlIGluYm91bmQgPSBu +ZXcgRmlsZShpbmJvdW5kRmlsZSk7DQpGaWxlIGZpbGVwb2xsaW5nZGlyID0gaW5ib3VuZC5nZXRQ +YXJlbnRGaWxlKCkuZ2V0UGFyZW50RmlsZSgpOw0KRmlsZSBlcnJvckRpciA9IG5ldyBGaWxlKGZp +bGVwb2xsaW5nZGlyLCAiZXJyb3IiKTsNCg0KLy8gcGlwZWxpbmUNCklEYXRhVXRpbC5wdXQoIHBp +cGVsaW5lQ3Vyc29yLCAiZXJyb3JEaXJlY3RvcnkiLCBlcnJvckRpci5nZXRBYnNvbHV0ZVBhdGgo +KSApOw0KcGlwZWxpbmVDdXJzb3IuZGVzdHJveSgpOw0KDQoJDQo= diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/node.ndf index c3a8c52df..3b0677c61 100644 --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/node.ndf +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/checkErrorDirectory/node.ndf @@ -7,7 +7,6 @@ record - unknown false checkErrorDirectoryInput record @@ -18,7 +17,6 @@ field - unknown false inboundFile string @@ -32,7 +30,6 @@ record - unknown false checkErrorDirectoryOutput record @@ -43,7 +40,6 @@ field - unknown false errorDirectory string diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/java.frag b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/java.frag index ad5ceedcd..c23d13061 100644 --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/java.frag +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/java.frag @@ -9,22 +9,23 @@ java 3.5 true - SURhdGFDdXJzb3IgcGlwZWxpbmVDdXJzb3IgPSBwaXBlbGluZS5nZXRDdXJzb3IoKTsKU3RyaW5n -CWZpbGVOYW1lID0gSURhdGFVdGlsLmdldFN0cmluZyggcGlwZWxpbmVDdXJzb3IsICJmaWxlTmFt -ZSIgKTsKU3RyaW5nCWRpciA9IElEYXRhVXRpbC5nZXRTdHJpbmcoIHBpcGVsaW5lQ3Vyc29yLCAi -ZGlyIiApOwoKRmlsZSBmID0gbmV3IEZpbGUoZGlyLCBmaWxlTmFtZSk7CkJ1ZmZlcmVkV3JpdGVy -IG91dCA9IG51bGw7CnRyeSB7CglvdXQgPSBuZXcgQnVmZmVyZWRXcml0ZXIobmV3IEZpbGVXcml0 -ZXIoZikpOwoJSURhdGFbXQlpbnZhbGlkUmVjb3JkID0gSURhdGFVdGlsLmdldElEYXRhQXJyYXko -IHBpcGVsaW5lQ3Vyc29yLCAiaW52YWxpZFJlY29yZExpc3QiICk7CglpZiAoIGludmFsaWRSZWNv -cmQgIT0gbnVsbCkKCXsKCQlmb3IgKCBpbnQgaSA9IDA7IGkgPCBpbnZhbGlkUmVjb3JkLmxlbmd0 -aDsgaSsrICkKCQl7CgkJCUlEYXRhQ3Vyc29yIGludmFsaWRSZWNvcmRDdXJzb3IgPSBpbnZhbGlk -UmVjb3JkW2ldLmdldEN1cnNvcigpOwoJCQlTdHJpbmcJcG9zaXRpb24gPSBJRGF0YVV0aWwuZ2V0 -U3RyaW5nKCBpbnZhbGlkUmVjb3JkQ3Vyc29yLCAicG9zaXRpb24iICk7CgkJCVN0cmluZwltc2cg -PSBJRGF0YVV0aWwuZ2V0U3RyaW5nKCBpbnZhbGlkUmVjb3JkQ3Vyc29yLCAibXNnIiApOwoJCQlp -bnZhbGlkUmVjb3JkQ3Vyc29yLmRlc3Ryb3koKTsKCgkJCW91dC53cml0ZShwb3NpdGlvbiArICIs -IiArIG1zZyk7CgkJCW91dC5uZXdMaW5lKCk7CgkJfQoJfQoJCn0gY2F0Y2goIElPRXhjZXB0aW9u -IGlvZSApIHsKCXRocm93IG5ldyBTZXJ2aWNlRXhjZXB0aW9uKCJjb3VsZCBub3Qgd3JpdGUgZmls -ZSB0byBwYXRoICIgKyBmaWxlTmFtZSArICI6ICIgKyBpb2UpOwp9IGZpbmFsbHkgewoJaWYoIG91 -dCAhPSBudWxsICkgewoJCXRyeSB7CgkJCW91dC5jbG9zZSgpOwkJCQkJCgkJfSBjYXRjaCggSU9F -eGNlcHRpb24gaW9lICkgewoJCQkvLyBpZ25vcmUKCQl9Cgl9Cn0K + SURhdGFDdXJzb3IgcGlwZWxpbmVDdXJzb3IgPSBwaXBlbGluZS5nZXRDdXJzb3IoKTsNClN0cmlu +ZwlmaWxlTmFtZSA9IElEYXRhVXRpbC5nZXRTdHJpbmcoIHBpcGVsaW5lQ3Vyc29yLCAiZmlsZU5h +bWUiICk7DQpTdHJpbmcJZGlyID0gSURhdGFVdGlsLmdldFN0cmluZyggcGlwZWxpbmVDdXJzb3Is +ICJkaXIiICk7DQoNCkZpbGUgZiA9IG5ldyBGaWxlKGRpciwgZmlsZU5hbWUpOw0KQnVmZmVyZWRX +cml0ZXIgb3V0ID0gbnVsbDsNCnRyeSB7DQoJb3V0ID0gbmV3IEJ1ZmZlcmVkV3JpdGVyKG5ldyBG +aWxlV3JpdGVyKGYpKTsNCglJRGF0YVtdCWludmFsaWRSZWNvcmQgPSBJRGF0YVV0aWwuZ2V0SURh +dGFBcnJheSggcGlwZWxpbmVDdXJzb3IsICJpbnZhbGlkUmVjb3JkTGlzdCIgKTsNCglpZiAoIGlu +dmFsaWRSZWNvcmQgIT0gbnVsbCkNCgl7DQoJCWZvciAoIGludCBpID0gMDsgaSA8IGludmFsaWRS +ZWNvcmQubGVuZ3RoOyBpKysgKQ0KCQl7DQoJCQlJRGF0YUN1cnNvciBpbnZhbGlkUmVjb3JkQ3Vy +c29yID0gaW52YWxpZFJlY29yZFtpXS5nZXRDdXJzb3IoKTsNCgkJCVN0cmluZwlwb3NpdGlvbiA9 +IElEYXRhVXRpbC5nZXRTdHJpbmcoIGludmFsaWRSZWNvcmRDdXJzb3IsICJwb3NpdGlvbiIgKTsN +CgkJCVN0cmluZwltc2cgPSBJRGF0YVV0aWwuZ2V0U3RyaW5nKCBpbnZhbGlkUmVjb3JkQ3Vyc29y +LCAibXNnIiApOw0KCQkJaW52YWxpZFJlY29yZEN1cnNvci5kZXN0cm95KCk7DQoNCgkJCW91dC53 +cml0ZShwb3NpdGlvbiArICIsIiArIG1zZyk7DQoJCQlvdXQubmV3TGluZSgpOw0KCQl9DQoJfQ0K +CQ0KfSBjYXRjaCggSU9FeGNlcHRpb24gaW9lICkgew0KCXRocm93IG5ldyBTZXJ2aWNlRXhjZXB0 +aW9uKCJjb3VsZCBub3Qgd3JpdGUgZmlsZSB0byBwYXRoICIgKyBmaWxlTmFtZSArICI6ICIgKyBp +b2UpOw0KfSBmaW5hbGx5IHsNCglpZiggb3V0ICE9IG51bGwgKSB7DQoJCXRyeSB7DQoJCQlvdXQu +Y2xvc2UoKTsJCQkJCQ0KCQl9IGNhdGNoKCBJT0V4Y2VwdGlvbiBpb2UgKSB7DQoJCQkvLyBpZ25v +cmUNCgkJfQ0KCX0NCn0NCg== diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/node.ndf index bfe2382af..1d08bfe71 100644 --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/node.ndf +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/filepolling/writeInvalidRecordsToFile/node.ndf @@ -7,7 +7,6 @@ record - unknown false writeInvalidRecordsToFileInput record @@ -18,7 +17,6 @@ field - unknown false fileName string @@ -29,7 +27,6 @@ field - unknown false dir string @@ -40,7 +37,6 @@ record - unknown false invalidRecordList recref diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/java.frag b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/java.frag index f5a889f04..42cefa2e2 100644 --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/java.frag +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/java.frag @@ -8,10 +8,10 @@ java 3.5 true - Ly8gcGlwZWxpbmUKSURhdGFDdXJzb3IgcGlwZWxpbmVDdXJzb3IgPSBwaXBlbGluZS5nZXRDdXJz -b3IoKTsKSW50ZWdlciBuID0gSURhdGFVdGlsLmdldEludCggcGlwZWxpbmVDdXJzb3IsICJuIiww -ICk7CnBpcGVsaW5lQ3Vyc29yLmRlc3Ryb3koKTsKCmludCBmaWIgPSBmaWIobik7CgovLyBwaXBl -bGluZQpJRGF0YUN1cnNvciBwaXBlbGluZUN1cnNvcl8xID0gcGlwZWxpbmUuZ2V0Q3Vyc29yKCk7 -CklEYXRhVXRpbC5wdXQoIHBpcGVsaW5lQ3Vyc29yXzEsICJmaWIiLCAiIiArIGZpYiApOwpwaXBl -bGluZUN1cnNvcl8xLmRlc3Ryb3koKTsKCiAgICAK + Ly8gcGlwZWxpbmUNCklEYXRhQ3Vyc29yIHBpcGVsaW5lQ3Vyc29yID0gcGlwZWxpbmUuZ2V0Q3Vy +c29yKCk7DQpJbnRlZ2VyIG4gPSBJRGF0YVV0aWwuZ2V0SW50KCBwaXBlbGluZUN1cnNvciwgIm4i +LDAgKTsNCnBpcGVsaW5lQ3Vyc29yLmRlc3Ryb3koKTsNCg0KaW50IGZpYiA9IGZpYihuKTsNCg0K +Ly8gcGlwZWxpbmUNCklEYXRhQ3Vyc29yIHBpcGVsaW5lQ3Vyc29yXzEgPSBwaXBlbGluZS5nZXRD +dXJzb3IoKTsNCklEYXRhVXRpbC5wdXQoIHBpcGVsaW5lQ3Vyc29yXzEsICJmaWIiLCAiIiArIGZp +YiApOw0KcGlwZWxpbmVDdXJzb3JfMS5kZXN0cm95KCk7DQoNCiAgICANCg== diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/node.ndf index a7a6473af..34d285f5f 100644 --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/node.ndf +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/calculateFibonacci/node.ndf @@ -7,7 +7,6 @@ record - unknown false calculateFibonacciInput record @@ -18,7 +17,6 @@ field - unknown false n string @@ -32,7 +30,6 @@ record - unknown false calculateFibonacciOutput record @@ -43,7 +40,6 @@ field - unknown false fib string diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/node.idf index e8ccb3e3e..d5af4107c 100644 --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/node.idf +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/implementation/math/node.idf @@ -1,7 +1,7 @@ - CnByaXZhdGUgc3RhdGljIGludCBmaWIoaW50IG4gKSB7CglpZiAobiA8PSAxKSByZXR1cm4gbjsK -ICAgIGVsc2UgcmV0dXJuIGZpYihuLTEpICsgZmliKG4tMik7Cn0K + DQpwcml2YXRlIHN0YXRpYyBpbnQgZmliKGludCBuICkgew0KCWlmIChuIDw9IDEpIHJldHVybiBu +Ow0KICAgIGVsc2UgcmV0dXJuIGZpYihuLTEpICsgZmliKG4tMik7DQp9DQo= true diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/node.idf new file mode 100644 index 000000000..c02cb0078 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/node.idf @@ -0,0 +1,4 @@ + + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/receiveInvalidAddress/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/receiveInvalidAddress/flow.xml similarity index 95% rename from assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/receiveInvalidAddress/flow.xml rename to assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/receiveInvalidAddress/flow.xml index 537930394..c33eb0fae 100644 --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/receiveInvalidAddress/flow.xml +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/receiveInvalidAddress/flow.xml @@ -1,6 +1,7 @@ + @@ -90,7 +91,7 @@ - + @@ -110,7 +111,7 @@ - + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/receiveInvalidAddress/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/receiveInvalidAddress/node.ndf similarity index 84% rename from assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/receiveInvalidAddress/node.ndf rename to assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/receiveInvalidAddress/node.ndf index 690b5c30c..3cf6f261e 100644 --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/receiveInvalidAddress/node.ndf +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/receiveInvalidAddress/node.ndf @@ -11,7 +11,6 @@ no 15 1 - simpleTestPackage_services_jms_receiveInvalidAddress off no $null @@ -21,10 +20,8 @@ none none 0 - - - - + + 0 false diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/sendInvalidAdress/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/sendInvalidAdress/flow.xml new file mode 100644 index 000000000..bc65a66f1 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/sendInvalidAdress/flow.xml @@ -0,0 +1,1212 @@ + + + + simpletest.jms.topic.destinationName + + + + + map to wrapper doc and set topic name and connection factory + + + + + record + unknown + false + record + 0 + IData + true + false + false + + + unknown + unknown + false + topicName + string + 0 + true + false + false + + + unknown + unknown + false + simpletest.jms.connectionAlias + string + 0 + true + false + false + + + record + unknown + false + wrapper + record + 0 + IData + true + false + false + + + record + unknown + false + address + recref + 0 + IData + true + false + false + true + simpleTestPackage.documents:address + + + true + + + true + + + + + + + + record + unknown + false + record + 0 + IData + true + false + false + + + record + unknown + + + false + false + + false + address + recref + 0 + IData + true + false + false + true + true + simpleTestPackage.documents:address + + + true + + + + + + + + + + + + + + + + + DEFAULT_IS_JMS_CONNECTION + + unknown + false + simpletest.jms.connectionAlias + string + 0 + true + false + false + + + + + + + + + + SimpleTest_Queue + + unknown + false + topicName + string + 0 + true + false + false + + + + + + + + + + + + + + + + + record + unknown + false + documentToXMLStringInput + record + 0 + IData + true + false + false + + + field + unknown + false + attrPrefix + string + 0 + true + true + false + false + + + record + unknown + false + document + record + 0 + IData + true + false + false + + + true + + + record + unknown + false + nsDecls + record + 0 + true + IData + true + false + false + + + true + + + field + unknown + false + addHeader + string + 0 + true + + true + false + + true + false + false + + + field + unknown + false + encode + string + 0 + true + + true + false + + true + false + false + + + field + unknown + false + documentTypeName + string + 0 + true + true + false + false + + + field + unknown + false + generateRequiredTags + string + 0 + true + + false + true + + true + false + false + + + field + unknown + false + generateNilTags + string + 0 + true + + false + true + + true + false + false + + + field + unknown + false + enforceLegalXML + string + 0 + true + + true + false + + true + false + false + + + record + unknown + false + dtdHeaderInfo + record + 0 + true + IData + true + false + false + + + true + + + field + unknown + false + bufferSize + string + 0 + true + true + false + false + + + true + + + + + + + + record + unknown + false + record + 0 + IData + true + false + false + + + unknown + unknown + false + topicName + string + 0 + true + false + false + + + unknown + unknown + false + simpletest.jms.connectionAlias + string + 0 + true + false + false + + + record + unknown + false + wrapper + record + 0 + IData + true + false + false + + + record + unknown + false + address + recref + 0 + true + false + false + true + simpleTestPackage.documents:address + + + true + + + true + + + + + + + + + + + + + + + + record + unknown + false + record + 0 + IData + true + false + false + + + unknown + unknown + false + topicName + string + 0 + true + false + false + + + record + unknown + false + document + record + 0 + IData + true + false + false + + + true + + + unknown + unknown + false + simpletest.jms.connectionAlias + string + 0 + true + false + false + + + record + unknown + false + wrapper + record + 0 + IData + true + false + false + + + record + unknown + false + address + recref + 0 + true + false + false + true + simpleTestPackage.documents:address + + + true + + + field + unknown + false + xmldata + string + 0 + true + false + false + + + true + + + + + + + + record + unknown + false + documentToXMLStringOutput + record + 0 + IData + true + false + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + record + unknown + false + sendInput + record + 0 + IData + true + false + false + + + unknown + unknown + + + + false + false + + false + connectionAliasName + string + 0 + true + false + false + + + unknown + unknown + + + + false + false + + false + destinationName + string + 0 + true + false + false + + + unknown + unknown + false + destinationType + string + 0 + true + + QUEUE + TOPIC + + true + false + false + + + record + unknown + + + false + false + + false + JMSMessage + record + 0 + IData + true + false + false + + + record + unknown + + + false + false + + false + header + record + 0 + true + IData + true + false + false + + + true + + + record + unknown + + + false + false + + false + properties + record + 0 + true + IData + true + false + false + + + true + + + record + unknown + + + false + false + + false + body + record + 0 + true + IData + true + false + false + + + unknown + unknown + false + string + string + 0 + true + true + false + false + + + unknown + unknown + + + false + false + + false + bytes + object + 0 + true + byte [] + true + false + false + + + unknown + unknown + false + object + object + 0 + true + true + false + false + + + record + unknown + false + data + record + 0 + true + IData + true + false + false + + + true + + + unknown + unknown + + + false + false + + false + message + object + 0 + true + true + false + false + + + true + + + true + + + record + unknown + + + false + false + + false + useCSQ + object + 0 + true + java.lang.Boolean + true + false + false + + + true + + + + + + + + record + unknown + false + record + 0 + IData + true + false + false + + + unknown + unknown + false + topicName + string + 0 + true + false + false + + + unknown + unknown + false + simpletest.jms.connectionAlias + string + 0 + true + false + false + + + field + unknown + false + xmldata + string + 0 + true + false + false + + + true + + + + + + + + + + + + + + + + + TOPIC + + unknown + false + destinationType + string + 0 + true + + QUEUE + TOPIC + + true + false + false + + + + + + + + + + + + + + + record + unknown + false + record + 0 + IData + true + false + false + + + unknown + unknown + false + connectionAliasName + string + 0 + true + false + false + + + unknown + unknown + false + destinationName + string + 0 + true + false + false + + + unknown + unknown + false + destinationType + string + 0 + true + false + false + + + record + unknown + false + JMSMessage + record + 0 + IData + true + false + false + + + record + unknown + false + body + record + 0 + true + false + false + + + true + + + record + unknown + + + false + false + + false + header + record + 0 + true + false + false + + + true + + + record + unknown + + + false + false + + false + properties + record + 0 + true + true + false + false + + + true + + + true + + + record + unknown + false + address + recref + 0 + IData + true + false + false + true + simpleTestPackage.documents:address + + + unknown + unknown + false + topicName + string + 0 + true + false + false + + + record + unknown + false + JMSMessage + recref + 0 + IData + true + false + false + true + pub.jms:JMSMessage + + + unknown + unknown + false + simpletest.jms.connectionAlias + string + 0 + true + false + false + + + field + unknown + false + xmldata + string + 0 + true + false + false + + + true + + + + + + + + record + unknown + false + sendOutput + record + 0 + IData + true + false + false + + + record + unknown + + + false + false + + false + JMSMessage + record + 0 + IData + true + false + false + + + record + unknown + + + false + false + + false + header + record + 0 + true + false + false + + + true + + + record + unknown + + + false + false + + false + properties + record + 0 + true + true + false + false + + + true + + + record + unknown + + + false + false + + false + body + record + 0 + true + true + false + false + + + true + + + true + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/sendInvalidAdress/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/sendInvalidAdress/node.ndf new file mode 100644 index 000000000..f8b804ba8 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/sendInvalidAdress/node.ndf @@ -0,0 +1,84 @@ + + + + flow + default + java 3.5 + + + record + + false + record + 0 + IData + true + false + false + + + record + + + false + false + + false + address + recref + 0 + IData + true + false + false + true + true + simpleTestPackage.documents:address + + + true + + + record + + false + record + 0 + IData + true + false + false + + + true + + + + no + no + no + 15 + 1 + off + no + $null + + no + 0 + 0 + none + none + 0 + + + + 0 + false + false + true + + 1 + + true + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/simpleTestJmsTriggerQueue/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/simpleTestJmsTriggerQueue/node.ndf similarity index 67% rename from assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/simpleTestJmsTriggerQueue/node.ndf rename to assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/simpleTestJmsTriggerQueue/node.ndf index 97127dbaa..a7e49057d 100644 --- a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/jms/simpleTestJmsTriggerQueue/node.ndf +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/simpleTestJmsTriggerQueue/node.ndf @@ -1,24 +1,23 @@ - - - + webMethods/trigger - simpleTestPackage.services.jms:simpleTestJmsTriggerQueue + unknown + simpleTestPackage.services.messaging.jms:simpleTestJmsTriggerQueue SimpleTestPackage - + false jms-trigger - + false false 0 0 - + 0 false false true - + 0 10000 0 @@ -28,10 +27,11 @@ false false 7200000 - bYUYYvY9RCtgnmldB0rjbn8tvGY= - SimpleTest_JmsConnectionAlias + 9BdUWykGE1MBEeFgDZb4KxAFClQ= + Administrator + DEFAULT_IS_JMS_CONNECTION 0 - true + false 10 1 1500 @@ -39,15 +39,14 @@ 2 false 3 - Administrator - + Rule1 - simpleTestPackage.services.jms:receiveInvalidAddress - + simpleTestPackage.services.messaging.jms:receiveInvalidAddress + - + SimpleTest_Queue diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/simpleTestJmsTriggerQueue/node.ndf.triggerBak b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/simpleTestJmsTriggerQueue/node.ndf.triggerBak new file mode 100644 index 000000000..a7e49057d --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/jms/simpleTestJmsTriggerQueue/node.ndf.triggerBak @@ -0,0 +1,57 @@ + + webMethods/trigger + unknown + simpleTestPackage.services.messaging.jms:simpleTestJmsTriggerQueue + SimpleTestPackage + + false + jms-trigger + + false + false + 0 + 0 + + 0 + false + false + true + + + 0 + 10000 + 0 + + 86400000 + 1 + false + false + 7200000 + 9BdUWykGE1MBEeFgDZb4KxAFClQ= + Administrator + DEFAULT_IS_JMS_CONNECTION + 0 + false + 10 + 1 + 1500 + 1 + 2 + false + 3 + + + Rule1 + simpleTestPackage.services.messaging.jms:receiveInvalidAddress + + + + + + SimpleTest_Queue + + 0 + + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/addressTrigger/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/addressTrigger/node.ndf new file mode 100644 index 000000000..a51fbcb59 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/addressTrigger/node.ndf @@ -0,0 +1,55 @@ + + webMethods/trigger + unknown + simpleTestPackage.services.messaging.nativeMessaging:addressTrigger + SimpleTestPackage + + false + broker-trigger + + false + true + 0 + 0 + + 0 + false + false + true + + + 0 + 10000 + 0 + + 86400000 + 1 + false + false + 7200000 + En1xBiL4C9FqvyXO9Lq2Ehvl1rI= + Administrator + + + simple + + + simpleTestPackage.services.messaging.nativeMessaging:publishableAddress + + + simpleTestPackage.services.messaging.nativeMessaging:receiveAddress + Condition1 + + + + true + true + 1 + true + true + 10 + 4 + false + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/addressTrigger/node.ndf.triggerBak b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/addressTrigger/node.ndf.triggerBak new file mode 100644 index 000000000..a51fbcb59 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/addressTrigger/node.ndf.triggerBak @@ -0,0 +1,55 @@ + + webMethods/trigger + unknown + simpleTestPackage.services.messaging.nativeMessaging:addressTrigger + SimpleTestPackage + + false + broker-trigger + + false + true + 0 + 0 + + 0 + false + false + true + + + 0 + 10000 + 0 + + 86400000 + 1 + false + false + 7200000 + En1xBiL4C9FqvyXO9Lq2Ehvl1rI= + Administrator + + + simple + + + simpleTestPackage.services.messaging.nativeMessaging:publishableAddress + + + simpleTestPackage.services.messaging.nativeMessaging:receiveAddress + Condition1 + + + + true + true + 1 + true + true + 10 + 4 + false + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/node.idf new file mode 100644 index 000000000..fd3fce5b4 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage.services.messaging.nativeMessaging + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/publishableAddress/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/publishableAddress/node.ndf new file mode 100644 index 000000000..d0072f39f --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/publishableAddress/node.ndf @@ -0,0 +1,60 @@ + + + + + record + simpleTestPackage.services.messaging.nativeMessaging:publishableAddress + SimpleTestPackage + + false + record + 0 + IData + true + false + false + 60958783530169 + + + record + + + false + false + + false + address + recref + 0 + IData + true + false + false + true + true + simpleTestPackage.documents:address + + + record + false + _env + recref + 0 + true + true + false + false + true + pub.publish:envelope + + + + wm::is::simpleTestPackage::services::messaging::nativeMessaging::publishableAddress + 0 + guaranteed + true + + + true + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/receiveAddress/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/receiveAddress/flow.xml new file mode 100644 index 000000000..6b4a1a3f3 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/receiveAddress/flow.xml @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + record + unknown + false + debugLogInput + record + 0 + IData + true + false + false + + + field + unknown + false + message + string + 0 + true + true + false + false + + + field + unknown + false + function + string + 0 + true + true + false + false + + + field + unknown + false + level + string + 0 + true + + Fatal + Error + Warn + Info + Debug + Trace + Off + + true + false + false + + + true + + + + + + + + record + unknown + false + record + 0 + IData + true + false + false + + + true + + + + + + + + + + + simpleTestPackage.services.jms:receiveInvalidAddress + + unknown + false + function + string + 0 + true + true + false + false + + + + + + + + + + simpleTestPackage.services.messaging.nativeMessaging:receiveAddress + + field + false + message + string + 0 + true + true + false + false + + + + + + + + + + + + record + unknown + false + record + 0 + IData + true + false + false + + + unknown + unknown + false + message + string + 0 + true + false + false + + + unknown + unknown + false + function + string + 0 + true + false + false + + + true + + + + + + + + record + unknown + false + record + 0 + IData + true + false + false + + + true + + + + + + + + + + + + + + + + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/receiveAddress/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/receiveAddress/node.ndf new file mode 100644 index 000000000..e75e150ea --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/receiveAddress/node.ndf @@ -0,0 +1,82 @@ + + + + flow + default + java 3.5 + + + record + false + record + 0 + IData + true + false + false + + + record + + + false + false + + false + simpleTestPackage.services.messaging.nativeMessaging:publishableAddress + recref + 0 + IData + true + false + false + true + true + simpleTestPackage.services.messaging.nativeMessaging:publishableAddress + + + true + + + record + false + record + 0 + IData + true + false + false + + + true + + + + yes + no + no + 15 + 1 + off + no + $null + + no + 0 + 0 + none + none + 0 + + + + 0 + false + false + true + + 1 + + true + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/sendAddress/flow.xml b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/sendAddress/flow.xml new file mode 100644 index 000000000..74292b2c2 --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/sendAddress/flow.xml @@ -0,0 +1,243 @@ + + + + + + + + map to publishable address + + + + + record + unknown + false + record + 0 + IData + true + false + false + + + record + unknown + false + address + recref + 0 + IData + true + false + false + true + true + simpleTestPackage.documents:address + + + record + unknown + false + pAddress + recref + 0 + true + false + false + true + true + simpleTestPackage.services.messaging.nativeMessaging:publishableAddress + + + true + + + + + + + + record + unknown + false + record + 0 + IData + true + false + false + + + record + unknown + false + address + recref + 0 + IData + true + false + false + true + true + simpleTestPackage.documents:address + + + true + + + + + + + + + + + + + + + + + + + + + + + + record + unknown + false + publishInput + record + 0 + IData + true + false + false + + + field + unknown + false + documentTypeName + string + 0 + true + false + false + + + record + unknown + false + document + record + 0 + IData + true + false + false + + + true + + + field + unknown + false + local + string + 0 + true + + false + true + + true + false + false + + + field + unknown + false + delayUntilServiceSuccess + string + 0 + true + + false + true + + true + false + false + + + true + + + + + + + + record + unknown + false + record + 0 + IData + true + false + false + + + record + unknown + false + pAddress + recref + 0 + true + false + false + true + simpleTestPackage.services.messaging.nativeMessaging:publishableAddress + + + true + + + + + + + + + + + + + + simpleTestPackage.services.messaging.nativeMessaging:publishableAddress + + field + false + documentTypeName + string + 0 + true + false + false + + + + + + + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/sendAddress/node.ndf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/sendAddress/node.ndf new file mode 100644 index 000000000..9aad003cc --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/nativeMessaging/sendAddress/node.ndf @@ -0,0 +1,82 @@ + + + + flow + default + java 3.5 + + + record + false + record + 0 + IData + true + false + false + + + record + + + false + false + + false + address + recref + 0 + IData + true + false + false + true + true + simpleTestPackage.documents:address + + + true + + + record + false + record + 0 + IData + true + false + false + + + true + + + + yes + no + no + 15 + 1 + off + no + $null + + no + 0 + 0 + none + none + 0 + + + + 0 + false + false + true + + 1 + + true + false + diff --git a/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/node.idf b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/node.idf new file mode 100644 index 000000000..5c13231ad --- /dev/null +++ b/assets/IS/Packages/SimpleTestPackage/ns/simpleTestPackage/services/messaging/node.idf @@ -0,0 +1,7 @@ + + + + interface + simpleTestPackage.services.messaging + false + diff --git a/project.properties b/project.properties index c0431c9a2..fb4ca6a46 100755 --- a/project.properties +++ b/project.properties @@ -37,3 +37,5 @@ config.build.fbr.type=artifactory ### Artifactory configuration config.build.artifactory.repository=sag config.build.artifactory.path.org=com.sag + +config.build.suspendTriggersInSource=true diff --git a/resources/vs/DEV/is/isconfiguration.vs.xml b/resources/vs/DEV/is/isconfiguration.vs.xml index 76ce4a7a5..4bd18dd08 100644 --- a/resources/vs/DEV/is/isconfiguration.vs.xml +++ b/resources/vs/DEV/is/isconfiguration.vs.xml @@ -16,6 +16,7 @@ + diff --git a/resources/vs/TEST/is/isconfiguration.vs.xml b/resources/vs/TEST/is/isconfiguration.vs.xml index 54e6d4ef4..0ff65b286 100644 --- a/resources/vs/TEST/is/isconfiguration.vs.xml +++ b/resources/vs/TEST/is/isconfiguration.vs.xml @@ -1,37 +1,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + From 9c17096137ed8c8edb393f85d1f2e21200c1d032 Mon Sep 17 00:00:00 2001 From: "Henning Waack (waa)" Date: Wed, 24 May 2017 18:13:04 +0200 Subject: [PATCH 40/50] updated documentation --- README.md | 10 ++++++++++ project.properties | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index dac216db9..8efc8a597 100755 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ The basic example deployment pipeline process is as follows: The project specific configuration is stored in the file [projects.properties](./projects.properties). It contains the following configurations: +* __config.project.projectName__: A standard, fixed project name to be used for creating the Deployer project. Overwrite this property by providing the parameter "_bda.projectName_" to the build script (e.g. in Jenkins). * __config.assets.*__: The location of the source assets, like IS Packages, BPM Processes, etc. These relative paths are mapped to absolute paths in the build.xml. The absolute paths are substituted in the Asset Build Environment's build.properties file into the property "build.source.dir". Please see the file [master_build_Reference/build.properties](./master_build_Reference/build.properties). Examples are: * isPackages: defines where the IntegrationServer packages are located, relative to this project * isTests: defines where the WmTestSuite tests are located @@ -299,3 +300,12 @@ These two varsub files can now be copied to other target environment specific fo In order to create such varsub templates, you can either export a variable substitution file from Deployer and splitting it manually as explained above, or you can use the utility ANT script "buildDeployer_Varsub.xml" provided in the project "[https://github.com/SoftwareAG/sagdevops-ci-assets](https://github.com/SoftwareAG/sagdevops-ci-assets)". +## Custom quiesce mode + +A common problem with IS deployments is that trigger (JMS and Messaging) are automatically enabled after the deployment by Deployer, if they have been enabled when they were checked in to the VCS. Although the Deployer variable substitution property "Suspend Triggers During Deployment" exists at the package level, this does not prevent Depoyer from enabling tiggers _after_ the deployment has finished. So Deployer "restores" the state of a trigger on a target node to the one it has in the source system when it was checked in to the VCS. + +But quite often it is not desirable that messaging triggers are enabled right after the deployment. Quite often post-deployment checks are to be done, and then users/administrators want to enable triggers in a controlled manner. In order to achieve this, the only "supported" option is to checkin triggers into the VCS only in disabled state. Thus after deployment Deployer does not enable the triggers. + +But this option is very error-prone and inconvenient, since developers have to remember to disable triggers on their local system before checking in. + +An alternative solution is what the CI-Assets offer as a capability: change the state of a trigger on the file system after checkout, but before ABE builds the FBR. This is controlled by the project property **"config.build.suspendTriggersInSource"**. If set to "_true_", then the build scripts iterate over each "node.ndf" file in the IS package source dir (see configuration property **"config.assets.isPackages"**), check if it describes a JMS or Messaging Trigger (by checking the attribute "trigger_type") and then set the appropriate values so that this trigger has the state "disabled" (JMS) or "suspended" (Messaging). A backup is created for each trigger which is modified. \ No newline at end of file diff --git a/project.properties b/project.properties index fb4ca6a46..c235f0c4f 100755 --- a/project.properties +++ b/project.properties @@ -37,5 +37,5 @@ config.build.fbr.type=artifactory ### Artifactory configuration config.build.artifactory.repository=sag config.build.artifactory.path.org=com.sag - +# when set to true, then the trigger's node.ndf files in the IS package's source dir are modified so that triggers are suspsended at deployment time config.build.suspendTriggersInSource=true From abb29a8b5f33b4d383558d2efbda781730bd2bc0 Mon Sep 17 00:00:00 2001 From: "Henning Waack (waa)" Date: Thu, 25 May 2017 13:35:22 +0200 Subject: [PATCH 41/50] fix Jenkinsfile.win, replace sh by bat --- Jenkinsfile.win | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile.win b/Jenkinsfile.win index b58107fab..ad1039d95 100755 --- a/Jenkinsfile.win +++ b/Jenkinsfile.win @@ -12,22 +12,22 @@ pipeline { stage('Build'){ steps { echo "Build stage" - sh "${cmd} build" + bat "${cmd} build" } } stage('DeployToTest') { steps { echo "Deploy stage" - sh "${cmd} deploy" + bat "${cmd} deploy" echo "Executing tests" - sh "${cmd} test" + bat "${cmd} test" junit 'report/' } } stage('QA') { steps { echo "QA stage" - sh "${cmd} deploy" + bat "${cmd} deploy" } } } From 394b8b59d3a6066898760b236687476df4ae3cd8 Mon Sep 17 00:00:00 2001 From: "Henning Waack (waa)" Date: Thu, 25 May 2017 15:43:31 +0200 Subject: [PATCH 42/50] adjust Jenkinsfile to explicitly set ANT_HOME in order to avoid classloading issues --- ENV.groovy | 9 ++++++--- Jenkinsfile.artifacctoryUpload.unix | 3 ++- Jenkinsfile.artifactoryDownload.unix | 3 ++- Jenkinsfile.unix | 12 +++++++----- Jenkinsfile.win | 12 +++++++----- 5 files changed, 24 insertions(+), 15 deletions(-) diff --git a/ENV.groovy b/ENV.groovy index 9f9dd7e8e..bd8c38f3b 100755 --- a/ENV.groovy +++ b/ENV.groovy @@ -45,8 +45,9 @@ environments { TEST { IntegrationServers { is_node1 { + version = "9.9" // overwrite global version property host = "localhost" - port = "8094" + port = "5599" username = "Administrator" pwd = "manage" } @@ -55,15 +56,17 @@ environments { QA { IntegrationServers { is_node1 { + version = "9.9" // overwrite global version property host = "localhost" - port = "8094" + port = "5599" username = "Administrator" //pwd = "manage" pwdHandle = "ADMIN_IS_QA" } is_node2 { + version = "9.9" // overwrite global version property host = "localhost" - port = "8094" + port = "5699" username = "Administrator" //pwd = "manage" pwdHandle = "ADMIN_IS_QA" diff --git a/Jenkinsfile.artifacctoryUpload.unix b/Jenkinsfile.artifacctoryUpload.unix index 3d1211ca4..1dba9cf1a 100755 --- a/Jenkinsfile.artifacctoryUpload.unix +++ b/Jenkinsfile.artifacctoryUpload.unix @@ -9,7 +9,8 @@ pipeline { artifactoryUploadFileSpecName = "upload.${artifactoryFileSpecName}" artifactoryDownloadFileSpecName = "download.${artifactoryFileSpecName}" fbrType = "artifactory" - cmd = "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType}" + ANT_HOME="${env.SAG_HOME}/common/AssetBuildEnvironment/ant" + cmd = "${ANT_HOME}/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType}" } stages { diff --git a/Jenkinsfile.artifactoryDownload.unix b/Jenkinsfile.artifactoryDownload.unix index 8b315b828..7c418082d 100644 --- a/Jenkinsfile.artifactoryDownload.unix +++ b/Jenkinsfile.artifactoryDownload.unix @@ -9,7 +9,8 @@ pipeline { artifactoryUploadFileSpecName = "upload.${artifactoryFileSpecName}" artifactoryDownloadFileSpecName = "download.${artifactoryFileSpecName}" fbrType = "artifactory" - cmd = "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType}" + ANT_HOME="${env.SAG_HOME}/common/AssetBuildEnvironment/ant" + cmd = "${ANT_HOME}/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType}" } stages { diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index b58107fab..d65d647ac 100755 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -5,29 +5,31 @@ pipeline { // currentDir can be set to specific dir for non github testing currentDir = "." fbrType = "local" - cmd = "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType}" + // set ANT_HOME and overwrite any system set ANT_HOME var + ANT_HOME="${env.SAG_HOME}/common/AssetBuildEnvironment/ant" + cmd = "${ANT_HOME}/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType}" } stages { stage('Build'){ steps { echo "Build stage" - sh "${cmd} build" + sh "${cmd} build -Dbda.targetEnv=BUILD" } } stage('DeployToTest') { steps { echo "Deploy stage" - sh "${cmd} deploy" + sh "${cmd} deploy -Dbda.targetEnv=TEST" echo "Executing tests" - sh "${cmd} test" + sh "${cmd} test -Dbda.targetEnv=TEST" junit 'report/' } } stage('QA') { steps { echo "QA stage" - sh "${cmd} deploy" + sh "${cmd} deploy -Dbda.targetEnv=QA" } } } diff --git a/Jenkinsfile.win b/Jenkinsfile.win index ad1039d95..828f5c9da 100755 --- a/Jenkinsfile.win +++ b/Jenkinsfile.win @@ -5,29 +5,31 @@ pipeline { // currentDir can be set to specific dir for non github testing currentDir = "." fbrType = "local" - cmd = "${env.SAG_HOME}/common/AssetBuildEnvironment/ant/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType}" + // set ANT_HOME and overwrite any system set ANT_HOME var + ANT_HOME="${env.SAG_HOME}/common/AssetBuildEnvironment/ant" + cmd = "${ANT_HOME}/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType}" } stages { stage('Build'){ steps { echo "Build stage" - bat "${cmd} build" + bat "${cmd} build -Dbda.targetEnv=BUILD" } } stage('DeployToTest') { steps { echo "Deploy stage" - bat "${cmd} deploy" + bat "${cmd} deploy -Dbda.targetEnv=TEST" echo "Executing tests" - bat "${cmd} test" + bat "${cmd} test -Dbda.targetEnv=TEST" junit 'report/' } } stage('QA') { steps { echo "QA stage" - bat "${cmd} deploy" + bat "${cmd} deploy -Dbda.targetEnv=QA" } } } From 10991e3cc74671160cbb93bf6b280c7117cbb932 Mon Sep 17 00:00:00 2001 From: "Henning Waack (waa)" Date: Thu, 25 May 2017 15:58:06 +0200 Subject: [PATCH 43/50] adjust Jenkinsfile to explicitly set ANT_HOME in order to avoid classloading issues --- Jenkinsfile.win | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile.win b/Jenkinsfile.win index 828f5c9da..f464a8fc9 100755 --- a/Jenkinsfile.win +++ b/Jenkinsfile.win @@ -20,7 +20,7 @@ pipeline { stage('DeployToTest') { steps { echo "Deploy stage" - bat "${cmd} deploy -Dbda.targetEnv=TEST" + bat "${cmd} deploy -Dbda.targetEnv=TEST -v" echo "Executing tests" bat "${cmd} test -Dbda.targetEnv=TEST" junit 'report/' From 11aa528396c671f0d331e84bd9222eb8f7b59453 Mon Sep 17 00:00:00 2001 From: "Henning Waack (waa)" Date: Thu, 25 May 2017 17:18:21 +0200 Subject: [PATCH 44/50] changed default project.properties setting for trigger quiesce mode to false --- Jenkinsfile.win | 2 +- project.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile.win b/Jenkinsfile.win index f464a8fc9..828f5c9da 100755 --- a/Jenkinsfile.win +++ b/Jenkinsfile.win @@ -20,7 +20,7 @@ pipeline { stage('DeployToTest') { steps { echo "Deploy stage" - bat "${cmd} deploy -Dbda.targetEnv=TEST -v" + bat "${cmd} deploy -Dbda.targetEnv=TEST" echo "Executing tests" bat "${cmd} test -Dbda.targetEnv=TEST" junit 'report/' diff --git a/project.properties b/project.properties index c235f0c4f..9763e699e 100755 --- a/project.properties +++ b/project.properties @@ -38,4 +38,4 @@ config.build.fbr.type=artifactory config.build.artifactory.repository=sag config.build.artifactory.path.org=com.sag # when set to true, then the trigger's node.ndf files in the IS package's source dir are modified so that triggers are suspsended at deployment time -config.build.suspendTriggersInSource=true +config.build.suspendTriggersInSource=false From d5ea9cdca4029068a80e633d3896dd5bbec1d49d Mon Sep 17 00:00:00 2001 From: "Henning Waack (waa)" Date: Wed, 31 May 2017 09:48:48 +0200 Subject: [PATCH 45/50] enhancements for tests --- .classpath | 1 + Jenkinsfile.unix | 5 +++-- Jenkinsfile.win | 5 +++-- build.xml | 7 ++++--- project.properties | 3 +++ 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.classpath b/.classpath index fb5011632..f92491b63 100755 --- a/.classpath +++ b/.classpath @@ -2,5 +2,6 @@ + diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index d65d647ac..3a0634f57 100755 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -5,9 +5,10 @@ pipeline { // currentDir can be set to specific dir for non github testing currentDir = "." fbrType = "local" + reportDir = "report" // set ANT_HOME and overwrite any system set ANT_HOME var ANT_HOME="${env.SAG_HOME}/common/AssetBuildEnvironment/ant" - cmd = "${ANT_HOME}/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType}" + cmd = "${ANT_HOME}/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} -Dbda.reportDir=${reportDir}" } stages { @@ -23,7 +24,7 @@ pipeline { sh "${cmd} deploy -Dbda.targetEnv=TEST" echo "Executing tests" sh "${cmd} test -Dbda.targetEnv=TEST" - junit 'report/' + junit "${reportDir}" } } stage('QA') { diff --git a/Jenkinsfile.win b/Jenkinsfile.win index 828f5c9da..772aeff7e 100755 --- a/Jenkinsfile.win +++ b/Jenkinsfile.win @@ -5,9 +5,10 @@ pipeline { // currentDir can be set to specific dir for non github testing currentDir = "." fbrType = "local" + reportDir = "report" // set ANT_HOME and overwrite any system set ANT_HOME var ANT_HOME="${env.SAG_HOME}/common/AssetBuildEnvironment/ant" - cmd = "${ANT_HOME}/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType}" + cmd = "${ANT_HOME}/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} -Dbda.reportDir=${reportDir}" } stages { @@ -23,7 +24,7 @@ pipeline { bat "${cmd} deploy -Dbda.targetEnv=TEST" echo "Executing tests" bat "${cmd} test -Dbda.targetEnv=TEST" - junit 'report/' + junit "${reportDir}" } } stage('QA') { diff --git a/build.xml b/build.xml index 7798c366d..23fbb7b9f 100755 --- a/build.xml +++ b/build.xml @@ -5,8 +5,6 @@ - - @@ -19,7 +17,6 @@ - @@ -57,6 +54,10 @@ + + + + diff --git a/project.properties b/project.properties index 9763e699e..f30137b80 100755 --- a/project.properties +++ b/project.properties @@ -39,3 +39,6 @@ config.build.artifactory.repository=sag config.build.artifactory.path.org=com.sag # when set to true, then the trigger's node.ndf files in the IS package's source dir are modified so that triggers are suspsended at deployment time config.build.suspendTriggersInSource=false + +# set config.test.failBuildOnTestError to false if Jenkins should process the unit xml files +config.test.failBuildOnTestError=false From c634b98d5c3c9e265a5b808fc436740d7c4850c2 Mon Sep 17 00:00:00 2001 From: "Henning Waack (waa)" Date: Wed, 31 May 2017 10:09:41 +0200 Subject: [PATCH 46/50] added static code analysis to Jenkinsfile.win --- Jenkinsfile.win | 1 + build.xml | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Jenkinsfile.win b/Jenkinsfile.win index 772aeff7e..96a29e9ee 100755 --- a/Jenkinsfile.win +++ b/Jenkinsfile.win @@ -15,6 +15,7 @@ pipeline { stage('Build'){ steps { echo "Build stage" + bat "${cmd} staticCodeAnalysis -Dbda.targetEnv=BUILD" bat "${cmd} build -Dbda.targetEnv=BUILD" } } diff --git a/build.xml b/build.xml index 23fbb7b9f..543d85792 100755 --- a/build.xml +++ b/build.xml @@ -51,6 +51,10 @@ + + + + From aa7e7bdbeb751f07f0cca11142743047be5ef355 Mon Sep 17 00:00:00 2001 From: "Henning Waack (waa)" Date: Wed, 31 May 2017 13:31:45 +0200 Subject: [PATCH 47/50] chnaged report directory to use jenkins workspace dir as root --- Jenkinsfile.win | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile.win b/Jenkinsfile.win index 96a29e9ee..2e5e49133 100755 --- a/Jenkinsfile.win +++ b/Jenkinsfile.win @@ -5,7 +5,7 @@ pipeline { // currentDir can be set to specific dir for non github testing currentDir = "." fbrType = "local" - reportDir = "report" + reportDir = "${env.WORKSPACE}/report" // set ANT_HOME and overwrite any system set ANT_HOME var ANT_HOME="${env.SAG_HOME}/common/AssetBuildEnvironment/ant" cmd = "${ANT_HOME}/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} -Dbda.reportDir=${reportDir}" @@ -16,6 +16,7 @@ pipeline { steps { echo "Build stage" bat "${cmd} staticCodeAnalysis -Dbda.targetEnv=BUILD" + junit "${reportDir}" bat "${cmd} build -Dbda.targetEnv=BUILD" } } From 9c26b4e6cf66a1b1e193f23c1d56088481a48680 Mon Sep 17 00:00:00 2001 From: "Henning Waack (waa)" Date: Wed, 31 May 2017 13:33:38 +0200 Subject: [PATCH 48/50] chnaged report directory to use jenkins workspace dir as root --- Jenkinsfile.win | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile.win b/Jenkinsfile.win index 2e5e49133..9f3304baa 100755 --- a/Jenkinsfile.win +++ b/Jenkinsfile.win @@ -8,7 +8,7 @@ pipeline { reportDir = "${env.WORKSPACE}/report" // set ANT_HOME and overwrite any system set ANT_HOME var ANT_HOME="${env.SAG_HOME}/common/AssetBuildEnvironment/ant" - cmd = "${ANT_HOME}/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} -Dbda.reportDir=${reportDir}" + cmd = "${ANT_HOME}/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} -Dbda.reportDir='${reportDir}'" } stages { From 2ec54f2169ebe577530cfec3a95a3acc180c62e3 Mon Sep 17 00:00:00 2001 From: "Henning Waack (waa)" Date: Wed, 31 May 2017 16:44:15 +0200 Subject: [PATCH 49/50] refactoring to handle empty test results --- Jenkinsfile.unix | 7 +++++-- Jenkinsfile.win | 9 +++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index 3a0634f57..4fc7d5c58 100755 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -8,13 +8,16 @@ pipeline { reportDir = "report" // set ANT_HOME and overwrite any system set ANT_HOME var ANT_HOME="${env.SAG_HOME}/common/AssetBuildEnvironment/ant" - cmd = "${ANT_HOME}/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} -Dbda.reportDir=${reportDir}" + cmd = "${ANT_HOME}/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType}" } stages { stage('Build'){ steps { echo "Build stage" + sh "${cmd} staticCodeAnalysis -Dbda.targetEnv=BUILD" + // empty results are allowed because isccr may be disabled + junit allowEmptyResults: true, testResults: "${reportDir}/TEST-*.xml" sh "${cmd} build -Dbda.targetEnv=BUILD" } } @@ -24,7 +27,7 @@ pipeline { sh "${cmd} deploy -Dbda.targetEnv=TEST" echo "Executing tests" sh "${cmd} test -Dbda.targetEnv=TEST" - junit "${reportDir}" + junit "${reportDir}/TEST-*.xml" } } stage('QA') { diff --git a/Jenkinsfile.win b/Jenkinsfile.win index 9f3304baa..fd4b6c556 100755 --- a/Jenkinsfile.win +++ b/Jenkinsfile.win @@ -5,10 +5,10 @@ pipeline { // currentDir can be set to specific dir for non github testing currentDir = "." fbrType = "local" - reportDir = "${env.WORKSPACE}/report" + reportDir = "report" // set ANT_HOME and overwrite any system set ANT_HOME var ANT_HOME="${env.SAG_HOME}/common/AssetBuildEnvironment/ant" - cmd = "${ANT_HOME}/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType} -Dbda.reportDir='${reportDir}'" + cmd = "${ANT_HOME}/bin/ant -f ${currentDir}/build.xml -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -Dbda.projectName=${env.JOB_NAME} -Dconfig.build.fbr.type=${fbrType}" } stages { @@ -16,7 +16,8 @@ pipeline { steps { echo "Build stage" bat "${cmd} staticCodeAnalysis -Dbda.targetEnv=BUILD" - junit "${reportDir}" + // empty results are allowed because isccr may be disabled + junit allowEmptyResults: true, testResults: "${reportDir}/TEST-*.xml" bat "${cmd} build -Dbda.targetEnv=BUILD" } } @@ -26,7 +27,7 @@ pipeline { bat "${cmd} deploy -Dbda.targetEnv=TEST" echo "Executing tests" bat "${cmd} test -Dbda.targetEnv=TEST" - junit "${reportDir}" + junit "${reportDir}/TEST-*.xml" } } stage('QA') { From d225f48e2a1beec70e0752f8833bc9f27b2d3143 Mon Sep 17 00:00:00 2001 From: Henning Waack Date: Thu, 1 Jun 2017 11:00:42 +0200 Subject: [PATCH 50/50] added option to inject externally defined environment and thus override internal properties --- build.xml | 52 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/build.xml b/build.xml index 543d85792..f6f53ea58 100755 --- a/build.xml +++ b/build.xml @@ -2,28 +2,46 @@ - - - - - - - - - - - - - - - + + + We use this task to map externally defined environment variables and overwrite internal properties. + All environment variables which are prefixed with "ext." are loaded and stored as a property without the "ext." prefix. + This comes handy for example in Jenkins projects where you can now parameterize a build and thus override internal properties without having to change properties in the project itself each time. + + + + + + + + + + + + - - + + + + + + + + + + + + +