Produced by Araxis Merge on 7/6/2017 8:23:27 PM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | OSCIF_CTT_v4_build 1.zip\rails_prisme\config\service | service_types.yml | Wed May 31 03:59:08 2017 UTC |
| 2 | OSCIF_CTT_v4_build 1.zip\rails_prisme\config\service | service_types.yml | Mon Jul 3 23:25:59 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 5 | 180 |
| Changed | 5 | 18 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | # it is CR ITICAL tha t the keys specified here matc h the fixt ures | |
| 2 | #See modul e PrismeSe rvice for valid type s (bottom of the fil e) | |
| 3 | tomcat: | |
| 4 | label: T omcat | |
| 5 | descript ion: Tomca t Applicat ion Server | |
| 6 | singleto n: false | |
| 7 | props: | |
| 8 | - key: cargo.remo te.usernam e | |
| 9 | toolt ip: Please enter the user name for loggi ng on to t he Tomcat Server | |
| 10 | label : User Nam e | |
| 11 | order _idx: 0 | |
| 12 | - key: cargo.remo te.passwor d | |
| 13 | toolt ip: Enter the passwo rd for log ging on to the Tomca t Server | |
| 14 | label : Password | |
| 15 | type: password | |
| 16 | order _idx: 1 | |
| 17 | - key: cargo.tomc at.manager .url | |
| 18 | tooltip: E nter the U RL and por t for the Tomcat Man ager (e.g. http:// URL . DNS : PORT | |
| 19 | label : Tomcat M anager URL | |
| 20 | type: url | |
| 21 | order _idx: 2 | |
| 22 | nexus: | |
| 23 | label: N exus | |
| 24 | descript ion: Nexus Artifacto ry Server | |
| 25 | singleto n: true | |
| 26 | props: | |
| 27 | - key: nexus_repo sitory_url | |
| 28 | tooltip: E nter the N exus Repos itory URL for the Ne xus Artifa ctory Serv er (e.g. h ttp:// URL . DNS : PORT /) | |
| 29 | label : Nexus Re pository U RL (Read) | |
| 30 | type: url | |
| 31 | order _idx: 0 | |
| 32 | - key: nexus_publ ication_ur l | |
| 33 | tooltip: E nter the N exus Repos itory URL for publis hing to th e Nexus Ar tifactory Server (e. g. http:// URL . DNS : PORT /) | |
| 34 | label : Nexus Re pository U RL (Publis h) | |
| 35 | type: url | |
| 36 | order _idx: 1 | |
| 37 | - key: nexus_user | |
| 38 | toolt ip: Enter the user n ame to use for loggi ng on to t he Nexus S erver | |
| 39 | label : User Nam e | |
| 40 | order _idx: 2 | |
| 41 | - key: nexus_pwd | |
| 42 | toolt ip: Enter the passwo rd to use for loggin g on to th e Nexus Se rver | |
| 43 | label : Password | |
| 44 | type: password | |
| 45 | order _idx: 3 | |
| 46 | ||
| 47 | jenkins: | |
| 48 | label: J enkins | |
| 49 | descript ion: Jenki ns CI Serv er | |
| 50 | singleto n: true | |
| 51 | props: | |
| 52 | - key: jenkins_ro ot | |
| 53 | toolt ip: Enter the URL ad dress and port for t he Jenkins Server (e .g. http:/ /server_pa th:port) | |
| 54 | label : Root URL :port | |
| 55 | type: url | |
| 56 | order _idx: 0 | |
| 57 | - key: jenkins_us er | |
| 58 | toolt ip: Enter the user n ame for lo gging onto the Jenki ns Server | |
| 59 | label : User Nam e | |
| 60 | order _idx: 1 | |
| 61 | - key: jenkins_pw d | |
| 62 | toolt ip: Enter the passwo rd for log ging onto the Jenkin s Server | |
| 63 | label : Password | |
| 64 | type: password | |
| 65 | order _idx: 2 | |
| 66 | ||
| 67 | git: | |
| 68 | label: G it | |
| 69 | descript ion: Git R epository | |
| 70 | singleto n: true | |
| 71 | props: | |
| 72 | - key: git_root | |
| 73 | toolt ip: Enter the URL ad dress, por t and ini tial conte xt for the Git Serve r (e.g. ht tp://serve r_path:por t/context) | |
| 74 | label : Git Repo sitory URL :port/cont ext | |
| 75 | type: regular_e xpression | |
| 76 | regul ar_express ion: ^[h|H ][t|T][t|T ][p|P][s|S ]?:\/\/[a- zA-Z0-9\.\ -_]+:?\d*\ /[a-zA-Z0- 9\-_]+\/?$ | |
| 77 | defau lt: http:/ /path_to_s erver:port /context | |
| 78 | widge t_length: 75 | |
| 79 | order _idx: 0 | |
| 80 | - key: git_user | |
| 81 | toolt ip: Enter the git us er name fo r logging on to the Git Server | |
| 82 | label : User Nam e | |
| 83 | order _idx: 1 | |
| 84 | - key: git_pwd | |
| 85 | toolt ip: Enter the git pa ssword for logging o n to the G it Server | |
| 86 | label : Password | |
| 87 | type: password | |
| 88 | order _idx: 2 | |
| 89 | ||
| 90 | # java. lang.Syste m.getPrope rties.put( 'cargo.rem ote.userna me','devte st') | |
| 91 | # java. lang.Syste m.getPrope rties.put( 'cargo.rem ote.passwo rd','devte st') | |
| 92 | # java.lan g.System.g etProperti es.put('ca rgo.tomcat .manager.u rl','http: // URL . DNS : PORT /manager') | |
| 93 | # java.lan g.System.g etProperti es.put('ca rgo.servle t.port',' PORT ') | |
| 94 | # java.lan g.System.g etProperti es.put('ca rgo.hostna me',' DNS ') | |
| 95 | ||
| 96 | #Nexus | |
| 97 | # nexus_ro ot = http: // URL . DNS : PORT / | |
| 98 | # nexus_us er = AI | |
| 99 | # nexus_pw d = AI |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.