Skip to content

Commit e932033

Browse files
vladakvladak
committed
change includes to absolute
fixes #4050
1 parent 4fe126c commit e932033

File tree

16 files changed

+61
-64
lines changed

16 files changed

+61
-64
lines changed

‎opengrok-web/src/main/webapp/diff.jsp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1616
1717
CDDL HEADER END
1818
19-
Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
19+
Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
2020
Portions Copyright 2011 Jens Elkner.
2121
Portions Copyright (c) 2020, Chris Fraire <[email protected]>.
2222
--%>
@@ -84,7 +84,7 @@ private String getAnnotateRevision(DiffData data) {
8484
}
8585
%><%@
8686
87-
include file="mast.jsp"
87+
include file="/mast.jsp"
8888
8989
%><%
9090
/* ---------------------- diff.jsp start --------------------- */
@@ -543,6 +543,6 @@ action=download">download diff</a></span><%
543543
/* ---------------------- diff.jsp end --------------------- */
544544
%><%@
545545
546-
include file="foot.jspf"
546+
include file="/foot.jspf"
547547
548548
%>

‎opengrok-web/src/main/webapp/eforbidden.jsp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1616
1717
CDDL HEADER END
1818
19-
Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
19+
Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
2020
Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
2121
--%>
2222
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
@@ -28,12 +28,12 @@ Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
2828
response.setStatus(HttpServletResponse.SC_FORBIDDEN);
2929
%><%@
3030
31-
include file="httpheader.jspf"
31+
include file="/httpheader.jspf"
3232
3333
%><body>
3434
<div id="page">
3535
<header id="whole_header">
36-
<%@include file="pageheader.jspf" %>
36+
<%@include file="/pageheader.jspf" %>
3737
</header>
3838
<h3 class="error">Error: access forbidden</h3>
3939
<p>The request was forbidden. This can be either file/directory permissions problem or insufficient authorization.</p>
@@ -43,6 +43,6 @@ Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
4343
/* ---------------------- eforbidden.jsp end --------------------- */
4444
%><%@
4545
46-
include file="foot.jspf"
46+
include file="/foot.jspf"
4747
4848
%>

‎opengrok-web/src/main/webapp/enoent.jsp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1616
1717
CDDL HEADER END
1818
19-
Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
19+
Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
2020
Portions Copyright 2011 Jens Elkner.
2121
Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
2222
@@ -31,7 +31,7 @@ Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
3131
}
3232
%><%@
3333
34-
include file="httpheader.jspf"
34+
include file="/httpheader.jspf"
3535
3636
%><body>
3737
<div id="page">
@@ -40,7 +40,7 @@ include file="httpheader.jspf"
4040
<div id="Masthead">Error: file not found</div>
4141
<div id="sbar"><%@
4242
43-
include file="menu.jspf"
43+
include file="/menu.jspf"
4444
4545
%></div>
4646
</header>
@@ -61,6 +61,6 @@ include file="menu.jspf"
6161
/* ---------------------- enoent.jsp end --------------------- */
6262
%><%@
6363
64-
include file="foot.jspf"
64+
include file="/foot.jspf"
6565
6666
%>

‎opengrok-web/src/main/webapp/error.jsp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1616
1717
CDDL HEADER END
1818
19-
Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
19+
Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
2020
Portions Copyright 2011 Jens Elkner.
2121
Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
2222
@@ -42,13 +42,13 @@ org.opengrok.indexer.web.Util"
4242
}
4343
%><%@
4444
45-
include file="httpheader.jspf"
45+
include file="/httpheader.jspf"
4646
4747
%>
4848
<body>
4949
<div id="page">
5050
<header id="whole_header">
51-
<%@include file="pageheader.jspf" %>
51+
<%@include file="/pageheader.jspf" %>
5252
</header>
5353
<%
5454
{
@@ -81,6 +81,6 @@ include file="httpheader.jspf"
8181
/* ---------------------- error.jsp end --------------------- */
8282
%><%@
8383
84-
include file="foot.jspf"
84+
include file="/foot.jspf"
8585
8686
%>

‎opengrok-web/src/main/webapp/help.jsp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1616
1717
CDDL HEADER END
1818
19-
Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
19+
Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
2020
Portions Copyright 2011 Jens Elkner.
2121
Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
2222
Portions Copyright (c) 2022, Krystof Tulinger <[email protected]>.
@@ -36,7 +36,7 @@ org.opengrok.indexer.web.QueryParameters"
3636
}
3737
%><%@
3838
39-
include file="httpheader.jspf"
39+
include file="/httpheader.jspf"
4040
4141
%>
4242
<body>
@@ -48,7 +48,7 @@ include file="httpheader.jspf"
4848
<div id="sbar">
4949
<div id="menu"><%@
5050
51-
include file="menu.jspf"
51+
include file="/menu.jspf"
5252
5353
%>
5454
</div>
@@ -250,6 +250,6 @@ you can use 'n' for next and 'b' for back to jump over to the next chunk. This i
250250
/* ---------------------- help.jsp end --------------------- */
251251
%><%@
252252
253-
include file="foot.jspf"
253+
include file="/foot.jspf"
254254
255255
%>

