Produced by Araxis Merge on 12/21/2016 2:21:12 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 | C:\OSCIF_VSS\Pri_un\ZIP\VSS_5_1_2438\VSS_5_1_2438\trunk\common_web\src\main\webapp\WEB-INF\jsp\shared | inc_header.jsp | Wed Dec 7 02:28:22 2016 UTC |
2 | C:\OSCIF_VSS\Pri_re\ZIP\VSS_5_1_2438\VSS_5_1_2438\trunk\common_web\src\main\webapp\WEB-INF\jsp\shared | inc_header.jsp | Mon Dec 12 18:56:13 2016 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 2 | 44 |
Changed | 1 | 2 |
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 | <%@ page c ontentType ="text/htm l"%> | |
2 | ||
3 | <%@ taglib prefix="c " uri="htt p://java.s un.com/jsp /jstl/core "%> | |
4 | <%@ taglib prefix="f mt" uri="h ttp://java .sun.com/j sp/jstl/fm t"%> | |
5 | <%@ taglib prefix="f n" uri="ht tp://java. sun.com/js p/jstl/fun ctions"%> | |
6 | <%@ taglib prefix="f orm" uri=" http://www .springfra mework.org /tags/form "%> | |
7 | <%@ taglib prefix="s ec" | |
8 | ur i="http:// www.spring framework. org/securi ty/tags"%> | |
9 | <%@ taglib prefix="s pring" uri ="http://w ww.springf ramework.o rg/tags"%> | |
10 | <%@ taglib prefix="t iles" uri= "http://ti les.apache .org/tags- tiles"%> | |
11 | <%@ taglib prefix="x " uri="htt p://java.s un.com/jsp /jstl/xml" %> | |
12 | <%@ taglib prefix="a pp" uri="h ttp:// DNS /app/tagli bs"%> | |
13 | <%@ taglib prefix="v ss" tagdir ="/WEB-INF /tags"%> | |
14 | ||
15 | <c:set var ="protocol HostnamePo rt" value= "${protoco lHostnameP ort}" /> | |
16 | <c:set var ="home" va lue="${pag eContext.s ervletCont ext.contex tPath}" /> | |
17 | <c:set var ="ajaxHome " value="$ {home}${AJ AX_CONTEXT _PATH_PREF IX}" /> | |
18 | <c:set var ="jsHome" value="${h ome}/media /js" /> | |
19 | <c:set var ="imgHome" value="${ home}/medi a/images" /> | |
20 | <c:set var ="cssHome" value="${ home}/medi a/css" /> | |
21 | <c:set var ="pkgHome" value="${ home}/medi a/packages " /> | |
22 | <c:set var ="soundHom e" value=" ${home}/me dia/sounds " /> | |
23 |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.