20. Araxis Merge ファイル比較レポート

このレポートは Araxis Merge11/20/2017 2:20:35 PM GMT Standard Time によって作成されました。Merge に関する情報については www.araxis.com をご覧ください。このレポートは XHTML と CSS2 を使用し、最新の標準基準に準拠したブラウザでご覧になれます。このレポートを印刷するための最適条件は、背景の色とイメージの印刷を可能にして、印刷の向きは横を使用します。

20.1 ファイルの比較

#	ロケーション	ファイル	更新日時
1	C:\Merge Test Files\8.0.47\java\org\apache\catalina\authenticator	package.html	Fri Sep 29 16:53:28 2017 UTC
2	C:\Merge Test Files\8.5.23\java\org\apache\catalina\authenticator	package.html	Thu Sep 28 11:32:16 2017 UTC

20.2 比較の概要

説明	第１ファイルと第２ファイル
説明	テキストブロック	行
変更なし	1	108
変更箇所	0	0
挿入箇所	0	0
削除箇所	0	0

20.3 比較のオプション

余白	連続した空白文字を 1 文字として扱う
大文字/小文字	大文字と小文字の相違を意味のあるものとして扱う
行終端文字	行終端文字（`CR` と `LF` 文字）の相違を無視する
CR/LF 文字	比較の詳細に示されない

20.4 有効な正規表現

有効な正規表現はありません。

20.5 比較の詳細

1	<!--	1	<!--
2	Licensed to the Ap ache Softw are Founda tion (ASF) under one or more	2	Licensed to the Ap ache Softw are Founda tion (ASF) under one or more
3	contribu tor licens e agreemen ts. See t he NOTICE file distr ibuted wit h	3	contribu tor licens e agreemen ts. See t he NOTICE file distr ibuted wit h
4	this wor k for addi tional inf ormation r egarding c opyright o wnership.	4	this wor k for addi tional inf ormation r egarding c opyright o wnership.
5	The ASF licenses t his file t o You unde r the Apac he License , Version 2.0	5	The ASF licenses t his file t o You unde r the Apac he License , Version 2.0
6	(the "Li cense"); y ou may not use this file excep t in compl iance with	6	(the "Li cense"); y ou may not use this file excep t in compl iance with
7	the Lice nse. You may obtain a copy of the Licen se at	7	the Lice nse. You may obtain a copy of the Licen se at
8		8
9	http ://www.apa che.org/li censes/LIC ENSE-2.0	9	http ://www.apa che.org/li censes/LIC ENSE-2.0
10		10
11	Unless r equired by applicabl e law or a greed to i n writing, software	11	Unless r equired by applicabl e law or a greed to i n writing, software
12	distribu ted under the Licens e is distr ibuted on an "AS IS" BASIS,	12	distribu ted under the Licens e is distr ibuted on an "AS IS" BASIS,
13	WITHOUT WARRANTIES OR CONDIT IONS OF AN Y KIND, ei ther expre ss or impl ied.	13	WITHOUT WARRANTIES OR CONDIT IONS OF AN Y KIND, ei ther expre ss or impl ied.
14	See the License fo r the spec ific langu age govern ing permis sions and	14	See the License fo r the spec ific langu age govern ing permis sions and
15	limitati ons under the Licens e.	15	limitati ons under the Licens e.
16	-->	16	-->
17	<body>	17	<body>
18		18
19	<p>This pa ckage cont ains <code >Authentic ator</code > implemen tations fo r the	19	<p>This pa ckage cont ains <code >Authentic ator</code > implemen tations fo r the
20	various su pported au thenticati on methods (BASIC, D IGEST, and FORM). I n	20	various su pported au thenticati on methods (BASIC, D IGEST, and FORM). I n
21	addition, there is a convenien ce base cl ass,	21	addition, there is a convenien ce base cl ass,
22	<code>Auth enticatorB ase</code> , for cust omized <co de>Authent icator</co de>	22	<code>Auth enticatorB ase</code> , for cust omized <co de>Authent icator</co de>
23	implementa tions.</p>	23	implementa tions.</p>
24		24
25	<p>If you are using the standa rd context configura tion class	25	<p>If you are using the standa rd context configura tion class
26	(<code>org .apache.ca talina.sta rtup.Conte xtConfig</ code>) to configure the	26	(<code>org .apache.ca talina.sta rtup.Conte xtConfig</ code>) to configure the
27	Authentica tor associ ated with a particul ar context , you can register t he Java	27	Authentica tor associ ated with a particul ar context , you can register t he Java
28	class to b e used for each poss ible authe ntication method by modifying the	28	class to b e used for each poss ible authe ntication method by modifying the
29	following Properties file:</p>	29	following Properties file:</p>
30	<pre>	30	<pre>
31	src/sh are/org/ap ache/catal ina/startu p/Authenti cators.pro perties	31	src/sh are/org/ap ache/catal ina/startu p/Authenti cators.pro perties
32	</pre>	32	</pre>
33		33
34	<p>Each of the stand ard implem entations extends a common bas e class	34	<p>Each of the stand ard implem entations extends a common bas e class
35	(<code>Aut henticator Base</code >), which is configu red by set ting the	35	(<code>Aut henticator Base</code >), which is configu red by set ting the
36	following JavaBeans properties (with def ault value s in squar e brackets ):</p>	36	following JavaBeans properties (with def ault value s in squar e brackets ):</p>
37	<ul>	37	<ul>
38	<li><b>cac he</b> - S hould we c ache authe nticated P rincipals (thus avoi ding	38	<li><b>cac he</b> - S hould we c ache authe nticated P rincipals (thus avoi ding
39	per-re quest look ups in our underlyin g <code>Re alm</code> ) if this request	39	per-re quest look ups in our underlyin g <code>Re alm</code> ) if this request
40	is par t of an HT TP session ? [true]< /li>	40	is par t of an HT TP session ? [true]< /li>
41	<li><b>deb ug</b> - D ebugging d etail leve l for this component . [0]</li >	41	<li><b>deb ug</b> - D ebugging d etail leve l for this component . [0]</li >
42	</ul>	42	</ul>
43		43
44	<p>The sta ndard auth entication methods t hat are cu rrently pr ovided inc lude:</p>	44	<p>The sta ndard auth entication methods t hat are cu rrently pr ovided inc lude:</p>
45	<ul>	45	<ul>
46	<li><b>Bas icAuthenti cator</b> - Implemen ts HTTP BA SIC authen tication, as	46	<li><b>Bas icAuthenti cator</b> - Implemen ts HTTP BA SIC authen tication, as
47	descri bed in RFC 2617.</li >	47	descri bed in RFC 2617.</li >
48	<li><b>Dig estAuthent icator</b> - Impleme nts HTTP D IGEST auth entication , as	48	<li><b>Dig estAuthent icator</b> - Impleme nts HTTP D IGEST auth entication , as
49	descri bed in RFC 2617.</li >	49	descri bed in RFC 2617.</li >
50	<li><b>For mAuthentic ator</b> - Implement s FORM-BAS ED authent ication, a s	50	<li><b>For mAuthentic ator</b> - Implement s FORM-BAS ED authent ication, a s
51	descri bed in the Servlet A PI Specifi cation.</l i>	51	descri bed in the Servlet A PI Specifi cation.</l i>
52	</ul>	52	</ul>
53		53
54	</body>	54	</body>