Produced by Araxis Merge on 4/23/2019 12:14:48 PM 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 | C:\AraxisMergeCompare\Pri_un\CCRS\CCRS-BUSRULES-v6.3\CCRS-BUSRULES-v6.3\mvi\conf | bus-config-prod.xml | Wed Mar 27 19:38:08 2019 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\CCRS\CCRS-BUSRULES-v6.3\CCRS-BUSRULES-v6.3\mvi\conf | bus-config-prod.xml | Wed Apr 17 18:15:35 2019 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 4 | 128 |
| Changed | 3 | 6 |
| 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:sec= "http://cx f.apache.o rg/configu ration/sec urity" | |
| 10 | ||
| 11 | xmlns:http ="http://c xf.apache. org/transp orts/http/ configurat ion" | |
| 12 | ||
| 13 | xmlns:jaxw s="http:// cxf.apache .org/jaxws " | |
| 14 | ||
| 15 | xsi:schema Location=" | |
| 16 | http://cxf .apache.or g/jaxws ht tp://cxf.a pache.org/ schemas/ja xws.xsd | |
| 17 | http ://cxf.apa che.org/co nfiguratio n/security | |
| 18 | http ://cxf.apa che.org/sc hemas/conf iguration/ security.x sd | |
| 19 | http ://cxf.apa che.org/tr ansports/h ttp/config uration | |
| 20 | http ://cxf.apa che.org/sc hemas/conf iguration/ http-conf. xsd | |
| 21 | http ://www.spr ingframewo rk.org/sch ema/beans http://www .springfra mework.org /schema/be ans/spring -beans.xsd " | |
| 22 | > | |
| 23 | ||
| 24 | ||
| 25 | <http:cond uit | |
| 26 | name="*.ht tp-conduit " | |
| 27 | > | |
| 28 | ||
| 29 | ||
| 30 | <http:tlsC lientParam eters> | |
| 31 | ||
| 32 | <sec:keyMa nagers | |
| 33 | keyPasswor d="
|
|
| 34 | > | |
| 35 | ||
| 36 | <sec:keySt ore | |
| 37 | type="pkcs 12" | |
| 38 | password="
|
|
| 39 | ||
| 40 | resource=" keystore-p rod.p12" | |
| 41 | /> | |
| 42 | ||
| 43 | </sec:keyM anagers> | |
| 44 | ||
| 45 | <sec:trust Managers> | |
| 46 | ||
| 47 | <sec:keySt ore | |
| 48 | type="pkcs 12" | |
| 49 | password="
|
|
| 50 | ||
| 51 | resource=" keystore-p rod.p12" | |
| 52 | /> | |
| 53 | ||
| 54 | </sec:trus tManagers> | |
| 55 | ||
| 56 | </http:tls ClientPara meters> | |
| 57 | ||
| 58 | <http:clie nt | |
| 59 | AutoRedire ct="true" | |
| 60 | Connection ="Keep-Ali ve" | |
| 61 | /> | |
| 62 | ||
| 63 | ||
| 64 | </http:con duit> | |
| 65 | ||
| 66 | ||
| 67 | </beans> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.