You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2012/03/06 16:33:44 UTC
svn commit: r1297529 - in /jackrabbit/branches/2.4: ./
jackrabbit-webapp/src/main/webapp/webdav-jcr.jsp
jackrabbit-webapp/src/main/webapp/webdav-remoting.jsp
jackrabbit-webapp/src/main/webapp/webdav-simple.jsp
Author: reschke
Date: Tue Mar 6 15:33:44 2012
New Revision: 1297529
URL: http://svn.apache.org/viewvc?rev=1297529&view=rev
Log:
JCR-3250: webapp welcome page shows incorrect port when port is the default port (ported to 2.4)
Modified:
jackrabbit/branches/2.4/ (props changed)
jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-jcr.jsp
jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-remoting.jsp (contents, props changed)
jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-simple.jsp
Propchange: jackrabbit/branches/2.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 6 15:33:44 2012
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1221447,1221579,1221593,1221789,1221818,1225179,1225191,1225196,1225207,1225525,1225528,1226452,1226472,1226515,1226750,1226863,1227171,1227240,1227590,1227593,1227615,1228058,1228149,1228155,1228160,1230507,1230681,1230688,1231204,1232035,1232100,1232404,1232831,1232920,1232922,1233069,1233344,1233446,1233468,1233471,1234807,1235192,1235375,1235423,1236709,1236775,1236819-1236821,1240053,1245443,1291424
+/jackrabbit/trunk:1221447,1221579,1221593,1221789,1221818,1225179,1225191,1225196,1225207,1225525,1225528,1226452,1226472,1226515,1226750,1226863,1227171,1227240,1227590,1227593,1227615,1228058,1228149,1228155,1228160,1230507,1230681,1230688,1231204,1232035,1232100,1232404,1232831,1232920,1232922,1233069,1233344,1233446,1233468,1233471,1234807,1235192,1235375,1235423,1236709,1236775,1236819-1236821,1240053,1245443,1291424,1297526
Modified: jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-jcr.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-jcr.jsp?rev=1297529&r1=1297528&r2=1297529&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-jcr.jsp (original)
+++ jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-jcr.jsp Tue Mar 6 15:33:44 2012
@@ -19,8 +19,9 @@
request.setAttribute("title", "JCR Remoting Server");
URI uri = new URI(request.getRequestURL().toString());
+int port = uri.getPort();
String href =
- uri.getScheme() + "://" + uri.getHost() + ":" + uri.getPort()
+ uri.getScheme() + "://" + uri.getHost() + (port == -1 ? "" : (":" + port))
+ request.getContextPath()
+ JCRWebdavServerServlet.getPathPrefix(pageContext.getServletContext());
href = Text.encodeIllegalXMLCharacters(href);
Modified: jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-remoting.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-remoting.jsp?rev=1297529&r1=1297528&r2=1297529&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-remoting.jsp (original)
+++ jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-remoting.jsp Tue Mar 6 15:33:44 2012
@@ -21,8 +21,9 @@
request.setAttribute("title", "JCR Remoting Server with Batch Read/Write");
URI uri = new URI(request.getRequestURL().toString());
+int port = uri.getPort();
String href =
- uri.getScheme() + "://" + uri.getHost() + ":" + uri.getPort()
+ uri.getScheme() + "://" + uri.getHost() + (port == -1 ? "" : (":" + port))
+ request.getContextPath()
+ JCRWebdavServerServlet.getPathPrefix(pageContext.getServletContext());
href = Text.encodeIllegalXMLCharacters(href);
Propchange: jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-remoting.jsp
('svn:keywords' removed)
Modified: jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-simple.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-simple.jsp?rev=1297529&r1=1297528&r2=1297529&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-simple.jsp (original)
+++ jackrabbit/branches/2.4/jackrabbit-webapp/src/main/webapp/webdav-simple.jsp Tue Mar 6 15:33:44 2012
@@ -19,8 +19,9 @@
request.setAttribute("title", "Standard WebDAV Server");
URI uri = new URI(request.getRequestURL().toString());
+int port = uri.getPort();
String href =
- uri.getScheme() + "://" + uri.getHost() + ":" + uri.getPort()
+ uri.getScheme() + "://" + uri.getHost() + (port == -1 ? "" : (":" + port))
+ request.getContextPath()
+ SimpleWebdavServlet.getPathPrefix(pageContext.getServletContext())
+ "/default/";