Araxis Merge Folder Comparison Report

Produced by Araxis Merge on 11/20/2017 2:16:16 PM GMT 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.

1. Folders compared

#	Location	Folder
1	C:\Merge Test Files\8.0.47\java\org\apache\	catalina
2	C:\Merge Test Files\8.5.23\java\org\apache\	catalina

2. Summary for all files

Line count statistics are not available for inserted and removed files. To enable them, select Gather line count statistics for inserted and removed files on the Folder Comparisons option page.

Between Folders 1 and 2
932 lines in 6 pairs of unchanged files
10237 lines in 13 pairs of changed files
8 inserted files
4 removed files

Description	Between Folders 1 and 2
Description	Lines (Folder 1)	Lines (Folder 2)	Lines (Total)	Text Blocks
Unchanged	5127	5127	10254	187
Changed	286	302	588	104
Inserted	0	292	292	35
Removed	35	0	35	29

3. Summary for selected files

No files were selected.

4. Comparison options

Comparison method	Files are compared using the configured comparison rules to determine whether they are identical
Depth	All files in the folder hierarchy are compared
Whitespace	Consecutive whitespace is treated as a single space
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
Include	Items matching `Folders - **` are included in the comparison
Include	Items matching `Files - **` are included in the comparison
Unchanged files	Shown in the comparison detail
Timestamps and sizes	Not shown in the comparison detail
Change counts	Shown in the comparison detail

5. Active regular expressions

No regular expressions were active.

6. Comparison detail

authenticator	0	authenticator
		jaspic
		AuthConfigFactoryImpl.java	Report 1
		CallbackHandlerImpl.java	Report 2
		LocalStrings.properties	Report 3
		MessageInfoImpl.java	Report 4
		PersistentProviderRegistrations.java	Report 5
		SimpleAuthConfigProvider.java	Report 6
		SimpleServerAuthConfig.java	Report 7
		SimpleServerAuthContext.java	Report 8
AuthenticatorBase.java	110	AuthenticatorBase.java	Report 9
BasicAuthenticator.java	4	BasicAuthenticator.java	Report 10
Constants.java	3	Constants.java	Report 11
DigestAuthenticator.java	7	DigestAuthenticator.java	Report 12
FormAuthenticator.java	16	FormAuthenticator.java	Report 13
LocalStrings.properties	1	LocalStrings.properties	Report 14
LocalStrings_es.properties	1	LocalStrings_es.properties	Report 15
LocalStrings_fr.properties	0	LocalStrings_fr.properties	Report 16
LocalStrings_ja.properties	0	LocalStrings_ja.properties	Report 17
mbeans-descriptors.xml	1	mbeans-descriptors.xml	Report 18
NonLoginAuthenticator.java	1	NonLoginAuthenticator.java	Report 19
package.html	0	package.html	Report 20
SavedRequest.java	0	SavedRequest.java	Report 21
SingleSignOn.java	1	SingleSignOn.java	Report 22
SingleSignOnEntry.java	7	SingleSignOnEntry.java	Report 23
SingleSignOnListener.java	0	SingleSignOnListener.java	Report 24
SingleSignOnSessionKey.java	0	SingleSignOnSessionKey.java	Report 25
SpnegoAuthenticator.java	13	SpnegoAuthenticator.java	Report 26
SSLAuthenticator.java	3	SSLAuthenticator.java	Report 27
comet	0
CometEvent.java	0		Report 28
CometFilter.java	0		Report 29
CometFilterChain.java	0		Report 30
CometProcessor.java	0		Report 31