Author: chris.laprun(a)jboss.com Date: 2010-09-16 11:21:53 -0400 (Thu, 16 Sep 2010) New Revision: 4227 Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/MimeResponseProcessor.java components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java Log: - Fixed trailing _ in namespaces (adapted test cases). Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/MimeResponseProcessor.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/MimeResponseProcessor.java 2010-09-16 10:58:53 UTC (rev 4226) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/MimeResponseProcessor.java 2010-09-16 15:21:53 UTC (rev 4227) @@ -57,7 +57,7 @@ */ protected String processFragmentString(String renderString) { - String result = renderString.replaceAll(namespace, WSRPRewritingConstants.WSRP_REWRITE_TOKEN); + String result = renderString.replaceAll(namespace, WSRPRewritingConstants.WSRP_REWRITE); result = URLTools.replaceURLsBy(result, new WSRPUtils.AbsoluteURLReplacementGenerator(ServletAccess.getRequest())); return result; Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java 2010-09-16 10:58:53 UTC (rev 4226) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java 2010-09-16 15:21:53 UTC (rev 4227) @@ -168,7 +168,7 @@ V1MarkupResponse response = producer.getMarkup(getMarkup); checkMarkupResponse(response, "<form method='post' action='wsrp_rewrite?wsrp-urlType=blockingAction&wsrp" + - "-interactionState=JBPNS_/wsrp_rewrite' id='wsrp_rewrite_portfolioManager'><table><tr><td>Stock symbol</t" + + "-interactionState=JBPNS_/wsrp_rewrite' id='wsrp_rewriteportfolioManager'><table><tr><td>Stock symbol</t" + "d><td><input name='symbol'/></td></tr><tr><td><input type='submit' value='Submit'></td></tr></table></form>"); } Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java 2010-09-16 10:58:53 UTC (rev 4226) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java 2010-09-16 15:21:53 UTC (rev 4227) @@ -175,7 +175,7 @@ MarkupResponse response = producer.getMarkup(getMarkup); checkMarkupResponse(response, "<form method='post' action='wsrp_rewrite?wsrp-urlType=blockingAction&wsrp" + - "-interactionState=JBPNS_/wsrp_rewrite' id='wsrp_rewrite_portfolioManager'><table><tr><td>Stock symbol</t" + + "-interactionState=JBPNS_/wsrp_rewrite' id='wsrp_rewriteportfolioManager'><table><tr><td>Stock symbol</t" + "d><td><input name='symbol'/></td></tr><tr><td><input type='submit' value='Submit'></td></tr></table></form>"); } @@ -896,15 +896,15 @@ try { GetMarkup getMarkup = createMarkupRequest(); - + getMarkup.getMarkupParams().setMode(WSRPConstants.EDIT_MODE); MarkupResponse responseEdit = producer.getMarkup(getMarkup); checkMarkupResponse(responseEdit, "This is EDIT MODE.", false, true); - + getMarkup.getMarkupParams().setMode(WSRPConstants.VIEW_MODE); MarkupResponse responseView = producer.getMarkup(getMarkup); checkMarkupResponse(responseView, "This is VIEW MODE.", false, true); - + getMarkup.getMarkupParams().setMode(WSRPConstants.HELP_MODE); MarkupResponse responseHelp = producer.getMarkup(getMarkup); checkMarkupResponse(responseHelp, "This is HELP MODE.", false, true); @@ -914,7 +914,7 @@ undeploy(archive); } } - + @Test public void testGetMarkupWithCustomPortletMode() throws Exception {