portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r544026 - in /portals/jetspeed-2/trunk: commons/src/java/org/apache/jetspeed/portlet/PortletResourceURLFactoryImpl.java jetspeed-api/src/java/org/apache/jetspeed/PortalReservedParameters.java
Date Mon, 04 Jun 2007 01:02:25 GMT
Author: ate
Date: Sun Jun  3 18:02:24 2007
New Revision: 544026

URL: http://svn.apache.org/viewvc?view=rev&rev=544026
Log:
JS2-728: Improved and simplified PortletResourceURLFactoryImpl implementation now using the
new preliminary Portlet API 2.0 ResourceURL support.
See: https://issues.apache.org/jira/browse/JS2-728 

Also removing no longer needed nav-state reserved parameters again.

Modified:
    portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/portlet/PortletResourceURLFactoryImpl.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/PortalReservedParameters.java

Modified: portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/portlet/PortletResourceURLFactoryImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/portlet/PortletResourceURLFactoryImpl.java?view=diff&rev=544026&r1=544025&r2=544026
==============================================================================
--- portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/portlet/PortletResourceURLFactoryImpl.java
(original)
+++ portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/portlet/PortletResourceURLFactoryImpl.java
Sun Jun  3 18:02:24 2007
@@ -23,10 +23,8 @@
 import javax.portlet.PortletURL;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
 
 import org.apache.jetspeed.PortalReservedParameters;
-import org.apache.jetspeed.om.page.ContentFragment;
 import org.apache.portals.bridges.common.PortletResourceURLFactory;
 
 /**
@@ -48,25 +46,11 @@
             throws PortletException
     {
         PortletURL url = response.createRenderURL();
-        url.setWindowState(WindowState.MAXIMIZED);
         if (parameters != null)
         {
             url.setParameters(parameters);
         }
-        ContentFragment fragment = (ContentFragment)request.getAttribute(PortalReservedParameters.FRAGMENT_ATTRIBUTE);
-        StringBuffer path = new StringBuffer(url.toString());
-        path.append(path.indexOf("?") > -1 ? '&' : '?');
-        path.append(PortalReservedParameters.PIPELINE);
-        path.append('=');
-        path.append(PortalReservedParameters.PORTLET_PIPELINE);
-        path.append('&');
-        path.append(PortalReservedParameters.PORTLET_ENTITY);
-        path.append('=');
-        path.append(fragment.getId());
-        path.append('&');
-        path.append(PortalReservedParameters.NAV_STATE);
-        path.append('=');
-        path.append(PortalReservedParameters.TRANSIENT_NAV_STATE);
-        return path.toString();
+        url.setParameter(PortalReservedParameters.PORTLET_RESOURCE_URL_REQUEST_PARAMETER,
"");
+        return url.toString();
     }
 }

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/PortalReservedParameters.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/PortalReservedParameters.java?view=diff&rev=544026&r1=544025&r2=544026
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/PortalReservedParameters.java
(original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/PortalReservedParameters.java
Sun Jun  3 18:02:24 2007
@@ -33,9 +33,6 @@
     public final static String PORTLET_PIPELINE = "portlet-pipeline";
     public final static String ACTION_PIPELINE = "action-pipeline";
     public final static String LOGIN_PIPELINE = "login-pipeline";
-    public final static String NAV_STATE = "nav-state";
-    public final static String TRANSIENT_NAV_STATE = "transient";
-    public final static String PERSISTENT_NAV_STATE = "persistent";
     
     // Session and Request attribute keys
     public static final String PAGE_ATTRIBUTE = "org.apache.jetspeed.Page";



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message