Produced by Araxis Merge on 7/6/2017 8:32:14 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 | HC 837 Compliance 05122017.zip\HC 837 Compliance 05122017\FPPS_app\FPPS_app\src | fpps_app-ds.xml | Mon May 9 19:11:56 2016 UTC |
2 | HC 837 Compliance 05122017.zip\HC 837 Compliance 05122017\FPPS_app\FPPS_app\src | fpps_app-ds.xml | Wed Jul 5 13:30:44 2017 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 6 | 158 |
Changed | 5 | 10 |
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 | ||
6 | <!DOCTYPE datasource s | |
7 | PUBLIC "-//JBoss //DTD JBOS S JCA Conf ig 1.5//EN " | |
8 | "http: //www.jbos s.org/j2ee /dtd/jboss -ds_1_5.dt d"> | |
9 | ||
10 | <datasourc es> | |
11 | ||
12 | <!-- ORIGI NAL FROM S UBVERSION --> | |
13 | <!-- | |
14 | <local- tx-datasou rce> | |
15 | <jnd i-name>FPP S_OwnerDS< /jndi-name > | |
16 | <connectio n-url>jdbc :oracle:th in:@ REDACTED </connecti on-url> | |
17 | <dri ver-class> oracle.jdb c.driver.O racleDrive r</driver- class> | |
18 | <use r-name>FPP S_APP</use r-name> | |
19 | <pas sword>fpps 00</passwo rd> | |
20 | </local -tx-dataso urce> | |
21 | --> | |
22 | ||
23 | <!-- from previousl y deployed app in te st environ ment - 7/1 1 --> | |
24 | ||
25 | ||
26 | <local-tx- datasource > | |
27 | ||
28 | <jndi-name > | |
29 | FPPS_Owner DS | |
30 | </jndi-nam e> | |
31 | ||
32 | ||
33 | <connectio n-url> | |
34 | jdbc:oracl e:thin:@ IP :feedev0 | |
35 | </connecti on-url> | |
36 | ||
37 | <driver-cl ass> | |
38 | oracle.jdb c.driver.O racleDrive r | |
39 | </driver-c lass> | |
40 | ||
41 | <user-name > | |
42 | FPPS_APP | |
43 | </user-nam e> | |
44 | ||
45 | <password> | |
46 | fpps00 | |
47 | </password > | |
48 | ||
49 | </local-tx -datasourc e> | |
50 | ||
51 | <!-- from fee final --> | |
52 | <!-- | |
53 | <local-tx- datasource > | |
54 | <jnd i-name>FPP S_OwnerDS< /jndi-name > | |
55 | <connectio n-url>jdbc :oracle:th in:@ IP :feedev0</ connection -url> | |
56 | <dri ver-class> oracle.jdb c.driver.O racleDrive r</driver- class> | |
57 | <use r-name>E_R EPOS</user -name> | |
58 | <pas sword>fpps 85735</pas sword> | |
59 | </local-tx -datasourc e> | |
60 | --> | |
61 | ||
62 | ||
63 | ||
64 | ||
65 | ||
66 | <!-- FROM FEE FINAL --> | |
67 | <!-- | |
68 | #feedev1 f or Ken | |
69 | hibernate. connection .username= E_REPOS | |
70 | hibernate. connection .password= fpps85735 | |
71 | hibernate. connection .url=jdbc: oracle:thi n:@ IP :feedev0 | |
72 | ||
73 | #QA DB - 6 /27 | |
74 | #hibernate .connectio n.username =E_REPOS | |
75 | #hibernate .connectio n.password =soper_e1 | |
76 | #hibernate .connectio n.url=jdbc :oracle:th in:@ REDACTED : PORT :feeqadb2 | |
77 | --> | |
78 | ||
79 | ||
80 | <!-- app-d ev-ds.xml - test mov ed over -- > | |
81 | ||
82 | ||
83 | </datasour ces> | |
84 |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.