3. Araxis Merge File Comparison Report

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

3.1 Files compared

#	Location	File	Last Modified
1			Mon Nov 20 14:15:51 2017 UTC
2	C:\Merge Test Files\8.5.23\java\org\apache\catalina\authenticator\jaspic	LocalStrings.properties	Thu Sep 28 11:32:16 2017 UTC
3	C:\Merge Test Files\9.0.1\java\org\apache\catalina\authenticator\jaspic	LocalStrings.properties	Wed Sep 27 18:33:40 2017 UTC
Note: Merge considers the second file to be the common ancestor of the others.

3.2 Comparison summary

Description	Between Files 1 and 2		Between Files 2 and 3		Relative to Common Ancestor
Description	Text Blocks	Lines	Text Blocks	Lines	Text Blocks	Lines
Unchanged	0	0	1	60
Changed	0	0	0	0	0	0
Inserted	1	30	0	0	0	0
Removed	0	0	0	0	1	30
Note: An automatic merge would leave 0 conflict(s).

3.3 Comparison options

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
CR/LF characters	Not shown in the comparison detail

3.4 Active regular expressions

No regular expressions were active.

3.5 Comparison detail

1	# Licensed to the Ap ache Softw are Founda tion (ASF) under one or more	1	# Licensed to the Ap ache Softw are Founda tion (ASF) under one or more
2	# contribu tor licens e agreemen ts. See t he NOTICE file distr ibuted wit h	2	# contribu tor licens e agreemen ts. See t he NOTICE file distr ibuted wit h
3	# this wor k for addi tional inf ormation r egarding c opyright o wnership.	3	# this wor k for addi tional inf ormation r egarding c opyright o wnership.
4	# The ASF licenses t his file t o You unde r the Apac he License , Version 2.0	4	# The ASF licenses t his file t o You unde r the Apac he License , Version 2.0
5	# (the "Li cense"); y ou may not use this file excep t in compl iance with	5	# (the "Li cense"); y ou may not use this file excep t in compl iance with
6	# the Lice nse. You may obtain a copy of the Licen se at	6	# the Lice nse. You may obtain a copy of the Licen se at
7	#	7	#
8	# http ://www.apa che.org/li censes/LIC ENSE-2.0	8	# http ://www.apa che.org/li censes/LIC ENSE-2.0
9	#	9	#
10	# Unless r equired by applicabl e law or a greed to i n writing, software	10	# Unless r equired by applicabl e law or a greed to i n writing, software
11	# distribu ted under the Licens e is distr ibuted on an "AS IS" BASIS,	11	# distribu ted under the Licens e is distr ibuted on an "AS IS" BASIS,
12	# WITHOUT WARRANTIES OR CONDIT IONS OF AN Y KIND, ei ther expre ss or impl ied.	12	# WITHOUT WARRANTIES OR CONDIT IONS OF AN Y KIND, ei ther expre ss or impl ied.
13	# See the License fo r the spec ific langu age govern ing permis sions and	13	# See the License fo r the spec ific langu age govern ing permis sions and
14	# limitati ons under the Licens e.	14	# limitati ons under the Licens e.
15		15
16	authConfig FactoryImp l.load=Loa ding persi stent prov ider regis trations f rom [{0}]	16	authConfig FactoryImp l.load=Loa ding persi stent prov ider regis trations f rom [{0}]
17	authConfig FactoryImp l.zeroLeng thAppConte xt=A zero length app lication c ontext nam e is not v alid	17	authConfig FactoryImp l.zeroLeng thAppConte xt=A zero length app lication c ontext nam e is not v alid
18	authConfig FactoryImp l.zeroLeng thMessageL ayer=A zer o length m essage lay er name is not valid	18	authConfig FactoryImp l.zeroLeng thMessageL ayer=A zer o length m essage lay er name is not valid
19	authConfig FactoryImp l.register Class=Regi stering cl ass [{0}] for layer [{1}] and applicatio n context [{2}]	19	authConfig FactoryImp l.register Class=Regi stering cl ass [{0}] for layer [{1}] and applicatio n context [{2}]
20	authConfig FactoryImp l.register Instance=R egistering instance of type[{0 }] for lay er [{1}] a nd applica tion conte xt [{2}]	20	authConfig FactoryImp l.register Instance=R egistering instance of type[{0 }] for lay er [{1}] a nd applica tion conte xt [{2}]
21		21
22	callbackHa ndlerImpl. jaspicCall backMissin g=Unsuppor ted JASPIC callback of type [{ 0}] receiv ed which w as ignored	22	callbackHa ndlerImpl. jaspicCall backMissin g=Unsuppor ted JASPIC callback of type [{ 0}] receiv ed which w as ignored
23		23
24	jaspicAuth enticator. authentica te=Authent icating re quest for [{0}] via JASPIC	24	jaspicAuth enticator. authentica te=Authent icating re quest for [{0}] via JASPIC
25		25
26	persistent ProviderRe gistration s.deleteFa il=The tem porary fil e [{0}] ca nnot be de leted	26	persistent ProviderRe gistration s.deleteFa il=The tem porary fil e [{0}] ca nnot be de leted
27	persistent ProviderRe gistration s.existsDe leteFail=T he tempora ry file [{ 0}] alread y exists a nd cannot be deleted	27	persistent ProviderRe gistration s.existsDe leteFail=T he tempora ry file [{ 0}] alread y exists a nd cannot be deleted
28	persistent ProviderRe gistration s.moveFail =Failed to move [{0} ] to [{1}]	28	persistent ProviderRe gistration s.moveFail =Failed to move [{0} ] to [{1}]
29		29
30	simpleServ erAuthConf ig.noModul es="No Ser verAuthMod ules confi gured"	30	simpleServ erAuthConf ig.noModul es="No Ser verAuthMod ules confi gured"