Skip to content

Commit 9113978

Browse files
author
Vladimir Kotal
committed
Merge pull request #708 from vladak/download
differentiate between raw and download
2 parents 46e7c42 + d837150 commit 9113978

File tree

12 files changed

+52
-26
lines changed

12 files changed

+52
-26
lines changed

‎opengrok-web-nbproject/nbproject/project.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dist.javadoc.dir=${dist.dir}/javadoc
2525
dist.war=${dist.dir}/${war.name}
2626
endorsed.classpath=
2727
excludes=
28-
j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.2.2.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat7-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar
28+
j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.2.1.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-util.jar
2929
lucene.version=4.6.0
3030
lucene-core.jar=lucene-core-${lucene.version}.jar
3131
lucene-analyzers-common.jar=lucene-analyzers-common-${lucene.version}.jar

‎src/org/opensolaris/opengrok/search/Results.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public static void prettyPrint(Writer out, SearchHelper sh, int start,
144144
String morePrefix = sh.contextPath + Prefix.MORE_P;
145145
String xrefPrefixE = ctxE + Prefix.XREF_P;
146146
String histPrefixE = ctxE + Prefix.HIST_L;
147-
String rawPrefixE = ctxE + Prefix.RAW_P;
147+
String downloadPrefixE = ctxE + Prefix.DOWNLOAD_P;
148148
File xrefDataDir = new File(sh.dataRoot, Prefix.XREF_P.toString());
149149

150150
for (Map.Entry<String, ArrayList<Document>> entry :
@@ -172,7 +172,7 @@ public static void prettyPrint(Writer out, SearchHelper sh, int start,
172172
out.write(xrefPrefixE);
173173
out.write(rpathE);
174174
out.write("?a=true\" title=\"Annotate\">A</a> <a href=\"");
175-
out.write(rawPrefixE);
175+
out.write(downloadPrefixE);
176176
out.write(rpathE);
177177
out.write("\" title=\"Download\">D</a>");
178178
out.write("</td>");

‎src/org/opensolaris/opengrok/web/PageConfig.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,9 @@ public String canProcess() {
311311
&& !getRequestedRevision().isEmpty() && !hasHistory()) {
312312
return null;
313313
}
314-
} else if (getPrefix() == Prefix.RAW_P) {
315-
return null;
314+
} else if ((getPrefix() == Prefix.RAW_P) ||
315+
(getPrefix() == Prefix.DOWNLOAD_P)) {
316+
return null;
316317
}
317318
}
318319
return redir == null ? "" : redir;

‎src/org/opensolaris/opengrok/web/Prefix.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ public enum Prefix {
6060
/** RSS XML Feed of latest changes (link prefix) */
6161
RSS_P("/rss"),
6262
/** Download file (link prefix) */
63+
DOWNLOAD_P("/download"),
64+
/** Raw file display (link prefix) */
6365
RAW_P("/raw"),
6466
/** full blown search from main page or top bar (link prefix) */
6567
SEARCH_P("/search"),

‎web/WEB-INF/web.xml‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@
4141
<jsp-file>/list.jsp</jsp-file>
4242
<init-param>
4343
<param-name>keepgenerated</param-name><param-value>true</param-value>
44-
</init-param>
44+
</init-param>
4545
</servlet>
4646
<servlet>
4747
<servlet-name>diff</servlet-name>
4848
<display-name>Source diffs between revisions</display-name>
4949
<jsp-file>/diff.jsp</jsp-file>
5050
<init-param>
5151
<param-name>keepgenerated</param-name><param-value>true</param-value>
52-
</init-param>
52+
</init-param>
5353
</servlet>
5454
<servlet>
5555
<servlet-name>more</servlet-name>
@@ -62,23 +62,31 @@
6262
<jsp-file>/rss.jsp</jsp-file>
6363
<init-param>
6464
<param-name>keepgenerated</param-name><param-value>true</param-value>
65-
</init-param>
65+
</init-param>
6666
</servlet>
6767
<servlet>
6868
<servlet-name>opensearch</servlet-name>
6969
<display-name>OpenSearch link for current project</display-name>
7070
<jsp-file>/opensearch.jsp</jsp-file>
7171
<init-param>
7272
<param-name>keepgenerated</param-name><param-value>true</param-value>
73-
</init-param>
73+
</init-param>
7474
</servlet>
7575
<servlet>
7676
<servlet-name>raw</servlet-name>
7777
<display-name>Raw Source lister</display-name>
7878
<jsp-file>/raw.jsp</jsp-file>
7979
<init-param>
8080
<param-name>keepgenerated</param-name><param-value>true</param-value>
81-
</init-param>
81+
</init-param>
82+
</servlet>
83+
<servlet>
84+
<servlet-name>download</servlet-name>
85+
<display-name>Download source</display-name>
86+
<jsp-file>/raw.jsp</jsp-file>
87+
<init-param>
88+
<param-name>keepgenerated</param-name><param-value>true</param-value>
89+
</init-param>
8290
</servlet>
8391
<servlet>
8492
<servlet-name>error</servlet-name>
@@ -116,6 +124,10 @@
116124
<servlet-name>raw</servlet-name>
117125
<url-pattern>/raw/*</url-pattern> <!-- RAW_P -->
118126
</servlet-mapping>
127+
<servlet-mapping>
128+
<servlet-name>download</servlet-name>
129+
<url-pattern>/download/*</url-pattern> <!-- DOWNLOAD_P -->
130+
</servlet-mapping>
119131
<servlet-mapping>
120132
<servlet-name>search</servlet-name>
121133
<url-pattern>/s</url-pattern> <!-- SEARCH_R -->

‎web/default/style.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ label {
194194
display: inline-block;
195195
}
196196

197-
#history::before, #bar .annotate::before, #line::before, #defbox::before, #download::before {
197+
#history::before, #bar .annotate::before, #line::before, #defbox::before, #download::before, #raw::before {
198198
content: "|";
199199
padding: 0.5ex;
200200
color: black;

‎web/diff.jsp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ include file="mast.jsp"
6868
6969
} else if (data.genre == Genre.IMAGE) {
7070
71-
String link = request.getContextPath() + Prefix.RAW_P
71+
String link = request.getContextPath() + Prefix.DOWNLOAD_P
7272
+ Util.htmlize(cfg.getPath());
7373
%>
7474
<div id="difftable">
@@ -88,7 +88,7 @@ include file="mast.jsp"
8888
8989
} else if (data.genre != Genre.PLAIN && data.genre != Genre.HTML) {
9090
91-
String link = request.getContextPath() + Prefix.RAW_P
91+
String link = request.getContextPath() + Prefix.DOWNLOAD_P
9292
+ Util.htmlize(cfg.getPath());
9393
%>
9494
<div id="src">Diffs for binary files cannot be displayed! Files are <a
@@ -488,4 +488,4 @@ include file="mast.jsp"
488488
489489
include file="foot.jspf"
490490
491-
%>
491+
%>

‎web/list.jsp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ document.pageReady.push(function() { pageReadyList();});
7777
File resourceFile = cfg.getResourceFile();
7878
String path = cfg.getPath();
7979
String basename = resourceFile.getName();
80-
String rawPath = request.getContextPath() + Prefix.RAW_P + path;
80+
String rawPath = request.getContextPath() + Prefix.DOWNLOAD_P + path;
8181
Reader r = null;
8282
if (cfg.isDir()) {
8383
// valid resource is requested
@@ -273,4 +273,4 @@ Click <a href="<%= rawPath %>">download <%= basename %></a><%
273273
274274
include file="foot.jspf"
275275
276-
%>
276+
%>

‎web/mast.jsp‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,14 @@ include file="pageheader.jspf"
137137
title="Show or hide symbol list."><%--
138138
--%><span id="defbox"></span>Navigate</a></li><%
139139
}
140-
%><li><a href="<%= context + Prefix.RAW_P + uriEncodedPath
140+
%>
141+
<li><a href="<%= context + Prefix.RAW_P + uriEncodedPath
141142
+ (rev.length() == 0 ? "" : "?") + rev
142-
%>"><span id="download"></span>Download</a></li><%
143+
%>"><span id="raw"></span>Raw</a></li>
144+
<li><a href="<%= context + Prefix.DOWNLOAD_P + uriEncodedPath
145+
+ (rev.length() == 0 ? "" : "?") + rev
146+
%>"><span id="download"></span>Download</a></li>
147+
<%
143148
}
144149
%><li><input type="text" id="search" name="q" class="q" />
145150
<input type="submit" value="Search" class="submit" /></li><%

‎web/offwhite/style.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ label {
198198
margin-right: 0;
199199
}
200200

201-
#home, #history, #download { /* menu item icons */
201+
#home, #history, #download, #raw { /* menu item icons */
202202
display: inline-block;
203203
width: 18px;
204204
height: 18px;
@@ -216,7 +216,7 @@ label {
216216
background-position: -18px 0;
217217
}
218218

219-
#download { /* w.gif */
219+
#download, #raw { /* w.gif */
220220
background-position: -36px 0;
221221
}
222222

0 commit comments

Comments
 (0)