svn commit: r1648470 - in /portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl: PathInfoEncodingPortalURL.java QueryStringEncodingPortalURL.java

Author: taylor
Date: Tue Dec 30 02:35:50 2014
New Revision: 1648470

URL: http://svn.apache.org/r1648470
Log:
JS2-1311: keeping all links secure based on portal url

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/PathInfoEncodingPortalURL.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/QueryStringEncodingPortalURL.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/PathInfoEncodingPortalURL.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/PathInfoEncodingPortalURL.java?rev=1648470&r1=1648469&r2=1648470&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/PathInfoEncodingPortalURL.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/PathInfoEncodingPortalURL.java Tue Dec 30 02:35:50 2014
@@ -16,14 +16,13 @@
  */
 package org.apache.jetspeed.container.url.impl;
 
-import java.util.StringTokenizer;
-
-import javax.servlet.http.HttpServletRequest;
-
 import org.apache.jetspeed.PortalContext;
 import org.apache.jetspeed.container.state.NavigationalState;
 import org.apache.jetspeed.container.url.BasePortalURL;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.StringTokenizer;
+
 /**
  * PathInfoEncodingPortalURL encodes the NavigationalState as PathInfo element
  * *
@@ -101,7 +100,7 @@ public class PathInfoEncodingPortalURL e
 
     protected String createPortletURL(String encodedNavState, boolean secure)
     {
-        StringBuffer buffer = new StringBuffer(getBaseURL(secure));
+        StringBuffer buffer = new StringBuffer(getBaseURL(base.isSecure()));
         buffer.append(getBasePath());
         if ( encodedNavState != null )
         {

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/QueryStringEncodingPortalURL.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/QueryStringEncodingPortalURL.java?rev=1648470&r1=1648469&r2=1648470&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/QueryStringEncodingPortalURL.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/QueryStringEncodingPortalURL.java Tue Dec 30 02:35:50 2014
@@ -16,12 +16,12 @@
  */
 package org.apache.jetspeed.container.url.impl;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.apache.jetspeed.PortalContext;
 import org.apache.jetspeed.container.state.NavigationalState;
 import org.apache.jetspeed.container.url.BasePortalURL;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * QueryStringEncodingPortalURL encodes the NavigationalState as query parameter
  * *
@@ -68,7 +68,7 @@ public class QueryStringEncodingPortalUR
     
     protected String createPortletURL(String encodedNavigationalState, boolean secure)
     {
-        StringBuffer buffer = new StringBuffer(getBaseURL(secure));
+        StringBuffer buffer = new StringBuffer(getBaseURL(base.isSecure()));
         buffer.append(getBasePath());
         if ( getPath() != null )
         {