Author: ate
Date: Fri Mar 27 18:05:08 2009
New Revision: 759292
URL: http://svn.apache.org/viewvc?rev=759292&view=rev
Log:
Fixing all but one last failing Portlet 2.0 TCK test ...
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/providers/PortletURLProviderImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/AbstractNavigationalState.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowRequestNavigationalState.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/providers/PortletURLProviderImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/providers/PortletURLProviderImpl.java?rev=759292&r1=759291&r2=759292&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/providers/PortletURLProviderImpl.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/providers/PortletURLProviderImpl.java
Fri Mar 27 18:05:08 2009
@@ -197,7 +197,7 @@
renderParms = new HashMap<String,String[]>();
for (Map.Entry<String,String[]> entry :
renderParameters.entrySet())
{
- if (publicRenderParameters == null ||
!publicRenderParameters.containsKey(entry.getKey()))
+ if (!publicRenderParameters.containsKey(entry.getKey()))
{
renderParms.put(entry.getKey(), entry.getValue());
}
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/AbstractNavigationalState.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/AbstractNavigationalState.java?rev=759292&r1=759291&r2=759292&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/AbstractNavigationalState.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/AbstractNavigationalState.java
Fri Mar 27 18:05:08 2009
@@ -85,6 +85,7 @@
}
else
{
+
entry.getValue().setPortletDefinition(window.getPortletDefinition());
if (requestStates.getTargetWindowId() != null &&
entry.getKey().equals(requestStates.getTargetWindowId()))
{
if (PortalURL.URLType.ACTION == requestStates.getURLType())
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java?rev=759292&r1=759291&r2=759292&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java
Fri Mar 27 18:05:08 2009
@@ -279,6 +279,7 @@
states.addPortletWindowNavigationalState(windowId, currentState);
}
PortletWindowRequestNavigationalState targetState = new
PortletWindowRequestNavigationalState(windowId);
+ targetState.setPortletDefinition(currentState.getPortletDefinition());
targetState.setPortletMode(portletMode != null ? portletMode :
currentState.getPortletMode());
targetState.setWindowState(windowState != null ? windowState :
currentState.getWindowState());
targetState.setParametersMap(parameters);
@@ -291,7 +292,7 @@
targetState.setCacheLevel(cacheLevel);
targetState.setResourceId(resourceId);
targetState.setPrivateRenderParametersMap(privateRenderParameters);
- targetState.setPublicRenderParametersMap(publicRenderParameters);
+ targetState.setTargetPublicRenderParametersMap(publicRenderParameters);
if ( renderParamsStateFull && parameters == null )
{
// Indicate that the saved (in the session) render parameters for
this PortletWindow must be cleared
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowRequestNavigationalState.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowRequestNavigationalState.java?rev=759292&r1=759291&r2=759292&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowRequestNavigationalState.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowRequestNavigationalState.java
Fri Mar 27 18:05:08 2009
@@ -41,7 +41,7 @@
private String cacheLevel;
private String resourceId;
private Map<String, String[]> privateRenderParametersMap;
- private Map<String, String[]> targetPublicRenderParmaetersMap;
+ private Map<String, String[]> targetPublicRenderParametersMap;
private Map<String, String[]> publicRenderParametersMap;
private Map<QName, String> qnameToIdentifierMap;
private Map<String, QName> identifierToQNameMap;
@@ -91,7 +91,7 @@
public void resolvePublicRenderParametersMapping()
{
- if (pd != null && qnameToIdentifierMap != null)
+ if (pd != null && qnameToIdentifierMap == null)
{
qnameToIdentifierMap = new HashMap<QName, String>();
identifierToQNameMap = new HashMap<String, QName>();
@@ -114,17 +114,20 @@
public Map<QName, String> getPublicRenderParametersQNameToIdentifierMap()
{
+ resolvePublicRenderParametersMapping();
return qnameToIdentifierMap;
}
public QName getPublicRenderParameterQNameByIdentifier(String identifier)
{
- return identifierToQNameMap != null ?
identifierToQNameMap.get(identifier) : null;
+ resolvePublicRenderParametersMapping();
+ return identifierToQNameMap.get(identifier);
}
public String getPublicRenderParameterIdentifierByQName(QName qname)
{
- return qnameToIdentifierMap != null ? qnameToIdentifierMap.get(qname)
: null;
+ resolvePublicRenderParametersMapping();
+ return qnameToIdentifierMap.get(qname);
}
public String getCacheLevel()
@@ -178,6 +181,10 @@
public void setPublicRenderParameters(String name, String[] values)
{
+ if (publicRenderParametersMap == null)
+ {
+ publicRenderParametersMap = new HashMap<String,String[]>();
+ }
publicRenderParametersMap.put(name, values);
}
@@ -188,12 +195,16 @@
public Map<String, String[]> getTargetPublicRenderParametersMap()
{
- return this.targetPublicRenderParmaetersMap;
+ if (targetPublicRenderParametersMap == null)
+ {
+ targetPublicRenderParametersMap = new HashMap<String, String[]>();
+ }
+ return this.targetPublicRenderParametersMap;
}
public void setTargetPublicRenderParametersMap(Map<String, String[]> map)
{
- this.targetPublicRenderParmaetersMap = map;
+ this.targetPublicRenderParametersMap = map;
}
public boolean isClearParameters()
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java?rev=759292&r1=759291&r2=759292&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java
Fri Mar 27 18:05:08 2009
@@ -294,9 +294,11 @@
requestState =
requestStates.getPortletWindowNavigationalState(windowId);
if ( requestState == null )
{
- if (context.resolvePortletWindow(windowId) != null)
+ PortletWindow window =
context.resolvePortletWindow(windowId);
+ if (window != null)
{
requestState = new
PortletWindowRequestNavigationalState(windowId);
+
requestState.setPortletDefinition(window.getPortletDefinition());
sessionState = pageState.windowStates.get(windowId);
requestState.setActionScopedRequestAttributes(sessionState.isActionScopedRequestAttributes());
requestStates.addPortletWindowNavigationalState(windowId, requestState);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
