Produced by Araxis Merge on 10/2/2017 7:00:09 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-invocation\src\test\resources | Test-CDSMockEngineTest.xml | Thu Mar 16 15:17:48 2017 UTC |
| 2 | cds.zip\cds\product\production\cdsinvocation\cds-invocation\src\test\resources | Test-CDSMockEngineTest.xml | Thu Sep 28 16:17:43 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 1286 |
| Changed | 2 | 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 | xmlns:cxf= "http://cx f.apache.o rg/core" | |
| 10 | ||
| 11 | xmlns:jaxw s="http:// cxf.apache .org/jaxws " | |
| 12 | xmlns:jaxr s="http:// cxf.apache .org/jaxrs " | |
| 13 | ||
| 14 | xmlns:cont ext="http: //www.spri ngframewor k.org/sche ma/context " | |
| 15 | ||
| 16 | xsi:schema Location=" http://cxf .apache.or g/core htt p://cxf.ap ache.org/s chemas/cor e.xsd | |
| 17 | ht tp://www.s pringframe work.org/s chema/bean s http://w ww.springf ramework.o rg/schema/ beans/spri ng-beans.x sd | |
| 18 | ht tp://cxf.a pache.org/ jaxws http ://cxf.apa che.org/sc hemas/jaxw s.xsd | |
| 19 | ht tp://cxf.a pache.org/ jaxrs http ://cxf.apa che.org/sc hemas/jaxr s.xsd | |
| 20 | ht tp://www.s pringframe work.org/s chema/cont ext http:/ /www.sprin gframework .org/schem a/context/ spring-con text.xsd" | |
| 21 | > | |
| 22 | ||
| 23 | ||
| 24 | <context:a nnotation- config /> | |
| 25 | ||
| 26 | <import | |
| 27 | resource=" classpath: META-INF/c xf/cxf.xml " | |
| 28 | /> | |
| 29 | ||
| 30 | <import | |
| 31 | resource=" classpath: META-INF/c xf/cxf-ser vlet.xml" | |
| 32 | /> | |
| 33 | ||
| 34 | ||
| 35 | <bean | |
| 36 | ||
| 37 | class="org .springfra mework.bea ns.factory .config.Pr opertyPlac eholderCon figurer" | |
| 38 | > | |
| 39 | ||
| 40 | <property | |
| 41 | name="loca tions" | |
| 42 | > | |
| 43 | ||
| 44 | <list> | |
| 45 | ||
| 46 | <value> | |
| 47 | classpath: test-cogni tive.cds.c onfig.prop erties | |
| 48 | </value> | |
| 49 | ||
| 50 | </list> | |
| 51 | ||
| 52 | </property > | |
| 53 | ||
| 54 | </bean> | |
| 55 | ||
| 56 | ||
| 57 | <bean | |
| 58 | id="propje ctProperti es" | |
| 59 | class="com .cognitive .cds.invoc ation.Proj ectPropert ies" | |
| 60 | > | |
| 61 | ||
| 62 | <property | |
| 63 | name="prop ertyName" | |
| 64 | ||
| 65 | value="cla sspath:tes t-cognitiv e.cds.conf ig.propert ies" | |
| 66 | /> | |
| 67 | ||
| 68 | </bean> | |
| 69 | ||
| 70 | ||
| 71 | <!--bean i d="OpenCDS " class="c om.cogniti ve.cds.inv ocation.en gineplugin s.OpenCDS" / --> | |
| 72 | ||
| 73 | <bean | |
| 74 | id="engine InstanceSt ateManager " | |
| 75 | ||
| 76 | class="com .cognitive .cds.invoc ation.engi neplugins. OpenCDSMoc kEngineIns tanceState Manager" | |
| 77 | /> | |
| 78 | ||
| 79 | ||
| 80 | <bean | |
| 81 | id="engine One" | |
| 82 | class="com .cognitive .cds.invoc ation.engi neplugins. MockEngine " | |
| 83 | > | |
| 84 | ||
| 85 | </bean> | |
| 86 | ||
| 87 | ||
| 88 | <bean | |
| 89 | id="engine Two" | |
| 90 | class="com .cognitive .cds.invoc ation.engi neplugins. MockEngine " | |
| 91 | > | |
| 92 | ||
| 93 | </bean> | |
| 94 | ||
| 95 | ||
| 96 | <!-- The D efault Dat a handler --> | |
| 97 | ||
| 98 | <bean | |
| 99 | id="fhirDa taHandler" | |
| 100 | ||
| 101 | class="com .cognitive .cds.invoc ation.fhir .FHIRJSOND ataModelHa ndler" | |
| 102 | > | |
| 103 | ||
| 104 | <lookup-me thod | |
| 105 | name="crea teFhirData Retriever" | |
| 106 | bean="retr ieveFhirDa ta" | |
| 107 | /> | |
| 108 | ||
| 109 | </bean> | |
| 110 | ||
| 111 | ||
| 112 | <bean | |
| 113 | id="retrie veFhirData " | |
| 114 | class="com .cognitive .cds.invoc ation.fhir .FhirDataR etriever" | |
| 115 | ||
| 116 | scope="pro totype" | |
| 117 | > | |
| 118 | ||
| 119 | ||
| 120 | <property | |
| 121 | name="base Url" | |
| 122 | value="${R DK-fhir-se rver}" | |
| 123 | /> | |
| 124 | ||
| 125 | <property | |
| 126 | name="auth Url" | |
| 127 | value="${R DK-auth-se rver}" | |
| 128 | /> | |
| 129 | ||
| 130 | ||
| 131 | <property | |
| 132 | name="defa ultAuth" | |
| 133 | > | |
| 134 | ||
| 135 | <bean | |
| 136 | class="com .cognitive .cds.invoc ation.fhir .model.Aut henticatio n" | |
| 137 | > | |
| 138 | ||
| 139 | <construct or-arg | |
| 140 | name="acce ssCode" | |
| 141 | value=" REDACTED " | |
| 142 | /> | |
| 143 | ||
| 144 | <construct or-arg | |
| 145 | name="veri fyCode" | |
| 146 | value=" REDACTED " | |
| 147 | /> | |
| 148 | ||
| 149 | <construct or-arg | |
| 150 | name="site " | |
| 151 | value="9E7 A" | |
| 152 | /> | |
| 153 | ||
| 154 | <construct or-arg | |
| 155 | name="divi sion" | |
| 156 | value="500 " | |
| 157 | /> | |
| 158 | ||
| 159 | </bean> | |
| 160 | ||
| 161 | </property > | |
| 162 | ||
| 163 | </bean> | |
| 164 | ||
| 165 | ||
| 166 | <!-- Add a s a bean r eference f or Mongo D B access - -> | |
| 167 | ||
| 168 | <bean | |
| 169 | id="mongoD bDao" | |
| 170 | class="com .cognitive .cds.invoc ation.mong o.MongoDbD ao" | |
| 171 | > | |
| 172 | ||
| 173 | <construct or-arg | |
| 174 | name="mong oDbUrl" | |
| 175 | value="${m ongo-db-ur l}" | |
| 176 | /> | |
| 177 | ||
| 178 | </bean> | |
| 179 | ||
| 180 | ||
| 181 | <bean | |
| 182 | id="engine InfoDao" | |
| 183 | class="com .cognitive .cds.invoc ation.mong o.EngineIn foDao" | |
| 184 | > | |
| 185 | ||
| 186 | <property | |
| 187 | name="mong oDbDao" | |
| 188 | ref="mongo DbDao" | |
| 189 | /> | |
| 190 | ||
| 191 | </bean> | |
| 192 | ||
| 193 | ||
| 194 | <bean | |
| 195 | id="patien tLookup" | |
| 196 | class="com .cognitive .cds.invoc ation.mong o.PatientL istDao" | |
| 197 | > | |
| 198 | ||
| 199 | <property | |
| 200 | name="mong oDbDao" | |
| 201 | ref="mongo DbDao" | |
| 202 | /> | |
| 203 | ||
| 204 | </bean> | |
| 205 | ||
| 206 | ||
| 207 | <bean | |
| 208 | id="intent Lookup" | |
| 209 | class="com .cognitive .cds.invoc ation.mong o.IntentMa ppingDao" | |
| 210 | > | |
| 211 | ||
| 212 | <property | |
| 213 | name="mong oDbDao" | |
| 214 | ref="mongo DbDao" | |
| 215 | /> | |
| 216 | ||
| 217 | </bean> | |
| 218 | ||
| 219 | ||
| 220 | <bean | |
| 221 | id="reposi toryLookup " | |
| 222 | class="com .cognitive .cds.invoc ation.Repo sitoryLook up" | |
| 223 | > | |
| 224 | ||
| 225 | <property | |
| 226 | name="inte ntMappingA gent" | |
| 227 | ref="inten tLookup" | |
| 228 | /> | |
| 229 | ||
| 230 | <property | |
| 231 | name="engi neInfoAgen t" | |
| 232 | ref="engin eInfoDao" | |
| 233 | /> | |
| 234 | ||
| 235 | </bean> | |
| 236 | ||
| 237 | ||
| 238 | <bean | |
| 239 | id="cdsInv oker" | |
| 240 | class="com .cognitive .cds.invoc ation.CDSI nvoker" | |
| 241 | > | |
| 242 | ||
| 243 | <property | |
| 244 | name="repo sitoryLook upAgent" | |
| 245 | ref="repos itoryLooku p" | |
| 246 | /> | |
| 247 | ||
| 248 | <property | |
| 249 | name="data ModelHandl erBeanName " | |
| 250 | value="fhi rDataHandl er" | |
| 251 | /> | |
| 252 | ||
| 253 | <property | |
| 254 | name="engi nesMap" | |
| 255 | > | |
| 256 | ||
| 257 | <map> | |
| 258 | ||
| 259 | <entry | |
| 260 | key="engin eOne" | |
| 261 | > | |
| 262 | ||
| 263 | <bean | |
| 264 | class="com .cognitive .cds.invoc ation.mode l.EngineIn fo" | |
| 265 | > | |
| 266 | ||
| 267 | <construct or-arg | |
| 268 | name="engi ne" | |
| 269 | ref="engin eOne" | |
| 270 | /> | |
| 271 | ||
| 272 | <property | |
| 273 | name="name " | |
| 274 | value="eng ineOne" | |
| 275 | /> | |
| 276 | ||
| 277 | <property | |
| 278 | name="type " | |
| 279 | value="Moc k" | |
| 280 | /> | |
| 281 | ||
| 282 | <property | |
| 283 | name="vers ion" | |
| 284 | value="1" | |
| 285 | /> | |
| 286 | ||
| 287 | <property | |
| 288 | name="envi ronment" | |
| 289 | value="" | |
| 290 | /> | |
| 291 | ||
| 292 | </bean> | |
| 293 | ||
| 294 | </entry> | |
| 295 | ||
| 296 | <entry | |
| 297 | key="engin eTwo" | |
| 298 | > | |
| 299 | ||
| 300 | <bean | |
| 301 | class="com .cognitive .cds.invoc ation.mode l.EngineIn fo" | |
| 302 | > | |
| 303 | ||
| 304 | <construct or-arg | |
| 305 | name="engi ne" | |
| 306 | ref="engin eTwo" | |
| 307 | /> | |
| 308 | ||
| 309 | <property | |
| 310 | name="name " | |
| 311 | value="eng ineTwo" | |
| 312 | /> | |
| 313 | ||
| 314 | <property | |
| 315 | name="type " | |
| 316 | value="Moc k" | |
| 317 | /> | |
| 318 | ||
| 319 | <property | |
| 320 | name="vers ion" | |
| 321 | value="1" | |
| 322 | /> | |
| 323 | ||
| 324 | <property | |
| 325 | name="envi ronment" | |
| 326 | value="" | |
| 327 | /> | |
| 328 | ||
| 329 | </bean> | |
| 330 | ||
| 331 | </entry> | |
| 332 | ||
| 333 | </map> | |
| 334 | ||
| 335 | </property > | |
| 336 | ||
| 337 | <property | |
| 338 | name="inte ntsMap" | |
| 339 | > | |
| 340 | ||
| 341 | <map> | |
| 342 | ||
| 343 | <entry | |
| 344 | key="First Engine" | |
| 345 | > | |
| 346 | ||
| 347 | <bean | |
| 348 | class="com .cognitive .cds.invoc ation.mode l.IntentMa pping" | |
| 349 | > | |
| 350 | ||
| 351 | <property | |
| 352 | name="name " | |
| 353 | value="Fir stEngine" | |
| 354 | > | |
| 355 | </property > | |
| 356 | ||
| 357 | <property | |
| 358 | name="desc ription" | |
| 359 | value="A M ock Intent " | |
| 360 | > | |
| 361 | </property > | |
| 362 | ||
| 363 | <property | |
| 364 | name="scop e" | |
| 365 | value="Ent erprise" | |
| 366 | /> | |
| 367 | ||
| 368 | <property | |
| 369 | name="invo cations" | |
| 370 | > | |
| 371 | ||
| 372 | <list> | |
| 373 | ||
| 374 | <bean | |
| 375 | class="com .cognitive .cds.invoc ation.mode l.Invocati onMapping" | |
| 376 | > | |
| 377 | ||
| 378 | <property | |
| 379 | name="engi neName" | |
| 380 | value="eng ineOne" | |
| 381 | > | |
| 382 | </property > | |
| 383 | ||
| 384 | <property | |
| 385 | name="rule s" | |
| 386 | > | |
| 387 | ||
| 388 | <list> | |
| 389 | ||
| 390 | <bean | |
| 391 | class="com .cognitive .cds.invoc ation.mode l.Rule" | |
| 392 | > | |
| 393 | ||
| 394 | <property | |
| 395 | name="id" | |
| 396 | value="gen derAgeRule " | |
| 397 | > | |
| 398 | </property > | |
| 399 | ||
| 400 | <property | |
| 401 | name="prop erties" | |
| 402 | > | |
| 403 | ||
| 404 | <props> | |
| 405 | ||
| 406 | <prop | |
| 407 | key="delay " | |
| 408 | > | |
| 409 | 10 | |
| 410 | </prop> | |
| 411 | ||
| 412 | </props> | |
| 413 | ||
| 414 | </property > | |
| 415 | ||
| 416 | </bean> | |
| 417 | ||
| 418 | </list> | |
| 419 | ||
| 420 | </property > | |
| 421 | ||
| 422 | </bean> | |
| 423 | ||
| 424 | </list> | |
| 425 | ||
| 426 | </property > | |
| 427 | ||
| 428 | </bean> | |
| 429 | ||
| 430 | </entry> | |
| 431 | ||
| 432 | <entry | |
| 433 | key="Secon dEngine" | |
| 434 | > | |
| 435 | ||
| 436 | <bean | |
| 437 | class="com .cognitive .cds.invoc ation.mode l.IntentMa pping" | |
| 438 | > | |
| 439 | ||
| 440 | <property | |
| 441 | name="invo cations" | |
| 442 | > | |
| 443 | ||
| 444 | <list> | |
| 445 | ||
| 446 | <bean | |
| 447 | class="com .cognitive .cds.invoc ation.mode l.Invocati onMapping" | |
| 448 | > | |
| 449 | ||
| 450 | <property | |
| 451 | name="engi neName" | |
| 452 | value="eng ineTwo" | |
| 453 | > | |
| 454 | </property > | |
| 455 | ||
| 456 | <property | |
| 457 | name="rule s" | |
| 458 | > | |
| 459 | ||
| 460 | <list> | |
| 461 | ||
| 462 | <bean | |
| 463 | class="com .cognitive .cds.invoc ation.mode l.Rule" | |
| 464 | > | |
| 465 | ||
| 466 | <property | |
| 467 | name="id" | |
| 468 | value="age ntOrangeRu le" | |
| 469 | > | |
| 470 | </property > | |
| 471 | ||
| 472 | <property | |
| 473 | name="prop erties" | |
| 474 | > | |
| 475 | ||
| 476 | <props> | |
| 477 | ||
| 478 | <prop | |
| 479 | key="delay " | |
| 480 | > | |
| 481 | 10 | |
| 482 | </prop> | |
| 483 | ||
| 484 | </props> | |
| 485 | ||
| 486 | </property > | |
| 487 | ||
| 488 | </bean> | |
| 489 | ||
| 490 | </list> | |
| 491 | ||
| 492 | </property > | |
| 493 | ||
| 494 | </bean> | |
| 495 | ||
| 496 | </list> | |
| 497 | ||
| 498 | </property > | |
| 499 | ||
| 500 | </bean> | |
| 501 | ||
| 502 | </entry> | |
| 503 | ||
| 504 | <entry | |
| 505 | key="Merge " | |
| 506 | > | |
| 507 | ||
| 508 | <bean | |
| 509 | class="com .cognitive .cds.invoc ation.mode l.IntentMa pping" | |
| 510 | > | |
| 511 | ||
| 512 | <property | |
| 513 | name="invo cations" | |
| 514 | > | |
| 515 | ||
| 516 | <list> | |
| 517 | ||
| 518 | <bean | |
| 519 | class="com .cognitive .cds.invoc ation.mode l.Invocati onMapping" | |
| 520 | > | |
| 521 | ||
| 522 | <property | |
| 523 | name="engi neName" | |
| 524 | value="eng ineTwo" | |
| 525 | > | |
| 526 | </property > | |
| 527 | ||
| 528 | <property | |
| 529 | name="rule s" | |
| 530 | > | |
| 531 | ||
| 532 | <list> | |
| 533 | ||
| 534 | <bean | |
| 535 | class="com .cognitive .cds.invoc ation.mode l.Rule" | |
| 536 | > | |
| 537 | ||
| 538 | <property | |
| 539 | name="id" | |
| 540 | value="age ntOrangeRu le" | |
| 541 | > | |
| 542 | </property > | |
| 543 | ||
| 544 | <property | |
| 545 | name="prop erties" | |
| 546 | > | |
| 547 | ||
| 548 | <props> | |
| 549 | ||
| 550 | <prop | |
| 551 | key="delay " | |
| 552 | > | |
| 553 | 10 | |
| 554 | </prop> | |
| 555 | ||
| 556 | </props> | |
| 557 | ||
| 558 | </property > | |
| 559 | ||
| 560 | </bean> | |
| 561 | ||
| 562 | </list> | |
| 563 | ||
| 564 | </property > | |
| 565 | ||
| 566 | </bean> | |
| 567 | ||
| 568 | <bean | |
| 569 | class="com .cognitive .cds.invoc ation.mode l.Invocati onMapping" | |
| 570 | > | |
| 571 | ||
| 572 | <property | |
| 573 | name="engi neName" | |
| 574 | value="eng ineOne" | |
| 575 | > | |
| 576 | </property > | |
| 577 | ||
| 578 | <property | |
| 579 | name="rule s" | |
| 580 | > | |
| 581 | ||
| 582 | <list> | |
| 583 | ||
| 584 | <bean | |
| 585 | class="com .cognitive .cds.invoc ation.mode l.Rule" | |
| 586 | > | |
| 587 | ||
| 588 | <property | |
| 589 | name="id" | |
| 590 | value="age ntOrangeRu le" | |
| 591 | > | |
| 592 | </property > | |
| 593 | ||
| 594 | <property | |
| 595 | name="prop erties" | |
| 596 | > | |
| 597 | ||
| 598 | <props> | |
| 599 | ||
| 600 | <prop | |
| 601 | key="delay " | |
| 602 | > | |
| 603 | 10 | |
| 604 | </prop> | |
| 605 | ||
| 606 | </props> | |
| 607 | ||
| 608 | </property > | |
| 609 | ||
| 610 | </bean> | |
| 611 | ||
| 612 | </list> | |
| 613 | ||
| 614 | </property > | |
| 615 | ||
| 616 | </bean> | |
| 617 | ||
| 618 | </list> | |
| 619 | ||
| 620 | </property > | |
| 621 | ||
| 622 | </bean> | |
| 623 | ||
| 624 | </entry> | |
| 625 | ||
| 626 | </map> | |
| 627 | ||
| 628 | </property > | |
| 629 | ||
| 630 | <property | |
| 631 | name="metr icCollecto rs" | |
| 632 | > | |
| 633 | ||
| 634 | <list> | |
| 635 | ||
| 636 | <bean | |
| 637 | class="com .cognitive .cds.invoc ation.metr icsplugins .DoNothing " | |
| 638 | /> | |
| 639 | ||
| 640 | </list> | |
| 641 | ||
| 642 | </property > | |
| 643 | ||
| 644 | </bean> | |
| 645 | </beans> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.