You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by cd...@apache.org on 2007/10/27 17:00:50 UTC
svn commit: r589129 - in /portals/pluto/branches/1.1-286-trunk-merge:
pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/
pluto-taglib/src/main/java/org/apache/pluto/tags/
Author: cdoremus
Date: Sat Oct 27 08:00:49 2007
New Revision: 589129
URL: http://svn.apache.org/viewvc?rev=589129&view=rev
Log:
Updates pluto-taglib and pluto-descriptor-api modules to JSR-286 spec Rev 26 from updateToRev26_container_fixes102307.patch in PLUTO-404
Modified:
portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java
portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/java/org/apache/pluto/tags/ActionURLTag.java
portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/java/org/apache/pluto/tags/DefineObjectsTag.java
portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/java/org/apache/pluto/tags/RenderURLTag.java
portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/java/org/apache/pluto/tags/ResourceURLTag.java
Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java?rev=589129&r1=589128&r2=589129&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java Sat Oct 27 08:00:49 2007
@@ -100,6 +100,7 @@
"description", "description1",
"displayName", "displayName1",
"publicRenderParameter",
+ "urlGenerationListener",
"containerRuntimeOption"
})
public class PortletDD {
Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/java/org/apache/pluto/tags/ActionURLTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/java/org/apache/pluto/tags/ActionURLTag.java?rev=589129&r1=589128&r2=589129&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/java/org/apache/pluto/tags/ActionURLTag.java (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/java/org/apache/pluto/tags/ActionURLTag.java Sat Oct 27 08:00:49 2007
@@ -28,6 +28,7 @@
import javax.portlet.PortletResponse;
import javax.portlet.PortletURL;
+import javax.portlet.RenderResponse;
/**
*
@@ -49,7 +50,7 @@
@Override
protected PortletURL createPortletUrl(PortletResponse portletResponse)
{
- return portletResponse.createActionURL();
+ return ((RenderResponse)portletResponse).createActionURL();
}
Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/java/org/apache/pluto/tags/DefineObjectsTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/java/org/apache/pluto/tags/DefineObjectsTag.java?rev=589129&r1=589128&r2=589129&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/java/org/apache/pluto/tags/DefineObjectsTag.java (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/java/org/apache/pluto/tags/DefineObjectsTag.java Sat Oct 27 08:00:49 2007
@@ -145,7 +145,7 @@
PortletSession portletSession=request.getPortletSession(false);
Map<String, Object> portletSessionScope = null;
if(portletSession != null){
- portletSessionScope = (Map<String, Object>)portletSession.getMap();
+ portletSessionScope = (Map<String, Object>)portletSession.getAttributeMap();
}
PortletPreferences portletPreferences = request.getPreferences();
Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/java/org/apache/pluto/tags/RenderURLTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/java/org/apache/pluto/tags/RenderURLTag.java?rev=589129&r1=589128&r2=589129&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/java/org/apache/pluto/tags/RenderURLTag.java (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/java/org/apache/pluto/tags/RenderURLTag.java Sat Oct 27 08:00:49 2007
@@ -19,6 +19,7 @@
import javax.portlet.PortletResponse;
import javax.portlet.PortletURL;
+import javax.portlet.RenderResponse;
/**
@@ -40,7 +41,7 @@
@Override
protected PortletURL createPortletUrl(PortletResponse portletResponse)
{
- return portletResponse.createRenderURL();
+ return ((RenderResponse)portletResponse).createRenderURL();
}
}
Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/java/org/apache/pluto/tags/ResourceURLTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/java/org/apache/pluto/tags/ResourceURLTag.java?rev=589129&r1=589128&r2=589129&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/java/org/apache/pluto/tags/ResourceURLTag.java (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/java/org/apache/pluto/tags/ResourceURLTag.java Sat Oct 27 08:00:49 2007
@@ -21,6 +21,7 @@
import javax.portlet.PortletResponse;
import javax.portlet.PortletSecurityException;
+import javax.portlet.RenderResponse;
import javax.portlet.ResourceURL;
import javax.servlet.http.HttpServletResponse;
@@ -63,7 +64,7 @@
if (portletResponse != null) {
- url = portletResponse.createResourceURL();
+ url = ((RenderResponse)portletResponse).createResourceURL();
if (secure != null) {