[portal-commits] JBoss Portal SVN: r6241 - in trunk: wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer and 1 other directory.
Author: chris.laprun(a)jboss.com
Date: 2007-02-12 22:37:46 -0500 (Mon, 12 Feb 2007)
New Revision: 6241
Modified:
trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java
Log:
- Reverted changes that somehow got lost...
- Fixed test case.
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java
===================================================================
---
trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java 2007-02-13
02:10:52 UTC (rev 6240)
+++
trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java 2007-02-13
03:37:46 UTC (rev 6241)
@@ -38,16 +38,12 @@
public class PortletUtils
{
public static final String PREFIX = "jbpns";
- public static final String SUFFIX = "snjbp";
+ public static final String SUFFIX = "snpbj";
/**
- * Check that provided map follow the constraints :
- * <ul>
- * <li>Not null</li>
- * <li>Keys are non null string</li>
- * <li>Values are non null string arrays</li>
- * </ul>
- * If a constraint is not respected then an IllegalArgumentException is thrown.
+ * Check that provided map follow the constraints : <ul> <li>Not
null</li> <li>Keys are non null string</li>
+ * <li>Values are non null string arrays</li> </ul> If a constraint
is not respected then an IllegalArgumentException
+ * is thrown.
*
* @param map the map to check
* @throws IllegalArgumentException
@@ -192,7 +188,7 @@
{
StringBuffer tmp = new StringBuffer(PREFIX.length() + windowId.length() * 2);
tmp.append(PREFIX);
- for (int i = 0;i < windowId.length();i++)
+ for (int i = 0; i < windowId.length(); i++)
{
char c = windowId.charAt(i);
if (Character.isLetterOrDigit(c))
@@ -206,6 +202,7 @@
tmp.append(Character.forDigit((((int)c) & 0X0F), 16));
}
}
+ tmp.append(SUFFIX);
return tmp.toString();
}
}
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java
===================================================================
---
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java 2007-02-13
02:10:52 UTC (rev 6240)
+++
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java 2007-02-13
03:37:46 UTC (rev 6241)
@@ -113,7 +113,7 @@
MarkupResponse response = markupService.getMarkup(getMarkup);
checkMarkupResponse(response, "<form method='post'
action='wsrp_rewrite?wsrp-urlType=blockingAction&wsrp" +
- "-interactionState=JBPNS_/wsrp_rewrite'
id='jbpns_2ftest_2dmarkup_2dportlet_2eMarkup_20Test_20PortletportfolioManager'><table><tr><td>Stock
symbol</t" +
+ "-interactionState=JBPNS_/wsrp_rewrite'
id='wsrp_rewrite_portfolioManager'><table><tr><td>Stock
symbol</t" +
"d><td><input
name='symbol'/></td></tr><tr><td><input
type='submit'
value='Submit'></td></tr></table></form>");
}