‎opengrok-web/src/main/webapp/history.jsp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1818
1919
CDDL HEADER END
2020
21-
Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
21+
Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
2222
Portions Copyright 2011 Jens Elkner.
2323
Portions Copyright (c) 2018-2020, Chris Fraire <[email protected]>.
2424
--%>
@@ -104,7 +104,7 @@ org.opengrok.indexer.web.Util"
104104
%>
105105
<%@
106106
107-
include file="httpheader.jspf"
107+
include file="/httpheader.jspf"
108108
109109
%>
110110
<%
@@ -126,7 +126,7 @@ include file="httpheader.jspf"
126126
{
127127
if (request.getAttribute("history.jsp-hist") != null) {
128128
%>
129-
<%@include file="pageheader.jspf" %>
129+
<%@include file="/pageheader.jspf" %>
130130
<%
131131
}
132132
}
@@ -159,7 +159,7 @@ include file="httpheader.jspf"
159159
%>
160160
<%@
161161
162-
include file="minisearch.jspf"
162+
include file="/minisearch.jspf"
163163
164164
%>
165165
<%
@@ -446,6 +446,6 @@ revisions with strike-through numbers (eg. <del>1.45</del>)</p><%
446446
/* ---------------------- history.jsp end --------------------- */
447447
%><%@
448448
449-
include file="foot.jspf"
449+
include file="/foot.jspf"
450450
451451
%>

‎opengrok-web/src/main/webapp/index.jsp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1616
1717
CDDL HEADER END
1818
19-
Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
19+
Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
2020
Portions Copyright 2011 Jens Elkner.
2121
Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
2222
@@ -30,7 +30,7 @@ Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
3030
}
3131
%><%@
3232
33-
include file="projects.jspf"
33+
include file="/projects.jspf"
3434
3535
%><%
3636
/* ---------------------- index.jsp start --------------------- */
@@ -45,7 +45,7 @@ include file="httpheader.jspf"
4545
%><body>
4646
<div id="page">
4747
<header id="whole_header">
48-
<%@include file="pageheader.jspf" %>
48+
<%@include file="/pageheader.jspf" %>
4949
<div id="Masthead">OpenGrok search</div>
5050
<div id="sbar"><%@
5151
@@ -65,6 +65,6 @@ include file="repos.jspf"
6565
/* ---------------------- index.jsp end --------------------- */
6666
%><%@
6767
68-
include file="foot.jspf"
68+
include file="/foot.jspf"
6969
7070
%>

‎opengrok-web/src/main/webapp/list.jsp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1616
1717
CDDL HEADER END
1818
19-
Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
19+
Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
2020
Portions Copyright 2011 Jens Elkner.
2121
Portions Copyright (c) 2017-2020, Chris Fraire <[email protected]>.
2222
@@ -296,7 +296,7 @@ Click <a href="<%= rawPath %>">download <%= basename %></a><%
296296
%>
297297
<%@
298298
299-
include file="xref.jspf"
299+
include file="/xref.jspf"
300300
301301
%>
302302
<%
@@ -318,7 +318,7 @@ include file="xref.jspf"
318318
%>
319319
<%@
320320
321-
include file="xref.jspf"
321+
include file="/xref.jspf"
322322
323323
%>
324324
<%
@@ -328,6 +328,6 @@ include file="xref.jspf"
328328
/* ---------------------- list.jsp end --------------------- */
329329
%><%@
330330
331-
include file="foot.jspf"
331+
include file="/foot.jspf"
332332
333333
%>

‎opengrok-web/src/main/webapp/mast.jsp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1818
1919
CDDL HEADER END
2020
21-
Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
21+
Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
2222
Portions Copyright 2011 Jens Elkner.
2323
Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
2424
@@ -72,7 +72,7 @@ org.opengrok.indexer.web.Util"%>
7272
%>
7373
<%@
7474
75-
include file="httpheader.jspf"
75+
include file="/httpheader.jspf"
7676
7777
%><body>
7878
<script type="text/javascript">/* <![CDATA[ */
@@ -83,7 +83,7 @@ include file="httpheader.jspf"
8383
/* ]]> */</script>
8484
<div id="page">
8585
<header id="whole_header">
86-
<%@include file="pageheader.jspf" %>
86+
<%@include file="/pageheader.jspf" %>
8787
<div id="Masthead">
8888
<%
8989
{
@@ -119,7 +119,7 @@ include file="httpheader.jspf"
119119
</div>
120120
<%@
121121
122-
include file="minisearch.jspf"
122+
include file="/minisearch.jspf"
123123
124124
%>
125125
<%

‎opengrok-web/src/main/webapp/more.jsp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1818
1919
CDDL HEADER END
2020
21-
Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
21+
Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
2222
Portions Copyright 2011 Jens Elkner.
2323
Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
2424
@@ -43,11 +43,9 @@ org.opengrok.indexer.web.SearchHelper"
4343
PageConfig cfg = PageConfig.get(request);
4444
cfg.checkSourceRootExistence();
4545
}
46-
%><%@include
47-
48-
file="mast.jsp"
49-
50-
%><%
46+
%>
47+
<%@include file="/mast.jsp" %>
48+
<%
5149
/* ---------------------- more.jsp start --------------------- */
5250
{
5351
PageConfig cfg = PageConfig.get(request);
@@ -119,6 +117,6 @@ file="mast.jsp"
119117
/* ---------------------- more.jsp end --------------------- */
120118
%><%@
121119
122-
include file="foot.jspf"
120+
include file="/foot.jspf"
123121
124122
%>

0 commit comments

Comments
 (0)