2299. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 10/5/2018 9:05:54 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.

2299.1 Files compared

#	Location	File	Last Modified
1	MHEDP3_VAOS_VATS_SM_Sept2018.zip\VAR 4.5.2\var-resources-4.5.2.zip\ResourceIntTest\src\resinttest\resources\META-INF\cocoon\properties\resinttest	inttest.properties	Wed Aug 15 03:28:53 2018 UTC
2	MHEDP3_VAOS_VATS_SM_Sept2018.zip\VAR 4.5.2\var-resources-4.5.2.zip\ResourceIntTest\src\resinttest\resources\META-INF\cocoon\properties\resinttest	inttest.properties	Fri Oct 5 20:33:20 2018 UTC

2299.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	1	22
Changed	2	6
Inserted	0	0
Removed	0	0

2299.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

2299.4 Active regular expressions

No regular expressions were active.

2299.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= AI
	14	hadb_passw ord=A I