9. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 12/7/2018 11:35:50 AM Central Standard 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.

9.1 Files compared

#	Location	File	Last Modified
1	C:\SCRUB\MHED\MHED\VAR 4.10.0\var-resources-release-4.10@1091a011694\ResourceIntTest\src\resinttest\resources\META-INF\cocoon\properties\resinttest	inttest.properties	Thu Oct 18 18:44:32 2018 UTC
2	C:\MHED-scrubbed\MHED\MHED\VAR 4.10.0\var-resources-release-4.10@1091a011694\ResourceIntTest\src\resinttest\resources\META-INF\cocoon\properties\resinttest	inttest.properties	Fri Dec 7 17:02:54 2018 UTC

9.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	1	24
Changed	2	4
Inserted	0	0
Removed	0	0

9.3 Comparison options

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

9.4 Active regular expressions

No regular expressions were active.

9.5 Comparison detail

	1	cih-dev-se rver-url=h ttp:// IP
	2
	3	hadb_jndin ame=java:c omp/env/jd bc/HADB
	4	authdb_jnd iname=java :comp/env/ jdbc/AUTHD B
	5	vardb_jndi name=java: comp/env/j dbc/VARDB
	6	cdw_jndina me=java:co mp/env/jdb c/OIA_Mobi leHealth
	7	dataSource .ref=jndiD ataSource
	8	hadb_diale ct=org.hib ernate.dia lect.MySQL Dialect
	9
	10	hadb_drive r=com.mysq l.jdbc.Dri ver
	11	vardb_url= jdbc:mysql ://localho st:3306/VA RDB
	12	hadb_url=j dbc:mysql: //localhos t:3306/HAD B
	13	hadb_user= root
	14	hadb_passw ord= PW_r e d a cte d