Produced by Araxis Merge on 6/9/2017 3:50:03 PM Eastern 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.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | Fri Jun 9 19:50:03 2017 UTC | ||
| 2 | eHealth_Exch (eHealth Exchange Enhancements) Build 3 docs & code_May_2017.zip\VAP_CIF_CODE0502.zip\VAP_CIF_CODE0502\VAP_CIF_CODE0502\nvap-ea\src\main\resources | log4j.dtd | Fri Apr 21 20:03:26 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 1 | 227 |
| Removed | 0 | 0 |
| 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 |
No regular expressions were active.
| 1 | <?xml vers ion="1.0" encoding=" UTF-8" ?> | |||||
| 2 | <!-- | |||||
| 3 | Licensed to the Apa che Softwa re Foundat ion (ASF) under one or more | |||||
| 4 | contribut or license agreement s. See th e NOTICE f ile distri buted with | |||||
| 5 | this work for addit ional info rmation re garding co pyright ow nership. | |||||
| 6 | The ASF l icenses th is file to You under the Apach e License, Version 2 .0 | |||||
| 7 | (the "Lic ense"); yo u may not use this f ile except in compli ance with | |||||
| 8 | the Licen se. You m ay obtain a copy of the Licens e at | |||||
| 9 | ||||||
| 10 | http ://www.apa che.org/li censes/LIC ENSE-2.0 | |||||
| 11 | ||||||
| 12 | Unless re quired by applicable law or ag reed to in writing, software | |||||
| 13 | distribut ed under t he License is distri buted on a n "AS IS" BASIS, | |||||
| 14 | WITHOUT W ARRANTIES OR CONDITI ONS OF ANY KIND, eit her expres s or impli ed. | |||||
| 15 | See the L icense for the speci fic langua ge governi ng permiss ions and | |||||
| 16 | limitatio ns under t he License . | |||||
| 17 | --> | |||||
| 18 | ||||||
| 19 | <!-- Autho rs: Chris Taylor, Ce ki Gulcu. --> | |||||
| 20 | ||||||
| 21 | <!-- Versi on: 1.2 -- > | |||||
| 22 | ||||||
| 23 | <!-- A con figuration element c onsists of optional renderer | |||||
| 24 | elements,a ppender el ements, ca tegories a nd an opti onal root | |||||
| 25 | element. - -> | |||||
| 26 | ||||||
| 27 | <!ELEMENT log4j:conf iguration (renderer* , appender *,plugin*, (category |logger)*, root?, | |||||
| 28 | (category Factory|lo ggerFactor y)?)> | |||||
| 29 | ||||||
| 30 | <!-- The " threshold" attribute takes a l evel value below whi ch --> | |||||
| 31 | <!-- all l ogging sta tements ar e disabled . --> | |||||
| 32 | ||||||
| 33 | <!-- Setti ng the "de bug" enabl e the prin ting of in ternal log 4j logging --> | |||||
| 34 | <!-- state ments. --> | |||||
| 35 | ||||||
| 36 | <!-- By de fault, deb ug attribu te is "nul l", meanin g that we not do tou ch --> | |||||
| 37 | <!-- inter nal log4j logging se ttings. Th e "null" v alue for t he thresho ld --> | |||||
| 38 | <!-- attri bute can b e misleadi ng. The th reshold fi eld of a r epository --> | |||||
| 39 | <!-- canno t be set t o null. Th e "null" v alue for t he thresho ld attribu te --> | |||||
| 40 | <!-- simpl y means do n't touch the thresh old field, the thres hold field --> | |||||
| 41 | <!-- keeps its old v alue. --> | |||||
| 42 | ||||||
| 43 | <!ATTLIST log4j:conf iguration | |||||
| 44 | xmlns:lo g4j CDA TA #FIXED "http://ja karta.apac he.org/log 4j/" | |||||
| 45 | threshol d (al l|trace|de bug|info|w arn|error| fatal|off| null) "nul l" | |||||
| 46 | debug (tr ue|false|n ull) "nul l" | |||||
| 47 | reset (tr ue|false) "false" | |||||
| 48 | > | |||||
| 49 | ||||||
| 50 | <!-- rende rer elemen ts allow t he user to customize the conve rsion of --> | |||||
| 51 | <!-- messa ge objects to String . --> | |||||
| 52 | ||||||
| 53 | <!ELEMENT renderer E MPTY> | |||||
| 54 | <!ATTLIST renderer | |||||
| 55 | rendered Class CDA TA #REQUIR ED | |||||
| 56 | renderin gClass CDA TA #REQUIR ED | |||||
| 57 | > | |||||
| 58 | ||||||
| 59 | <!-- Appen ders must have a nam e and a cl ass. --> | |||||
| 60 | <!-- Appen ders may c ontain an error hand ler, a lay out, optio nal parame ters --> | |||||
| 61 | <!-- and f ilters. Th ey may als o referenc e (or incl ude) other appenders . --> | |||||
| 62 | <!ELEMENT appender ( errorHandl er?, param *, | |||||
| 63 | roll ingPolicy? , triggeri ngPolicy?, connectio nSource?, | |||||
| 64 | layo ut?, filte r*, append er-ref*)> | |||||
| 65 | <!ATTLIST appender | |||||
| 66 | name CDAT A #REQUI RED | |||||
| 67 | class CDAT A #REQUI RED | |||||
| 68 | > | |||||
| 69 | ||||||
| 70 | <!ELEMENT layout (pa ram*)> | |||||
| 71 | <!ATTLIST layout | |||||
| 72 | class CDAT A #REQUI RED | |||||
| 73 | > | |||||
| 74 | ||||||
| 75 | <!ELEMENT filter (pa ram*)> | |||||
| 76 | <!ATTLIST filter | |||||
| 77 | class CDAT A #REQUI RED | |||||
| 78 | > | |||||
| 79 | ||||||
| 80 | <!-- Error Handlers c an be of a ny class. They can a dmit any n umber of - -> | |||||
| 81 | <!-- param eters. --> | |||||
| 82 | ||||||
| 83 | <!ELEMENT errorHandl er (param* , root-ref ?, logger- ref*, app ender-ref? )> | |||||
| 84 | <!ATTLIST errorHandl er | |||||
| 85 | class CDAT A #REQUI RED | |||||
| 86 | > | |||||
| 87 | ||||||
| 88 | <!ELEMENT root-ref E MPTY> | |||||
| 89 | ||||||
| 90 | <!ELEMENT logger-ref EMPTY> | |||||
| 91 | <!ATTLIST logger-ref | |||||
| 92 | ref CDAT A #REQUIRE D | |||||
| 93 | > | |||||
| 94 | ||||||
| 95 | <!ELEMENT param EMPT Y> | |||||
| 96 | <!ATTLIST param | |||||
| 97 | name CDAT A #REQUI RED | |||||
| 98 | value CDAT A #REQUI RED | |||||
| 99 | > | |||||
| 100 | ||||||
| 101 | ||||||
| 102 | <!-- The p riority cl ass is org .apache.lo g4j.Level by default --> | |||||
| 103 | <!ELEMENT priority ( param*)> | |||||
| 104 | <!ATTLIST priority | |||||
| 105 | class CDATA #IMP LIED | |||||
| 106 | value CDATA #REQ UIRED | |||||
| 107 | > | |||||
| 108 | ||||||
| 109 | <!-- The l evel class is org.ap ache.log4j .Level by default -- > | |||||
| 110 | <!ELEMENT level (par am*)> | |||||
| 111 | <!ATTLIST level | |||||
| 112 | class CDATA #IMP LIED | |||||
| 113 | value CDATA #REQ UIRED | |||||
| 114 | > | |||||
| 115 | ||||||
| 116 | ||||||
| 117 | <!-- If no level ele ment is sp ecified, t hen the co nfigurator MUST not --> | |||||
| 118 | <!-- touch the level of the na med catego ry. --> | |||||
| 119 | <!ELEMENT category ( param*,(pr iority|lev el)?,appen der-ref*)> | |||||
| 120 | <!ATTLIST category | |||||
| 121 | class CDAT A #IMPLI ED | |||||
| 122 | name CDAT A #REQUI RED | |||||
| 123 | additivi ty (tru e|false) " true" | |||||
| 124 | > | |||||
| 125 | ||||||
| 126 | <!-- If no level ele ment is sp ecified, t hen the co nfigurator MUST not --> | |||||
| 127 | <!-- touch the level of the na med logger . --> | |||||
| 128 | <!ELEMENT logger (le vel?,appen der-ref*)> | |||||
| 129 | <!ATTLIST logger | |||||
| 130 | name CDAT A #REQUI RED | |||||
| 131 | additivi ty (tru e|false) " true" | |||||
| 132 | > | |||||
| 133 | ||||||
| 134 | ||||||
| 135 | <!ELEMENT categoryFa ctory (par am*)> | |||||
| 136 | <!ATTLIST categoryFa ctory | |||||
| 137 | class CDAT A #REQUIRE D> | |||||
| 138 | ||||||
| 139 | <!ELEMENT loggerFact ory (param *)> | |||||
| 140 | <!ATTLIST loggerFact ory | |||||
| 141 | class CDAT A #REQUIRE D> | |||||
| 142 | ||||||
| 143 | <!ELEMENT appender-r ef EMPTY> | |||||
| 144 | <!ATTLIST appender-r ef | |||||
| 145 | ref CDAT A #REQUIRE D | |||||
| 146 | > | |||||
| 147 | ||||||
| 148 | <!-- plugi ns must ha ve a name and class and can ha ve optiona l paramete rs --> | |||||
| 149 | <!ELEMENT plugin (pa ram*, conn ectionSour ce?)> | |||||
| 150 | <!ATTLIST plugin | |||||
| 151 | name CDAT A #RE QUIRED | |||||
| 152 | class CDAT A #REQUIR ED | |||||
| 153 | > | |||||
| 154 | ||||||
| 155 | <!ELEMENT connection Source (da taSource?, param*)> | |||||
| 156 | <!ATTLIST connection Source | |||||
| 157 | class CDATA #REQUIRE D | |||||
| 158 | > | |||||
| 159 | ||||||
| 160 | <!ELEMENT dataSource (param*)> | |||||
| 161 | <!ATTLIST dataSource | |||||
| 162 | class CDATA #REQUIRE D | |||||
| 163 | > | |||||
| 164 | ||||||
| 165 | <!ELEMENT triggering Policy ((p aram|filte r)*)> | |||||
| 166 | <!ATTLIST triggering Policy | |||||
| 167 | name CDAT A #IMPLIE D | |||||
| 168 | class CDAT A #REQUIR ED | |||||
| 169 | > | |||||
| 170 | ||||||
| 171 | <!ELEMENT rollingPol icy (param *)> | |||||
| 172 | <!ATTLIST rollingPol icy | |||||
| 173 | name CDAT A #IMPLIE D | |||||
| 174 | class CDAT A #REQUIR ED | |||||
| 175 | > | |||||
| 176 | ||||||
| 177 | ||||||
| 178 | <!-- If no priority element is specified , then the configura tor MUST n ot --> | |||||
| 179 | <!-- touch the prior ity of roo t. --> | |||||
| 180 | <!-- The r oot catego ry always exists and cannot be subclasse d. --> | |||||
| 181 | <!ELEMENT root (para m*, (prior ity|level) ?, appende r-ref*)> | |||||
| 182 | ||||||
| 183 | ||||||
| 184 | <!-- ===== ========== ========== ========== ========== ========== ========== === --> | |||||
| 185 | <!-- A l ogging eve nt --> | |||||
| 186 | <!-- ===== ========== ========== ========== ========== ========== ========== === --> | |||||
| 187 | <!ELEMENT log4j:even tSet (log4 j:event*)> | |||||
| 188 | <!ATTLIST log4j:even tSet | |||||
| 189 | xmlns:lo g4j CDAT A #FIXED " http://jak arta.apach e.org/log4 j/" | |||||
| 190 | version (1.1| 1.2) "1.2" | |||||
| 191 | includes LocationIn fo (true |false) "t rue" | |||||
| 192 | > | |||||
| 193 | ||||||
| 194 | ||||||
| 195 | ||||||
| 196 | <!ELEMENT log4j:even t (log4j:m essage, lo g4j:NDC?, log4j:thro wable?, | |||||
| 197 | log4j:l ocationInf o?, log4j: properties ?) > | |||||
| 198 | ||||||
| 199 | <!-- The t imestamp f ormat is a pplication dependent . --> | |||||
| 200 | <!ATTLIST log4j:even t | |||||
| 201 | logger CDATA #REQUIRED | |||||
| 202 | level CDATA #REQUIRED | |||||
| 203 | thread CDATA #REQUIRED | |||||
| 204 | timest amp CDATA #REQUIRED | |||||
| 205 | time CDATA #IMPLIED | |||||
| 206 | > | |||||
| 207 | ||||||
| 208 | <!ELEMENT log4j:mess age (#PCDA TA)> | |||||
| 209 | <!ELEMENT log4j:NDC (#PCDATA)> | |||||
| 210 | ||||||
| 211 | <!ELEMENT log4j:thro wable (#PC DATA)> | |||||
| 212 | ||||||
| 213 | <!ELEMENT log4j:loca tionInfo E MPTY> | |||||
| 214 | <!ATTLIST log4j:loca tionInfo | |||||
| 215 | class C DATA #REQ UIRED | |||||
| 216 | method C DATA #REQ UIRED | |||||
| 217 | file C DATA #REQ UIRED | |||||
| 218 | line C DATA #REQ UIRED | |||||
| 219 | > | |||||
| 220 | ||||||
| 221 | <!ELEMENT log4j:prop erties (lo g4j:data*) > | |||||
| 222 | ||||||
| 223 | <!ELEMENT log4j:data EMPTY> | |||||
| 224 | <!ATTLIST log4j:data | |||||
| 225 | name C DATA #REQ UIRED | |||||
| 226 | value C DATA #REQ UIRED | |||||
| 227 | > |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.