Produced by Araxis Merge on 10/2/2017 7:00:17 AM 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.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | cds.zip\cds\product\production\cdsinvocation\cds-metrics-collection-service\src\main\webapp\WEB-INF | beans.xml | Fri Apr 28 17:27:00 2017 UTC |
| 2 | cds.zip\cds\product\production\cdsinvocation\cds-metrics-collection-service\src\main\webapp\WEB-INF | beans.xml | Thu Sep 28 16:21:32 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 580 |
| Changed | 1 | 4 |
| Inserted | 0 | 0 |
| 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 | |
| 2 | version="1 .0" | |
| 3 | encoding=" UTF-8" | |
| 4 | ?> | |
| 5 | <beans | |
| 6 | xmlns="htt p://www.sp ringframew ork.org/sc hema/beans " | |
| 7 | ||
| 8 | xmlns:xsi= "http://ww w.w3.org/2 001/XMLSch ema-instan ce" | |
| 9 | ||
| 10 | xmlns:cxf= "http://cx f.apache.o rg/core" | |
| 11 | ||
| 12 | xmlns:jaxw s="http:// cxf.apache .org/jaxws " | |
| 13 | ||
| 14 | xmlns:jaxr s="http:// cxf.apache .org/jaxrs " | |
| 15 | ||
| 16 | xmlns:cont ext="http: //www.spri ngframewor k.org/sche ma/context " | |
| 17 | ||
| 18 | xmlns:task ="http://w ww.springf ramework.o rg/schema/ task" | |
| 19 | ||
| 20 | xmlns:util ="http://w ww.springf ramework.o rg/schema/ util" | |
| 21 | ||
| 22 | xsi:schema Location=" | |
| 23 | http:/ /cxf.apach e.org/core http://cx f.apache.o rg/schemas /core.xsd | |
| 24 | http:/ /www.sprin gframework .org/schem a/beans ht tp://www.s pringframe work.org/s chema/bean s/spring-b eans.xsd | |
| 25 | http:/ /cxf.apach e.org/jaxr s http://c xf.apache. org/schema s/jaxrs.xs d | |
| 26 | http:/ /cxf.apach e.org/jaxw s http://c xf.apache. org/schema s/jaxws.xs d | |
| 27 | http:/ /www.sprin gframework .org/schem a/context http://www .springfra mework.org /schema/co ntext/spri ng-context .xsd | |
| 28 | http:/ /www.sprin gframework .org/schem a/task htt p://www.sp ringframew ork.org/sc hema/task/ spring-tas k-4.1.xsd | |
| 29 | http:/ /www.sprin gframework .org/schem a/util htt p://www.sp ringframew ork.org/sc hema/util/ spring-uti l-3.0.xsd" | |
| 30 | > | |
| 31 | ||
| 32 | ||
| 33 | <import | |
| 34 | resource=" classpath: META-INF/c xf/cxf.xml " | |
| 35 | /> | |
| 36 | ||
| 37 | <import | |
| 38 | resource=" classpath: META-INF/c xf/cxf-ser vlet.xml" | |
| 39 | /> | |
| 40 | ||
| 41 | ||
| 42 | <context:a nnotation- config/> | |
| 43 | ||
| 44 | ||
| 45 | <bean | |
| 46 | id="reques tIdInInter ceptor" | |
| 47 | class="com .cognitive .cds.utils .log.Reque stIdIncomi ngIntercep tor" | |
| 48 | /> | |
| 49 | ||
| 50 | <bean | |
| 51 | id="reques tIdOutInte rceptor" | |
| 52 | class="com .cognitive .cds.utils .log.Reque stIdOutgoi ngIntercep tor" | |
| 53 | /> | |
| 54 | ||
| 55 | <bean | |
| 56 | id="cxfInI nterceptor " | |
| 57 | class="org .apache.cx f.intercep tor.Loggin gInInterce ptor" | |
| 58 | /> | |
| 59 | ||
| 60 | <bean | |
| 61 | id="cxfOut Intercepto r" | |
| 62 | class="org .apache.cx f.intercep tor.Loggin gOutInterc eptor" | |
| 63 | /> | |
| 64 | ||
| 65 | ||
| 66 | <cxf:bus> | |
| 67 | ||
| 68 | <cxf:inInt erceptors> | |
| 69 | ||
| 70 | <ref | |
| 71 | bean="requ estIdInInt erceptor" | |
| 72 | /> | |
| 73 | ||
| 74 | <ref | |
| 75 | bean="cxfI nIntercept or" | |
| 76 | /> | |
| 77 | ||
| 78 | </cxf:inIn terceptors > | |
| 79 | ||
| 80 | <cxf:outIn terceptors > | |
| 81 | ||
| 82 | <ref | |
| 83 | bean="requ estIdOutIn terceptor" | |
| 84 | /> | |
| 85 | ||
| 86 | <ref | |
| 87 | bean="cxfO utIntercep tor" | |
| 88 | /> | |
| 89 | ||
| 90 | </cxf:outI nterceptor s> | |
| 91 | ||
| 92 | </cxf:bus> | |
| 93 | ||
| 94 | ||
| 95 | ||
| 96 | <task:sche duler | |
| 97 | id="taskSc heduler" | |
| 98 | pool-size= "5" | |
| 99 | /> | |
| 100 | ||
| 101 | ||
| 102 | <bean | |
| 103 | ||
| 104 | class="org .springfra mework.bea ns.factory .config.Pr opertyPlac eholderCon figurer" | |
| 105 | > | |
| 106 | ||
| 107 | <property | |
| 108 | name="igno reResource NotFound" | |
| 109 | value="tru e" | |
| 110 | /> | |
| 111 | ||
| 112 | <property | |
| 113 | name="loca tions" | |
| 114 | > | |
| 115 | ||
| 116 | <list> | |
| 117 | ||
| 118 | <value> | |
| 119 | classpath: cds-metric s-service. properties | |
| 120 | </value> | |
| 121 | ||
| 122 | </list> | |
| 123 | ||
| 124 | </property > | |
| 125 | ||
| 126 | </bean> | |
| 127 | ||
| 128 | ||
| 129 | <bean | |
| 130 | id="health Check" | |
| 131 | class="com .cognitive .cds.Healt hCheck" | |
| 132 | > | |
| 133 | ||
| 134 | <property | |
| 135 | name="mong oDb" | |
| 136 | ref="mongo DbDao" | |
| 137 | /> | |
| 138 | ||
| 139 | </bean> | |
| 140 | ||
| 141 | ||
| 142 | <jaxrs:ser ver | |
| 143 | id="servic es" | |
| 144 | address="/ " | |
| 145 | > | |
| 146 | ||
| 147 | <jaxrs:ser viceBeans> | |
| 148 | ||
| 149 | <bean | |
| 150 | class="com .cognitive .cds.servi ces.metric s.MetricsC ollectionS ervice" | |
| 151 | > | |
| 152 | ||
| 153 | <property | |
| 154 | name="mong oDbDao" | |
| 155 | ref="mongo DbDao" | |
| 156 | /> | |
| 157 | ||
| 158 | <property | |
| 159 | name="heal thCheck" | |
| 160 | ref="healt hCheck" | |
| 161 | /> | |
| 162 | ||
| 163 | </bean> | |
| 164 | ||
| 165 | </jaxrs:se rviceBeans > | |
| 166 | ||
| 167 | <jaxrs:pro viders> | |
| 168 | ||
| 169 | <bean | |
| 170 | class="com .fasterxml .jackson.j axrs.json. JacksonJso nProvider" | |
| 171 | /> | |
| 172 | ||
| 173 | </jaxrs:pr oviders> | |
| 174 | ||
| 175 | </jaxrs:se rver> | |
| 176 | ||
| 177 | ||
| 178 | <bean | |
| 179 | class="com .cognitive .cds.servi ces.jmx.JM XPollingSe rvice" | |
| 180 | > | |
| 181 | ||
| 182 | <property | |
| 183 | name="port " | |
| 184 | value="199 88" | |
| 185 | /> | |
| 186 | ||
| 187 | <property | |
| 188 | name="peri od" | |
| 189 | value="600 00" | |
| 190 | /> | |
| 191 | ||
| 192 | <property | |
| 193 | name="mong oDbDao" | |
| 194 | ref="mongo DbDao" | |
| 195 | /> | |
| 196 | ||
| 197 | <property | |
| 198 | name="engi neInfoDao" | |
| 199 | ref="engin eLookup" | |
| 200 | /> | |
| 201 | ||
| 202 | ||
| 203 | <!-- The l ine below is mostly intended f or develop ment and t esting and should | |
| 204 | not be needed in practic e. --> | |
| 205 | ||
| 206 | <!--proper ty name="d ynamicRegi stryEnable d" value=" false" /-- > | |
| 207 | ||
| 208 | <!-- | |
| 209 | <pro perty name ="engines" > | |
| 210 | <list> | |
| 211 | <ref bea n="hardwir edEngineEx ample"/> | |
| 212 | </list > | |
| 213 | </pr operty> | |
| 214 | --> | |
| 215 | ||
| 216 | </bean> | |
| 217 | ||
| 218 | ||
| 219 | <!-- Examp le in case we need t o hardwire any engin es for pol ling, etc. --> | |
| 220 | ||
| 221 | <!-- | |
| 222 | <bean id="hardwi redEngineE xample" cl ass="com.c ognitive.c ds.invocat ion.model. EngineInst anceState" > | |
| 223 | <pro perty name ="name" va lue="Examp le" /> | |
| 224 | <pro perty name ="type" va lue="OpenC DS" /> | |
| 225 | <pro perty name ="status" value="tru e" /> | |
| 226 | <property name="host " value=" IP " /> | |
| 227 | <property name="port " value=" PORT " /> | |
| 228 | </ bean> | |
| 229 | -- > | |
| 230 | ||
| 231 | ||
| 232 | ||
| 233 | <!-- Add a s a bean r eference f or Mongo D B access - -> | |
| 234 | ||
| 235 | <bean | |
| 236 | id="mongoD bDao" | |
| 237 | class="com .cognitive .cds.invoc ation.mong o.MongoDbD ao" | |
| 238 | > | |
| 239 | ||
| 240 | <property | |
| 241 | name="mong o_host" | |
| 242 | value="${m ongo_host} " | |
| 243 | /> | |
| 244 | ||
| 245 | <property | |
| 246 | name="mong o_port" | |
| 247 | value="${m ongo_port} " | |
| 248 | /> | |
| 249 | ||
| 250 | <property | |
| 251 | name="mong o_username " | |
| 252 | value="${m ongo_usern ame}" | |
| 253 | /> | |
| 254 | ||
| 255 | <property | |
| 256 | name="mong o_password " | |
| 257 | value="${m ongo_passw ord}" | |
| 258 | /> | |
| 259 | ||
| 260 | <property | |
| 261 | name="mong o_connecti onsPerHost " | |
| 262 | value="${m ongo_conne ctionsPerH ost}" | |
| 263 | /> | |
| 264 | ||
| 265 | </bean> | |
| 266 | ||
| 267 | ||
| 268 | <bean | |
| 269 | class="com .cognitive .cds.servi ces.metric s.MetricsC ollectionS ervice" | |
| 270 | > | |
| 271 | ||
| 272 | <property | |
| 273 | name="mong oDbDao" | |
| 274 | ref="mongo DbDao" | |
| 275 | /> | |
| 276 | ||
| 277 | </bean> | |
| 278 | ||
| 279 | ||
| 280 | <bean | |
| 281 | id="engine Lookup" | |
| 282 | class="com .cognitive .cds.invoc ation.mong o.EngineIn foDao" | |
| 283 | > | |
| 284 | ||
| 285 | <property | |
| 286 | name="mong oDbDao" | |
| 287 | ref="mongo DbDao" | |
| 288 | /> | |
| 289 | ||
| 290 | </bean> | |
| 291 | ||
| 292 | </beans> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.