[portal-commits] JBoss Portal SVN: r12463 - in branches/JBoss_Portal_Branch_2_7: core/src/main/org/jboss/portal/core/controller/portlet and 1 other directory.
Author: chris.laprun(a)jboss.com
Date: 2009-01-10 09:18:39 -0500 (Sat, 10 Jan 2009)
New Revision: 12463
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java
Log:
- JBPORTAL-2273: Deal with opaque navigational state.
- Use portlet trunk-SNAPSHOT.
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2009-01-10 14:05:00 UTC
(rev 12462)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2009-01-10 14:18:39 UTC
(rev 12463)
@@ -44,7 +44,7 @@
<componentref name="jboss-portal/modules/common"
version="trunk-SNAPSHOT"/>
<componentref name="jboss-portal/modules/web"
version="1.2.2"/>
<componentref name="jboss-portal/modules/test"
version="1.0.3"/>
- <componentref name="jboss-portal/modules/portlet"
version="2.0.4"/>
+ <componentref name="jboss-portal/modules/portlet"
version="trunk-SNAPSHOT"/>
<componentref name="jboss-portal/modules/identity"
version="1.0-SNAPSHOT"/>
<componentref name="jboss-portal/modules/cms"
version="1.2.2"/>
<componentref name="antlr" version="2.7.6-brew"/>
@@ -58,7 +58,7 @@
<componentref name="apache-httpclient" version="3.0.1"/>
<componentref name="apache-lang" version="2.1"/>
<componentref name="apache-log4j"
version="1.2.14-brew"/>
- <componentref name="apache-logging"
version="1.0.5.SP1-jboss"/>
+ <componentref name="apache-logging"
version="1.0.5.SP1-jboss"/>
<componentref name="apache-lucene" version="2.2.0"/>
<componentref name="apache-net" version="1.4.1"/>
<componentref name="apache-xerces"
version="2.7.1-brew"/>
@@ -124,7 +124,7 @@
<componentref name="org/jboss/cluster/hibernate-jbc-cacheprovider"
version="1.0.0.GA"/>
</build>
- <synchronizeinfo/>
+ <synchronizeinfo/>
<target name="generate-lib-file"
description="generate libraries.ent and thirdparty license info"
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java 2009-01-10
14:05:00 UTC (rev 12462)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java 2009-01-10
14:18:39 UTC (rev 12463)
@@ -41,6 +41,7 @@
import org.jboss.portal.portlet.NoSuchPortletException;
import org.jboss.portal.portlet.ParametersStateString;
import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.StateString;
import org.jboss.portal.portlet.info.ParameterInfo;
import org.jboss.portal.portlet.invocation.response.ContentResponse;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
@@ -83,9 +84,18 @@
//
WindowState windowState = renderResult.getWindowState();
- ParametersStateString state =
(ParametersStateString)renderResult.getNavigationalState();
+ StateString state = renderResult.getNavigationalState();
- Map<String, String[]> parameters = new HashMap<String,
String[]>(state.getParameters());
+ Map<String, String[]> stringMap;
+ if (state instanceof ParametersStateString)
+ {
+ stringMap = ((ParametersStateString)state).getParameters();
+ }
+ else
+ {
+ stringMap = StateString.decodeOpaqueValue(state.getStringValue());
+ }
+ Map<String, String[]> parameters = new HashMap<String,
String[]>(stringMap);
if (pns != null)
{