Produced by Araxis Merge on 2/7/2017 12:14:10 PM Eastern Standard 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 | cpss.zip\cpss\src\test\resources | test-data-source.xml | Wed Feb 1 21:07:20 2017 UTC |
2 | cpss.zip\cpss\src\test\resources | test-data-source.xml | Mon Feb 6 17:23:32 2017 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 19 | 468 |
Changed | 18 | 36 |
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:tx=" http://www .springfra mework.org /schema/tx " | |
10 | ||
11 | xmlns:task ="http://w ww.springf ramework.o rg/schema/ task" | |
12 | ||
13 | xsi:schema Location=" | |
14 | htt p://www.sp ringframew ork.org/sc hema/beans | |
15 | htt p://www.sp ringframew ork.org/sc hema/beans /spring-be ans.xsd" | |
16 | > | |
17 | ||
18 | ||
19 | <!-- Defau lt Oracle DB Connect ion --> | |
20 | ||
21 | <beans | |
22 | profile="d efault" | |
23 | > | |
24 | ||
25 | <bean | |
26 | id="dataSo urce" | |
27 | class="org .apache.co mmons.dbcp 2.BasicDat aSource" | |
28 | ||
29 | destroy-me thod="clos e" | |
30 | > | |
31 | ||
32 | <property | |
33 | name="driv erClassNam e" | |
34 | value="ora cle.jdbc.d river.Orac leDriver" | |
35 | /> | |
36 | ||
37 | <property | |
38 | name="url" | |
39 | ||
40 | value="jdb c:oracle:t hin:@
|
|
41 | /> | |
42 | ||
43 | <property | |
44 | name="user name" | |
45 | value=" AI " | |
46 | /> | |
47 | ||
48 | <property | |
49 | name="pass word" | |
50 | value=" AI " | |
51 | /> | |
52 | ||
53 | </bean> | |
54 | ||
55 | </beans> | |
56 | ||
57 | ||
58 | <!-- DEV O racle DB C onnection --> | |
59 | ||
60 | <beans | |
61 | profile="d ev" | |
62 | > | |
63 | ||
64 | <bean | |
65 | id="dataSo urce" | |
66 | class="org .apache.co mmons.dbcp 2.BasicDat aSource" | |
67 | ||
68 | destroy-me thod="clos e" | |
69 | > | |
70 | ||
71 | <property | |
72 | name="driv erClassNam e" | |
73 | value="ora cle.jdbc.d river.Orac leDriver" | |
74 | /> | |
75 | ||
76 | <property | |
77 | name="url" | |
78 | ||
79 | value="jdb c:oracle:t hin:@
|
|
80 | /> | |
81 | ||
82 | <property | |
83 | name="user name" | |
84 | value=" AI " | |
85 | /> | |
86 | ||
87 | <property | |
88 | name="pass word" | |
89 | value=" AI " | |
90 | /> | |
91 | ||
92 | </bean> | |
93 | ||
94 | </beans> | |
95 | ||
96 | ||
97 | <!-- LOCAL Oracle DB Connectio n --> | |
98 | ||
99 | <beans | |
100 | profile="l ocal" | |
101 | > | |
102 | ||
103 | <bean | |
104 | id="dataSo urce" | |
105 | class="org .apache.co mmons.dbcp 2.BasicDat aSource" | |
106 | ||
107 | destroy-me thod="clos e" | |
108 | > | |
109 | ||
110 | <property | |
111 | name="driv erClassNam e" | |
112 | value="ora cle.jdbc.d river.Orac leDriver" | |
113 | /> | |
114 | ||
115 | <property | |
116 | name="url" | |
117 | ||
118 | value="jdb c:oracle:t hin:@
|
|
119 | /> | |
120 | ||
121 | <property | |
122 | name="user name" | |
123 | value=" AI " | |
124 | /> | |
125 | ||
126 | <property | |
127 | name="pass word" | |
128 | value=" AI " | |
129 | /> | |
130 | ||
131 | </bean> | |
132 | ||
133 | </beans> | |
134 | ||
135 | ||
136 | <!-- PREPR OD Oracle DB Connect ion --> | |
137 | ||
138 | <beans | |
139 | profile="p reprod" | |
140 | > | |
141 | ||
142 | <bean | |
143 | id="dataSo urce" | |
144 | class="org .apache.co mmons.dbcp 2.BasicDat aSource" | |
145 | ||
146 | destroy-me thod="clos e" | |
147 | > | |
148 | ||
149 | <property | |
150 | name="driv erClassNam e" | |
151 | value="ora cle.jdbc.d river.Orac leDriver" | |
152 | /> | |
153 | ||
154 | <property | |
155 | name="url" | |
156 | ||
157 | value="jdb c:oracle:t hin:@
|
|
158 | /> | |
159 | ||
160 | <property | |
161 | name="user name" | |
162 | value=" AI " | |
163 | /> | |
164 | ||
165 | <property | |
166 | name="pass word" | |
167 | value=" AI " | |
168 | /> | |
169 | ||
170 | </bean> | |
171 | ||
172 | </beans> | |
173 | ||
174 | ||
175 | <!-- PROD Oracle DB Connection --> | |
176 | ||
177 | <beans | |
178 | profile="p rod" | |
179 | > | |
180 | ||
181 | <bean | |
182 | id="dataSo urce" | |
183 | class="org .apache.co mmons.dbcp 2.BasicDat aSource" | |
184 | ||
185 | destroy-me thod="clos e" | |
186 | > | |
187 | ||
188 | <property | |
189 | name="driv erClassNam e" | |
190 | value="ora cle.jdbc.d river.Orac leDriver" | |
191 | /> | |
192 | ||
193 | <property | |
194 | name="url" | |
195 | ||
196 | value="jdb c:oracle:t hin:@
|
|
197 | /> | |
198 | ||
199 | <property | |
200 | name="user name" | |
201 | value=" AI " | |
202 | /> | |
203 | ||
204 | <property | |
205 | name="pass word" | |
206 | value=" AI " | |
207 | /> | |
208 | ||
209 | </bean> | |
210 | ||
211 | </beans> | |
212 | ||
213 | ||
214 | <!-- SQA O racle DB C onnection --> | |
215 | ||
216 | <beans | |
217 | profile="s qa" | |
218 | > | |
219 | ||
220 | <bean | |
221 | id="dataSo urce" | |
222 | class="org .apache.co mmons.dbcp 2.BasicDat aSource" | |
223 | ||
224 | destroy-me thod="clos e" | |
225 | > | |
226 | ||
227 | <property | |
228 | name="driv erClassNam e" | |
229 | value="ora cle.jdbc.d river.Orac leDriver" | |
230 | /> | |
231 | ||
232 | <property | |
233 | name="url" | |
234 | ||
235 | value="jdb c:oracle:t hin:@
|
|
236 | /> | |
237 | ||
238 | <property | |
239 | name="user name" | |
240 | value=" AI " | |
241 | /> | |
242 | ||
243 | <property | |
244 | name="pass word" | |
245 | value=" AI " | |
246 | /> | |
247 | ||
248 | </bean> | |
249 | ||
250 | </beans> | |
251 | ||
252 | </beans> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.