[portal-commits] JBoss Portal SVN: r12083 - branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer.
Author: chris.laprun(a)jboss.com
Date: 2008-10-17 09:41:55 -0400 (Fri, 17 Oct 2008)
New Revision: 12083
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RenderHandler.java
Log:
- JBPORTAL-2201: Remove extra separator: rewrite token should be replaced by the namespace
and nothing else!
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RenderHandler.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RenderHandler.java 2008-10-17
13:41:25 UTC (rev 12082)
+++
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/RenderHandler.java 2008-10-17
13:41:55 UTC (rev 12083)
@@ -95,7 +95,7 @@
// process the response
consumer.getSessionHandler().updateSessionIfNeeded(markupResponse.getSessionContext(),
invocation,
- requestPrecursor.getPortletHandle());
+ requestPrecursor.getPortletHandle());
MarkupContext markupContext = markupResponse.getMarkupContext();
String markup = markupContext.getMarkupString();
@@ -103,7 +103,7 @@
if (markup != null && binary != null)
{
return new ErrorResponse(new IllegalArgumentException("Markup response
cannot contain both string and binary " +
- "markup. Per Section 6.1.10 of the WSRP specification, this is a
Producer error."));
+ "markup. Per Section 6.1.10 of the WSRP specification, this is a
Producer error."));
}
if (markup == null && binary == null)
@@ -115,7 +115,7 @@
else
{
return new ErrorResponse(new IllegalArgumentException("Markup response
must contain at least string or binary" +
- " markup. Per Section 6.1.10 of the WSRP specification, this is
a Producer error."));
+ " markup. Per Section 6.1.10 of the WSRP specification, this is a
Producer error."));
}
}
@@ -184,7 +184,7 @@
private String processMarkup(String markup, PortletInvocation invocation, boolean
rewriteURLs)
{
// fix-me: how to deal with fragment header? => interceptor?
- String prefix = getNamespaceFrom(invocation.getWindowContext()) + SEPARATOR;
+ String prefix = getNamespaceFrom(invocation.getWindowContext());
markup = Tools.replace(markup, WSRPRewritingConstants.WSRP_REWRITE_TOKEN, prefix);
@@ -258,11 +258,11 @@
if (urlAsString.startsWith(WSRPRewritingConstants.BEGIN_WSRP_REWRITE))
{
WSRPPortletURL portletURL = WSRPPortletURL.create(urlAsString,
- info.getSupportedCustomModes(),
info.getSupportedCustomWindowStates());
+ info.getSupportedCustomModes(), info.getSupportedCustomWindowStates());
if (portletURL instanceof WSRPResourceURL)
{
log.debug("URL '" + urlAsString + "' seems to refer
to a resource which are not currently supported. " +
- "Trying to use the raw URL but this probably won't
work...");
+ "Trying to use the raw URL but this probably won't
work...");
return portletURL.toString();
}