Author: wesleyhales Date: 2008-10-03 17:52:42 -0400 (Fri, 03 Oct 2008) New Revision: 12032 Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/RepeatRefreshPortlet.java Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 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/jboss-portlet.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet-instances.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml Log: small ui cleanup, try web.xml config for expired view id, copy over 286 serveResource demo and add to ajax examples Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2008-10-03 16:21:07 UTC (rev 12031) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2008-10-03 21:52:42 UTC (rev 12032) @@ -57,7 +57,17 @@ <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> <param-value>false</param-value> </context-param> + + <context-param> + <param-name>com.sun.faces.enableRestoreView11Compatibility</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>com.sun.faces.disableVersionTracking</param-name> + <param-value>true</param-value> + </context-param> + <!-- JSF --> <context-param> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2008-10-03 16:21:07 UTC (rev 12031) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2008-10-03 21:52:42 UTC (rev 12032) @@ -180,7 +180,7 @@ </f:facet> <div style="width:150px"> - <h:commandLinkid="edit-link" action="#{instanceDisplayNameAction.editDisplayName}"> + <h:commandLink id="edit-link" action="#{instanceDisplayNameAction.editDisplayName}"> <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> <f:param name="locale" value="#{value.locale}"/> <f:param name="editAction" value="rename"/> Added: 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 (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/RepeatRefreshPortlet.java 2008-10-03 21:52:42 UTC (rev 12032) @@ -0,0 +1,182 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.core.samples.basic; + +import java.io.IOException; +import java.io.PrintWriter; +import javax.portlet.GenericPortlet; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; +import javax.portlet.PortletException; +import javax.portlet.ResourceRequest; +import javax.portlet.ResourceResponse; +import javax.portlet.ResourceURL; +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.PortletSecurityException; +import javax.portlet.PortletURL; +import javax.portlet.PortletMode; + +/** + * @author <a href="mailto:whales@redhat.com">Wesley Hales</a> + * @version $Revision: 630 $ + */ +public class RepeatRefreshPortlet extends GenericPortlet +{ + public final static int TITANIUM = 0; + public final static int PLATINUM = 1; + public final static int GOLD = 2; + public final static int SILVER = 3; + public final static int TIN = 4; + + public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException + { + + String repeatText = req.getParameter("repeat"); + // set zip as render parameter + if (repeatText != null){ + resp.setRenderParameter("repeat", repeatText); + } + // request view + resp.setPortletMode(PortletMode.VIEW); + + } + public void render(RenderRequest req, RenderResponse resp) throws PortletException, IOException + { + 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" + + "var target = 'output-div';\n" + + "var myAjax = new Ajax.Updater(target, url, {method: 'GET', parameters: pars});" + + "}" + + + "</script>"); + + writer.print("" + + "<div class='full-width' style='padding:5px'>" + + "<h4>Partial Refresh Repeater Demo</h4>"); + writer.print("" + + " <div class='half-width float-left'>" + + " <form method='post' id=\"testrepeatform\" name=\"testrepeatform\" action=\"" + actionURL + "\" onsubmit=\"new Ajax.Updater('repeat-div', '" + resourceURL + "', {asynchronous:true, parameters:Form.serialize(this)}); return false;\">\n" + + " <font class='portlet-font'>Repeat Demo:</font><br/>\n" + + " <input class='portlet-form-input-field' type='text' value='' size='12' name=\"repeat\" id=\"repeat\" onkeyup=\"this.form.submit2.click();new Effect.Highlight(document.getElementById('repeat-div'));\"/>\n" + + " <input class='portlet-form-input-field hidden' type='submit' name='submit2' value='submit' style=\"display:hidden;\">\n" + + " </form>\n" + + "</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/>" + + "<h4>Partial Refresh Product Catalog</h4>" + + "<div class='full-width'>" + + ""); + writer.print("<div class='float-left third-width'>"); + resourceURL.setParameter("prodId","1"); + writer.print("<a href=\"javascript: browse(\'" + resourceURL + "\');\">Product 1</a><br/>"); + + resourceURL.setParameter("prodId","2"); + writer.print("<a href=\"javascript: browse(\'" + resourceURL + "\');\">Product 2</a><br/>"); + + resourceURL.setParameter("prodId","3"); + writer.print("<a href=\"javascript: browse(\'" + resourceURL + "\');\">Product 3</a><br/>"); + + writer.print("<br class='clear'/></div>"); + writer.print("<div class='float-left two-third-width'>" + + "<h4 class='zero'>Product Details</h4>" + + "<div id=\"output-div\"></div>" + + ""); + 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 + { + String repeatText = req.getParameter("repeat"); + String prodId = req.getParameter("prodId"); + + String namespace =resp.getNamespace(); + //resp.setContentType("application/json"); + resp.setContentType("text/html"); + PrintWriter writer = resp.getWriter(); + if (repeatText != null){ + writer.print("<div id=\"repeat-text\">"+ req.getPrivateParameterMap().get("repeat")[0] +"</div>"); + } + if (prodId != null){ + if (prodId.equals("1")){ + writer.print("<div id=\"product-text\">Product ID: "+ prodId +"" + + "<br/>" + + " B BY BURTON ALPHA<br/>" + + "Sale Price: $314.96 " + + "</div>"); + } + if (prodId.equals("2")){ + writer.print("<div id=\"product-text\">Product ID: "+ prodId +"" + + "<br/>" + + "FORUM DESTROYER LTD<br/>" + + "$319.99 " + + "</div>"); + } + if (prodId.equals("3")){ + writer.print("<div id=\"product-text\">Product ID: "+ prodId +"" + + "<br/>" + + "\n" + + "SANTA CRUZ ALLSTAR<br/>" + + "$256.00 " + + "</div>"); + } + + } + + + + + 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 16:21:07 UTC (rev 12031) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2008-10-03 21:52:42 UTC (rev 12032) @@ -320,6 +320,21 @@ </window> </page> <page> + <page-name>286 serveResource Demo</page-name> + <window> + <window-name>CatalogPortletWindow</window-name> + <instance-ref>CatalogPortletInstance</instance-ref> + <region>left</region> + <height>0</height> + </window> + <window> + <window-name>RepeatRefreshPortletWindow</window-name> + <instance-ref>RepeatRefreshPortletInstance</instance-ref> + <region>center</region> + <height>1</height> + </window> + </page> + <page> <page-name>Public parameters test</page-name> <window> <window-name>PublicParametersPortletWindow1</window-name> @@ -653,6 +668,21 @@ </window> </page> <page> + <page-name>286 serveResource Demo</page-name> + <window> + <window-name>CatalogPortletWindow</window-name> + <instance-ref>CatalogPortletInstance</instance-ref> + <region>left</region> + <height>0</height> + </window> + <window> + <window-name>RepeatRefreshPortletWindow</window-name> + <instance-ref>RepeatRefreshPortletInstance</instance-ref> + <region>center</region> + <height>1</height> + </window> + </page> + <page> <page-name>Public parameters test</page-name> <window> <window-name>PublicParametersPortletWindow1</window-name> Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jboss-portlet.xml 2008-10-03 16:21:07 UTC (rev 12031) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jboss-portlet.xml 2008-10-03 21:52:42 UTC (rev 12032) @@ -82,6 +82,12 @@ </ajax> </portlet> <portlet> + <portlet-name>RepeatRefreshPortlet</portlet-name> + <ajax> + <partial-refresh>false</partial-refresh> + </ajax> + </portlet> + <portlet> <portlet-name>AsyncURLPortlet</portlet-name> <ajax> <partial-refresh>true</partial-refresh> Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet-instances.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet-instances.xml 2008-10-03 16:21:07 UTC (rev 12031) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet-instances.xml 2008-10-03 21:52:42 UTC (rev 12032) @@ -69,6 +69,12 @@ </deployment> <deployment> <instance> + <instance-id>RepeatRefreshPortletInstance</instance-id> + <portlet-ref>RepeatRefreshPortlet</portlet-ref> + </instance> + </deployment> + <deployment> + <instance> <instance-id>TestPortletInstance</instance-id> <portlet-ref>TestPortlet</portlet-ref> </instance> 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 16:21:07 UTC (rev 12031) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2008-10-03 21:52:42 UTC (rev 12032) @@ -268,6 +268,20 @@ </portlet-info> </portlet> <portlet> + <description>286 serveResource Demo Portlet</description> + <portlet-name>RepeatRefreshPortlet</portlet-name> + <display-name>286 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> + <keywords>sample,test</keywords> + </portlet-info> + </portlet> + <portlet> <description>Async URL Portlet</description> <portlet-name>AsyncURLPortlet</portlet-name> <display-name>Async URL Portlet</display-name>