Produced by Araxis Merge on 7/6/2017 8:23:03 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\ISAAC-rest\src\test\resources | prisme.properties | Wed May 31 03:58:36 2017 UTC |
| 2 | OSCIF_CTT_v4_build 1.zip\ISAAC-rest\src\test\resources | prisme.properties | Mon Jul 3 22:03:09 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 5 | 42 |
| Changed | 4 | 30 |
| 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 | #if prisme .propertie s is prese nt prisme must be up ! | |
| 2 | #edits her e require a restart to your Ko met instan ce | |
| 3 | #Edit pris me_root to use prism e for role s. | |
| 4 | ||
| 5 | # The foll owing sett ings may b e used for interacti ng with th e ManTech installati on of PRIS ME | |
| 6 | #prisme_ro ot=https:/ / DNS : PORT | |
| 7 | #prisme_al l_roles_ur l=https:// DNS :PO RT | |
| 8 | #prisme_ro les_user_u rl=https:/ /DNS :P ORT | |
| 9 | #prisme_ro les_ssoi_u rl=https:/ /DNS :P ORT | |
| 10 | #prisme_ro les_by_tok en_url=htt ps:// DNS : PORT | |
| 11 | #prisme_co nfig_url=h ttps://DNS :PORT | |
| 12 | #isaac_roo t=https:// DNS : PORT | |
| 13 | ||
| 14 | #Edit this to true t o default to the pri sme instea d of the t est roles test harne ss. | |
| 15 | #war_group _id=gov.vh a.isaac.gu i.rails | |
| 16 | #war_artif act_id=rai ls_komet | |
| 17 | #war_versi on=1.11 | |
| 18 | #war_repo= releases | |
| 19 | #war_class ifier=a | |
| 20 | #war_packa ge=war | |
| 21 | ||
| 22 | # The foll owing sett ings may b e used for interacti ng with a local inst allation o f PRISME | |
| 23 | #prisme_ro ot=http:// localhost: 8181/rails _prisme | |
| 24 | #prisme_al l_roles_ur l=http://l ocalhost: PORT /roles/get _all_roles .json | |
| 25 | #prisme_ro les_user_u rl=http:// localhost: PORT /roles/get _user_role s.json | |
| 26 | #prisme_ro les_ssoi_u rl=http:// localhost: PORT /roles/get _ssoi_role s.json | |
| 27 | #prisme_ro les_by_tok en_url=htt p://localh ost: PORT /roles/get _roles_by_ token.json | |
| 28 | #prisme_co nfig_url=h ttp://loca lhost: PORT /utilities /prisme_co nfig.json | |
| 29 | #isaac_roo t=http://l ocalhost:8 180/ | |
| 30 | #prisme_no tify_url=h ttp://loca lhost: PORT /log_event .json?secu rity_token =%5B%22jh% 5CxFF%5Cx8 4%5CxED%5C x0FT%5Cx96 F%5E%5Cx8B i%5CxD8%5C xA4%5Cx024 %22%2C+%22 +x%5CxBF%5 Cx90%5Cx8C fz%5CxA0%7 Bf%5CxBEP% 5CxEC%5Cx9 A69%22%5D | |
| 31 | #git_repos itory_url= https:// DNS : PORT | |
| 32 | #git_user= | |
| 33 | #git_pwd= | |
| 34 | #git_root= https:// DNS : PORT | |
| 35 | ||
| 36 | #war_uuid= bf722ebf-d 268-416b-a c2a-b8ce82 6ae924 |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.