Author: wesleyhales Date: 2008-10-04 15:39:20 -0400 (Sat, 04 Oct 2008) New Revision: 12035 Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/RepeatRefreshPortlet.java branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml Log: serveResource demo cleanup Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/RepeatRefreshPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/RepeatRefreshPortlet.java 2008-10-03 22:27:18 UTC (rev 12034) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/RepeatRefreshPortlet.java 2008-10-04 19:39:20 UTC (rev 12035) @@ -53,7 +53,7 @@ { String repeatText = req.getParameter("repeat"); - // set zip as render parameter + // set the text from form input if (repeatText != null){ resp.setRenderParameter("repeat", repeatText); } @@ -65,24 +65,11 @@ { ResourceURL resourceURL = resp.createResourceURL(); PortletURL actionURL = resp.createActionURL(); - // -// Element elt = resp.createElement("script"); -// elt.setAttribute("type", "text/javascript"); -// elt.setAttribute("src", resourceURL.toString()); -// elt.appendChild(elt.getOwnerDocument().createTextNode("")); -// resp.addProperty("script", elt); - // - resp.setContentType("text/html"); PrintWriter writer = resp.getWriter(); writer.print("" + "<script type=\"text/javascript\">" + - "" + - // "function init(){\n" + - //" Event.observe('repeat', 'keyup', repeat(), false);\n" + - // "}" + - "" + "function browse(id) {" + "var url = id;\n" + "var pars = 'foo=bar';\n" + @@ -105,9 +92,7 @@ "</div>" + ""); writer.print("<div id=\"repeat-container\"><div id=\"repeat-div\" class='half-width float-left' style='height:50px'></div></div>"); -// "<input type=\"text\" id=\"hidden-input\" value=\"" + resourceURL.toString() + "\" />" + -// "<a href='javascript:" + resp.getNamespace() + "_handle()'>Click me to trigger script</a>" + - writer.print("<br class='clear'/><br class='clear'/><hr/>" + + writer.print("<br class='clear'/><br class='clear'/><hr/>" + "<h4>Partial Refresh Product Catalog</h4>" + "<div class='full-width'>" + ""); @@ -129,10 +114,6 @@ writer.print("<br class='clear'/></div>"); writer.print("<br class='clear'/></div>"); writer.print("<br class='clear'/></div>"); - - - - // writer.print("</div>"); } public void serveResource(ResourceRequest req, ResourceResponse resp) throws PortletException, IOException @@ -141,7 +122,7 @@ String prodId = req.getParameter("prodId"); String namespace =resp.getNamespace(); - //resp.setContentType("application/json"); + resp.setContentType("text/html"); PrintWriter writer = resp.getWriter(); if (repeatText != null){ @@ -173,9 +154,6 @@ } - - - writer.close(); } } Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2008-10-03 22:27:18 UTC (rev 12034) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2008-10-04 19:39:20 UTC (rev 12035) @@ -320,7 +320,7 @@ </window> </page> <page> - <page-name>286 serveResource Demo</page-name> + <page-name>serveResource Demo</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -668,7 +668,7 @@ </window> </page> <page> - <page-name>286 serveResource Demo</page-name> + <page-name>serveResource Demo</page-name> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2008-10-03 22:27:18 UTC (rev 12034) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2008-10-04 19:39:20 UTC (rev 12035) @@ -268,16 +268,16 @@ </portlet-info> </portlet> <portlet> - <description>286 serveResource Demo Portlet</description> + <description>serveResource Demo Portlet</description> <portlet-name>RepeatRefreshPortlet</portlet-name> - <display-name>286 serveResource Demo Portlet</display-name> + <display-name>serveResource Demo Portlet</display-name> <portlet-class>org.jboss.portal.core.samples.basic.RepeatRefreshPortlet</portlet-class> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> </supports> <portlet-info> - <title>286 serveResource Demo Portlet</title> + <title>serveResource Demo Portlet</title> <keywords>sample,test</keywords> </portlet-info> </portlet>