jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r1297526 - in /jackrabbit/trunk/jackrabbit-webapp/src/main/webapp: webdav-jcr.jsp webdav-remoting.jsp webdav-simple.jsp
Date Tue, 06 Mar 2012 15:30:57 GMT
Author: reschke
Date: Tue Mar  6 15:30:57 2012
New Revision: 1297526

URL: http://svn.apache.org/viewvc?rev=1297526&view=rev
Log:
JCR-3250: webapp welcome page shows incorrect port when port is the default port

Modified:
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/webdav-jcr.jsp
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/webdav-remoting.jsp   (contents, props
changed)
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/webdav-simple.jsp

Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/webdav-jcr.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/webdav-jcr.jsp?rev=1297526&r1=1297525&r2=1297526&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/webdav-jcr.jsp (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/webdav-jcr.jsp Tue Mar  6 15:30:57
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/trunk/jackrabbit-webapp/src/main/webapp/webdav-remoting.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/webdav-remoting.jsp?rev=1297526&r1=1297525&r2=1297526&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/webdav-remoting.jsp (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/webdav-remoting.jsp Tue Mar  6 15:30:57
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/trunk/jackrabbit-webapp/src/main/webapp/webdav-remoting.jsp
            ('svn:keywords' removed)

Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/webdav-simple.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/webdav-simple.jsp?rev=1297526&r1=1297525&r2=1297526&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/webdav-simple.jsp (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/webdav-simple.jsp Tue Mar  6 15:30:57
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/";



Mime
View raw message