June 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r7541 - in trunk: widget/src/resources/widget-war/WEB-INF/jsp and 1 other directory.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-06-25 19:40:29 -0400 (Mon, 25 Jun 2007) New Revision: 7541 Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp Log: improved a bit usability of widgets and clear content selection on content type change Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2007-06-25 22:51:04 UTC (rev 7540) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2007-06-25 23:40:29 UTC (rev 7541) @@ -106,7 +106,7 @@ public Page page; /** . */ - public ContentType selectedContentType; + private ContentType selectedContentType; /** . */ public DynamicMap assignedWindows = new DynamicMap(); @@ -141,6 +141,19 @@ return types; } + public ContentType getSelectedContentType() + { + return selectedContentType; + } + + public void setSelectedContentType(ContentType selectedContentType) + { + this.selectedContentType = selectedContentType; + this.selectedContentURI = null; + this.selectedContentParameters = null; + this.selectedRenderParameters = new HashMap(); + } + public String getSelectedEditorPortletId() { if (selectedContentType != null) Modified: trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp 2007-06-25 22:51:04 UTC (rev 7540) +++ trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp 2007-06-25 23:40:29 UTC (rev 7541) @@ -8,6 +8,7 @@ <%@ page import="org.jboss.portal.widget.google.provider.GGQuery" %> <%@ page import="org.jboss.portal.widget.google.type.EnumType" %> <%@ page import="javax.portlet.PortletURL" %> +<%@ page import="org.jboss.portal.common.util.IteratorStatus" %> <%@ page language="java"%> <%@ taglib uri="http://java.sun.com/portlet" prefix="p" %> <%@ page isELIgnored="false" %> @@ -65,8 +66,46 @@ <input type="submit" value="Search Gadgets" class="portlet-form-button"/> </form> +<p> +<table style="width:100%;border:1px solid" cellspacing="0" cellpadding="0"> + <% + for (IteratorStatus i = new IteratorStatus(result.getWidgetIterator()); i.hasNext();) + { + GGWidget widget = (GGWidget)i.next(); + boolean selected = selWidget != null && selWidget.getId().equals(widget.getId()); + PortletURL selectURL = renderResponse.createActionURL(); + + // Set parameters for selection + selectURL.setParameter("content.action.select", "content.action.select"); + selectURL.setParameter("content.uri", widget.getId()); + + // Set default parametrization state + for (Iterator j = widget.getPreferencesInfo().getPreferencesInfo().iterator(); j.hasNext();) + { + GGPreferenceInfo prefInfo = (GGPreferenceInfo)j.next(); + String paramName = "content.param." + prefInfo.getName(); + String defaultValue = prefInfo.getDefaultValue() != null ? prefInfo.getDefaultValue() : ""; + selectURL.setParameter(paramName, defaultValue); + } + + // Propagage search nav state + selectURL.setParameter("cat", catTerm); + selectURL.setParameter("query", queryTerm); + + // + String rowClass = selected ? "portlet-section-selected" : (i.getIndex() % 2 == 0 ? "portlet-section-body" : "portlet-section-alternate"); + %> + <tr class="<%= rowClass %>"> + <td><a href="<%= selectURL %>"><%= widget.getTitle().getDefaultString() %></a></td> + </tr> + <% + } + %> +</table> +</p> + <% - if (selWidget != null) + if (selWidget != null && !selWidget.getPreferencesInfo().getPreferencesInfo().isEmpty()) { PortletURL selectURL = renderResponse.createActionURL(); @@ -78,7 +117,6 @@ selectURL.setParameter("cat", catTerm); selectURL.setParameter("query", queryTerm); %> -<p>You have selected the widget <%= selWidget.getTitle().getDefaultString() %></p> <p> <form action="<%= selectURL %>" method="post"> <% @@ -157,36 +195,6 @@ <% } %> - -<ul> - <% - for (Iterator i = result.getWidgetIterator(); i.hasNext();) - { - GGWidget widget = (GGWidget)i.next(); - PortletURL selectURL = renderResponse.createActionURL(); - - // Set parameters for selection - selectURL.setParameter("content.action.select", "content.action.select"); - selectURL.setParameter("content.uri", widget.getId()); - - // Set default parametrization state - for (Iterator j = widget.getPreferencesInfo().getPreferencesInfo().iterator();j.hasNext();) - { - GGPreferenceInfo prefInfo = (GGPreferenceInfo)j.next(); - String paramName = "content.param." + prefInfo.getName(); - String defaultValue = prefInfo.getDefaultValue() != null ? prefInfo.getDefaultValue() : ""; - selectURL.setParameter(paramName, defaultValue); - } - - // Propagage search nav state - selectURL.setParameter("cat", catTerm); - selectURL.setParameter("query", queryTerm); - %> - <li><a href="<%= selectURL %>"><%= widget.getTitle().getDefaultString() %></a></li> - <% - } - %> -</ul> - + </div> \ No newline at end of file

18 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r7540 - in trunk: core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common and 2 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-06-25 18:51:04 -0400 (Mon, 25 Jun 2007) New Revision: 7540 Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml trunk/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp Log: improve nav state management of the widget selection during the workflow Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2007-06-25 21:15:19 UTC (rev 7539) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2007-06-25 22:51:04 UTC (rev 7540) @@ -93,6 +93,7 @@ this.layoutService = layoutService; this.portletInvoker = portletInvoker; this.selectedContentType = ContentType.PORTLET; + this.selectedRenderParameters = new HashMap(); } /** . */ @@ -114,8 +115,11 @@ public String selectedContentURI; /** . */ - public Map selectedContentParams; + public Map selectedContentParameters; + /** . */ + public Map selectedRenderParameters; + public List getContentTypeItems() { LinkedList types = new LinkedList(); @@ -200,9 +204,12 @@ { // String selectedContentURI = this.selectedContentURI; - Map selectedContentParams = this.selectedContentParams; + Map selectedContentParams = this.selectedContentParameters; + + // Reset to new state this.selectedContentURI = null; - this.selectedContentParams = null; + this.selectedContentParameters = null; + this.selectedRenderParameters = new HashMap(); // Obtain a window name String windowName = (String)FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get("blah"); @@ -344,7 +351,7 @@ String uri = uris[0]; // - Map params = new HashMap(); + Map parameters = new HashMap(); for (Iterator i = actionParams.entrySet().iterator();i.hasNext();) { Map.Entry entry = (Map.Entry)i.next(); @@ -353,13 +360,13 @@ { String paramName = name.substring(CONTENT_PARAM_PREFIX_LENGTH); String paramValue = ((String[])entry.getValue())[0]; - params.put(paramName, paramValue); + parameters.put(paramName, paramValue); } } // this.selectedContentURI = uri; - this.selectedContentParams = params; + this.selectedContentParameters = parameters; } } } Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-06-25 21:15:19 UTC (rev 7539) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-06-25 22:51:04 UTC (rev 7540) @@ -65,6 +65,7 @@ supportedWindowStates="normal" initialMode="select_content" initialWindowState="normal" + renderParameters="#{pageManager.selectedRenderParameters}" onClick="url.setParameter('windowName', document.getElementById('windowForm:windowName').value);"/> </div> </td> Modified: trunk/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java =================================================================== --- trunk/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java 2007-06-25 21:15:19 UTC (rev 7539) +++ trunk/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java 2007-06-25 22:51:04 UTC (rev 7540) @@ -80,16 +80,29 @@ for (Iterator i = req.getParameterMap().entrySet().iterator();i.hasNext();) { Map.Entry entry = (Map.Entry)i.next(); - String name = (String)entry.getKey(); - if (name.startsWith("content.param")) + String contentParamName = (String)entry.getKey(); + if (contentParamName.startsWith("content.param")) { - String contentParamName = name.substring("content.param".length()); String[] contentParamValue = (String[])entry.getValue(); params.put(contentParamName, contentParamValue); } } // + String catParam = req.getParameter("cat"); + if (catParam != null) + { + params.put("cat", new String[]{catParam}); + } + + // + String queryParam = req.getParameter("query"); + if (queryParam != null) + { + params.put("query", new String[]{queryParam}); + } + + // resp.setRenderParameters(params); } } Modified: trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp 2007-06-25 21:15:19 UTC (rev 7539) +++ trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp 2007-06-25 22:51:04 UTC (rev 7540) @@ -100,6 +100,17 @@ for (Iterator i = selWidget.getPreferencesInfo().getPreferencesInfo().iterator(); i.hasNext();) { GGPreferenceInfo prefInfo = (GGPreferenceInfo)i.next(); + + // Get param value from nav state otherwise we use the default value + String prefValue = request.getParameter("content.param." + prefInfo.getName()); + if (prefValue == null) + { + prefInfo.getDefaultValue(); + } + if (prefValue == null) + { + prefValue = ""; + } %> <tr> <td><%= prefInfo.getName() %>:</td> @@ -116,7 +127,7 @@ for (int j = 0;j < e.getSize();j++) { EnumType.Value value = e.getValue(j); - boolean selected = value.getValue().equals(prefInfo.getDefaultValue()); + boolean selected = value.getValue().equals(prefValue); %> <option <%= selected ? "selected=\"selected\"" : "" %> value="<%= value.getValue() %>"><%= value.getDisplayValue() != null ? value.getDisplayValue() : value.getValue() %></option> <% @@ -127,7 +138,7 @@ break; default: %> - <td><input type="text" name="content.param.<%= prefInfo.getName() %>" class="portlet-form-field" value="<%= prefInfo.getDefaultValue() != null ? prefInfo.getDefaultValue() : "" %>"/></td> + <td><input type="text" name="content.param.<%= prefInfo.getName() %>" class="portlet-form-field" value="<%= prefValue %>"/></td> <% break; }

18 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r7539 - in trunk/widget/src: resources/widget-war/WEB-INF/jsp and 1 other directory.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-06-25 17:15:19 -0400 (Mon, 25 Jun 2007) New Revision: 7539 Modified: trunk/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp Log: update the workflow for gadget selection Modified: trunk/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java =================================================================== --- trunk/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java 2007-06-25 20:54:14 UTC (rev 7538) +++ trunk/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java 2007-06-25 21:15:19 UTC (rev 7539) @@ -37,6 +37,10 @@ import javax.portlet.PortletMode; import java.io.IOException; import java.io.PrintWriter; +import java.util.Enumeration; +import java.util.Map; +import java.util.HashMap; +import java.util.Iterator; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -61,6 +65,34 @@ public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException { + if (req.getParameter("content.action.select") != null) + { + String contentURI = req.getParameter("content.uri"); + if (contentURI != null) + { + // Will contain the next render params + Map params = new HashMap(); + + // + params.put("content.uri", new String[]{contentURI}); + + // + for (Iterator i = req.getParameterMap().entrySet().iterator();i.hasNext();) + { + Map.Entry entry = (Map.Entry)i.next(); + String name = (String)entry.getKey(); + if (name.startsWith("content.param")) + { + String contentParamName = name.substring("content.param".length()); + String[] contentParamValue = (String[])entry.getValue(); + params.put(contentParamName, contentParamValue); + } + } + + // + resp.setRenderParameters(params); + } + } } protected void doView(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException @@ -101,18 +133,6 @@ req.setAttribute("provider", provider); // - String op = req.getParameter("op"); - if ("select".equals(op)) - { - String uri = req.getParameter("uri"); - GGWidget widget = provider.getWidget(uri); - if (widget != null) - { - req.setAttribute("selectedWidget", widget); - } - } - - // PortletRequestDispatcher dispatcher = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/edit.jsp"); dispatcher.include(req, resp); } Modified: trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp 2007-06-25 20:54:14 UTC (rev 7538) +++ trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp 2007-06-25 21:15:19 UTC (rev 7539) @@ -7,18 +7,26 @@ <%@ page import="org.jboss.portal.widget.google.GGWidgetCategoryInfo" %> <%@ page import="org.jboss.portal.widget.google.provider.GGQuery" %> <%@ page import="org.jboss.portal.widget.google.type.EnumType" %> +<%@ page import="javax.portlet.PortletURL" %> <%@ page language="java"%> <%@ taglib uri="http://java.sun.com/portlet" prefix="p" %> <%@ page isELIgnored="false" %> -<portlet:defineObjects/> +<p:defineObjects/> <div> <% // Get useful request attributes - GGWidget selWidget = (GGWidget)request.getAttribute("selectedWidget"); GGProvider provider = (GGProvider)request.getAttribute("provider"); + // Get the selected widget if any + GGWidget selWidget = null; + String uri = request.getParameter("content.uri"); + if (uri != null) + { + selWidget = provider.getWidget(uri); + } + // Get query term String queryTerm = request.getParameter("query"); if (queryTerm == null) @@ -60,10 +68,19 @@ <% if (selWidget != null) { + PortletURL selectURL = renderResponse.createActionURL(); + + // Set parameters for selection + selectURL.setParameter("content.action.select", "content.action.select"); + selectURL.setParameter("content.uri", selWidget.getId()); + + // Propagage search nav state + selectURL.setParameter("cat", catTerm); + selectURL.setParameter("query", queryTerm); %> <p>You have selected the widget <%= selWidget.getTitle().getDefaultString() %></p> <p> - <form action="<p:actionURL><p:param name="content.action.select" value="select"/><p:param name="content.uri" value="<%= selWidget.getId() %>"/></p:actionURL>" method="post"> + <form action="<%= selectURL %>" method="post"> <% for (Iterator i = selWidget.getPreferencesInfo().getPreferencesInfo().iterator(); i.hasNext();) { @@ -120,7 +137,7 @@ } %> <tr> - <td colspan="2"><input type="submit" value="Select" class="portlet-form-button"/></td> + <td colspan="2"><input type="submit" value="Update" class="portlet-form-button"/></td> </tr> </tbody> </table> @@ -132,13 +149,31 @@ <ul> <% - for (Iterator i = result.getWidgetIterator();i.hasNext();) - { - GGWidget widget = (GGWidget)i.next(); + for (Iterator i = result.getWidgetIterator(); i.hasNext();) + { + GGWidget widget = (GGWidget)i.next(); + PortletURL selectURL = renderResponse.createActionURL(); + + // Set parameters for selection + selectURL.setParameter("content.action.select", "content.action.select"); + selectURL.setParameter("content.uri", widget.getId()); + + // Set default parametrization state + for (Iterator j = widget.getPreferencesInfo().getPreferencesInfo().iterator();j.hasNext();) + { + GGPreferenceInfo prefInfo = (GGPreferenceInfo)j.next(); + String paramName = "content.param." + prefInfo.getName(); + String defaultValue = prefInfo.getDefaultValue() != null ? prefInfo.getDefaultValue() : ""; + selectURL.setParameter(paramName, defaultValue); + } + + // Propagage search nav state + selectURL.setParameter("cat", catTerm); + selectURL.setParameter("query", queryTerm); %> - <li><a href="<p:renderURL><p:param name="op" value="select"/><p:param name="uri" value="<%= widget.getId() %>"/><p:param name="cat" value="<%= catTerm %>"/></p:renderURL>"><%= widget.getTitle().getDefaultString() %></a></li> + <li><a href="<%= selectURL %>"><%= widget.getTitle().getDefaultString() %></a></li> <% - } + } %> </ul>

18 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r7538 - trunk/core/src/resources/portal-core-war/WEB-INF/jsp/content.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-06-25 16:54:14 -0400 (Mon, 25 Jun 2007) New Revision: 7538 Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp Log: - Fixed overflow issue on older browsers. Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2007-06-25 20:38:39 UTC (rev 7537) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2007-06-25 20:54:14 UTC (rev 7538) @@ -1,9 +1,9 @@ -<%@ page import="java.util.Collection" %> +<%@ page import="org.jboss.portal.common.util.IteratorStatus" %> <%@ page import="org.jboss.portal.core.model.instance.Instance" %> -<%@ page import="org.jboss.portal.common.util.IteratorStatus" %> <%@ page import="org.jboss.portal.portlet.Portlet" %> +<%@ page import="org.jboss.portal.portlet.PortletInvokerException" %> <%@ page import="org.jboss.portal.portlet.info.MetaInfo" %> -<%@ page import="org.jboss.portal.portlet.PortletInvokerException" %> +<%@ page import="java.util.Collection" %> <%@ page language="java" %> <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> @@ -17,36 +17,37 @@ if (newContent) { %> - <span class="portlet-font">Portlet instance associated to this window:</span> +<span class="portlet-font">Portlet instance associated to this window:</span> <% - } - else - { +} +else +{ %> - <span class="portlet-font">Portlet instance associated to this window:</span> +<span class="portlet-font">Portlet instance associated to this window:</span> <% } %> -<div style="height:300px; width:300px; overflow-y: scroll; overflow-x: none; border: 1px solid #333333;"> - <table style="width:100%;" cellspacing="0" cellpadding="0"> +<div style="height:300px; width:300px; overflow: scroll; border: 1px solid #333333;"> + <table style="width:100%;" cellspacing="0" cellpadding="0"> <% for (IteratorStatus i = new IteratorStatus(instances); i.hasNext();) { Instance instance = (Instance)i.next(); - String rowClass = instance == selectedInstance ? "portlet-section-selected" : (i.getIndex() %2 == 0 ? "portlet-section-body" : "portlet-section-alternate"); + String rowClass = instance == selectedInstance ? "portlet-section-selected" : (i.getIndex() % 2 == 0 ? "portlet-section-body" : "portlet-section-alternate"); %> <portlet:actionURL var="url"> <portlet:param name="content.action.select" value="true"/> <portlet:param name="content.uri" value="<%= instance.getId() %>"/> </portlet:actionURL> <tr class="<%= rowClass %>"> - <td><a href="<%= url %>"><%= instance.getId() %></a></td> - </tr> + <td><a href="<%= url %>"><%= instance.getId() %> + </a></td> + </tr> <% } %> - </table> + </table> </div> <% @@ -54,26 +55,39 @@ { %> <div class="portlet-font"> -<div><span class="portlet-form-field-label">Portlet instance:</span><%= selectedInstance.getId() %></div> -<% - Portlet portlet = null; - try - { - portlet = selectedInstance.getPortlet(); - } - catch (PortletInvokerException e) - { - e.printStackTrace(); - } - if (portlet != null) - { - MetaInfo metaInfo = portlet.getInfo().getMeta(); -%> -<div><span class="portlet-form-field-label">Portlet name:</span><%= metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() %></div> -<div><span class="portlet-form-field-label">Portlet description:</span><%= metaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() %></div> -<div><span class="portlet-form-field-label">Portlet title:</span><%= metaInfo.getMetaValue(MetaInfo.TITLE).getDefaultString() %></div> -<div><span class="portlet-form-field-label">Portlet keywords:</span><%= metaInfo.getMetaValue(MetaInfo.KEYWORDS).getDefaultString() %></div> -<% + <div><span class="portlet-form-field-label">Portlet instance:</span><%= selectedInstance.getId() %> + </div> + <% + + Portlet portlet = null; + try + { + portlet = selectedInstance.getPortlet(); } - } -%> + catch (PortletInvokerException e) + { + e.printStackTrace(); + } + if (portlet != null) + { + MetaInfo metaInfo = portlet.getInfo().getMeta(); + + %> + <div><span + class="portlet-form-field-label">Portlet name:</span><%= metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() %> + </div> + <div><span + class="portlet-form-field-label">Portlet description:</span><%= metaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() %> + </div> + <div><span + class="portlet-form-field-label">Portlet title:</span><%= metaInfo.getMetaValue(MetaInfo.TITLE).getDefaultString() %> + </div> + <div><span + class="portlet-form-field-label">Portlet keywords:</span><%= metaInfo.getMetaValue(MetaInfo.KEYWORDS).getDefaultString() %> + </div> + <% + + } + } + + %>

18 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r7537 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-06-25 16:38:39 -0400 (Mon, 25 Jun 2007) New Revision: 7537 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml Log: JBPORTAL-1503 : Admin Portlet, Content Type drop down list causes exessive page reloads Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-06-25 20:25:17 UTC (rev 7536) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-06-25 20:38:39 UTC (rev 7537) @@ -43,7 +43,7 @@ id="instanceId" value="#{pageManager.selectedContentType}" styleClass="portlet-form-field contentType" - onclick="document.getElementById('abc').submit()"> + onchange="document.getElementById('abc').submit()"> <f:selectItems value="#{pageManager.contentTypeItems}"/> </h:selectOneMenu> <h:message for="instanceId" errorClass="portlet-msg-error"/>

18 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r7536 - trunk/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-06-25 16:25:17 -0400 (Mon, 25 Jun 2007) New Revision: 7536 Modified: trunk/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java Log: - Added '/' in log message. Modified: trunk/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java =================================================================== --- trunk/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2007-06-25 16:20:22 UTC (rev 7535) +++ trunk/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2007-06-25 20:25:17 UTC (rev 7536) @@ -23,8 +23,8 @@ package org.jboss.portal.portlet.deployment.jboss; import org.jboss.deployment.DeploymentException; +import org.jboss.portal.common.io.IOTools; import org.jboss.portal.common.xml.NullEntityResolver; -import org.jboss.portal.common.io.IOTools; import org.jboss.portal.portlet.deployment.JBossApplicationMetaDataFactory; import org.jboss.portal.portlet.deployment.PortletApplicationMetaDataFactory; import org.jboss.portal.portlet.deployment.ValueTrimmingFilter; @@ -287,7 +287,7 @@ in = IOTools.safeBufferedWrapper(servletContext.getResourceAsStream("/WEB-INF/jboss-portlet.xml")); if (in != null) { - log.info("Parsing " + contextPath + "jboss-portlet.xml"); + log.info("Parsing " + contextPath + "/jboss-portlet.xml"); // JBossApplicationMetaDataFactory factory = this.factory.createJBossApplicationMetaDataFactory();

18 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r7535 - trunk/common/src/main/org/jboss/portal/common/net.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-06-25 12:20:22 -0400 (Mon, 25 Jun 2007) New Revision: 7535 Modified: trunk/common/src/main/org/jboss/portal/common/net/URLTools.java Log: If there is no proxy, don't set a proxy Modified: trunk/common/src/main/org/jboss/portal/common/net/URLTools.java =================================================================== --- trunk/common/src/main/org/jboss/portal/common/net/URLTools.java 2007-06-25 15:29:08 UTC (rev 7534) +++ trunk/common/src/main/org/jboss/portal/common/net/URLTools.java 2007-06-25 16:20:22 UTC (rev 7535) @@ -101,7 +101,10 @@ { HttpClient client = new HttpClient(); - client.getHostConfiguration().setProxy(PROXY_HOST, PROXY_PORT); + if (PROXY_HOST != null) + { + client.getHostConfiguration().setProxy(PROXY_HOST, PROXY_PORT); + } // Yes deprecated but advocated way to do will not for with 2.0.2 which is what today JBoss AS ships if (connTimeoutMillis > 0)

18 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r7533 - in docs/trunk: readmeFiles and 3 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-06-25 11:21:33 -0400 (Mon, 25 Jun 2007) New Revision: 7533 Modified: docs/trunk/quickstartuser/en/master.xml docs/trunk/readmeFiles/jboss-portal-bin.README docs/trunk/readmeFiles/jboss-portal-ha-bin.README docs/trunk/readmeFiles/jboss-portal-src.README docs/trunk/referenceGuide/en/master.xml docs/trunk/referenceGuide/en/modules/urls.xml docs/trunk/userGuide/en/master.xml Log: GA labels update Modified: docs/trunk/quickstartuser/en/master.xml =================================================================== --- docs/trunk/quickstartuser/en/master.xml 2007-06-25 15:17:01 UTC (rev 7532) +++ docs/trunk/quickstartuser/en/master.xml 2007-06-25 15:21:33 UTC (rev 7533) @@ -11,12 +11,12 @@ ]> <book lang="en"> <bookinfo> - <title>JBoss Portal 2.6CR1</title> + <title>JBoss Portal 2.6</title> <subtitle>Quickstart User Guide</subtitle> - <releaseinfo>Release 2.6CR1 "Ninja"</releaseinfo> - <releaseinfo>April 2007</releaseinfo> + <releaseinfo>Release 2.6 "Ninja"</releaseinfo> + <releaseinfo>June 2007</releaseinfo> <author> <firstname>Kevin</firstname> @@ -56,4 +56,4 @@  &fin; -</book> \ No newline at end of file +</book> Modified: docs/trunk/readmeFiles/jboss-portal-bin.README =================================================================== --- docs/trunk/readmeFiles/jboss-portal-bin.README 2007-06-25 15:17:01 UTC (rev 7532) +++ docs/trunk/readmeFiles/jboss-portal-bin.README 2007-06-25 15:21:33 UTC (rev 7533) @@ -1,5 +1,5 @@ - JBoss Portal 2.6.0 Candidate Releasei 3 + JBoss Portal 2.6.0 LGPL Licensed (See http://www.gnu.org/copyleft/lesser.html for details on the product usage) JBoss Portal is the next generation open source content management system (CMS) and portal Modified: docs/trunk/readmeFiles/jboss-portal-ha-bin.README =================================================================== --- docs/trunk/readmeFiles/jboss-portal-ha-bin.README 2007-06-25 15:17:01 UTC (rev 7532) +++ docs/trunk/readmeFiles/jboss-portal-ha-bin.README 2007-06-25 15:21:33 UTC (rev 7533) @@ -1,5 +1,5 @@ - JBoss Portal 2.6.0 Candidate Release 3 + JBoss Portal 2.6.0 LGPL Licensed (See http://www.gnu.org/copyleft/lesser.html for details on the product usage) JBoss Portal is the next generation open source content management system (CMS) and portal Modified: docs/trunk/readmeFiles/jboss-portal-src.README =================================================================== --- docs/trunk/readmeFiles/jboss-portal-src.README 2007-06-25 15:17:01 UTC (rev 7532) +++ docs/trunk/readmeFiles/jboss-portal-src.README 2007-06-25 15:21:33 UTC (rev 7533) @@ -1,5 +1,5 @@ - JBoss Portal 2.6.0 Candidate Release 3 + JBoss Portal 2.6.0 LGPL Licensed (See http://www.gnu.org/copyleft/lesser.html for details on the product usage) JBoss Portal is the next generation open source content management system (CMS) and portal Modified: docs/trunk/referenceGuide/en/master.xml =================================================================== --- docs/trunk/referenceGuide/en/master.xml 2007-06-25 15:17:01 UTC (rev 7532) +++ docs/trunk/referenceGuide/en/master.xml 2007-06-25 15:21:33 UTC (rev 7533) @@ -31,10 +31,10 @@ ]> <book lang="en"> <bookinfo> - <title>JBoss Portal 2.6CR2</title> + <title>JBoss Portal 2.6</title> <subtitle>Reference Guide</subtitle> - <releaseinfo>Release 2.6CR2 "Ninja"</releaseinfo> - <releaseinfo>April 2007</releaseinfo> + <releaseinfo>Release 2.6 "Ninja"</releaseinfo> + <releaseinfo>June 2007</releaseinfo> <author> <firstname>Thomas</firstname> <surname>Heute</surname> Modified: docs/trunk/referenceGuide/en/modules/urls.xml =================================================================== --- docs/trunk/referenceGuide/en/modules/urls.xml 2007-06-25 15:17:01 UTC (rev 7532) +++ docs/trunk/referenceGuide/en/modules/urls.xml 2007-06-25 15:21:33 UTC (rev 7533) @@ -65,19 +65,37 @@ will be rendered independant of the portal. </listitem> </itemizedlist> </sect1> + </chapter> Modified: docs/trunk/userGuide/en/master.xml =================================================================== --- docs/trunk/userGuide/en/master.xml 2007-06-25 15:17:01 UTC (rev 7532) +++ docs/trunk/userGuide/en/master.xml 2007-06-25 15:21:33 UTC (rev 7533) @@ -13,10 +13,10 @@ ]> <book lang="en"> <bookinfo> - <title>JBoss Portal 2.6CR1</title> + <title>JBoss Portal 2.6</title> <subtitle>User Guide</subtitle> - <releaseinfo>Release 2.6CR1 "Ninja"</releaseinfo> - <releaseinfo>April 2007</releaseinfo> + <releaseinfo>Release 2.6 "Ninja"</releaseinfo> + <releaseinfo>June 2007</releaseinfo> <author> <firstname>Roy</firstname> <surname>Russo</surname>

18 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r7532 - trunk/build.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-06-25 11:17:01 -0400 (Mon, 25 Jun 2007) New Revision: 7532 Modified: trunk/build/distrib.xml Log: GA distrib Modified: trunk/build/distrib.xml =================================================================== --- trunk/build/distrib.xml 2007-06-25 15:16:26 UTC (rev 7531) +++ trunk/build/distrib.xml 2007-06-25 15:17:01 UTC (rev 7532) @@ -2,7 +2,7 @@ <property name="source.dir" value="../../jboss-portal-2.6"/> <property name="docs.dir" value="${source.dir}-docs"/> - <property name="release.version" value="2.6-CR3"/> + <property name="release.version" value="2.6"/>  <property name="portal.release.normal.name" value="jboss-portal-${release.version}"/>

18 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r7531 - trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-06-25 11:16:26 -0400 (Mon, 25 Jun 2007) New Revision: 7531 Modified: trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml Log: - Added explicit column name for properties. Modified: trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml 2007-06-25 14:53:05 UTC (rev 7530) +++ trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml 2007-06-25 15:16:26 UTC (rev 7531) @@ -48,8 +48,9 @@ cascade="all" lazy="false"/> <property name="expirationCacheSeconds" column="EXPIRATION_CACHE_SECONDS" type="java.lang.Integer"/> - <property name="active" not-null="true" type="boolean"/> - <property name="persistentId" not-null="true" unique="true" type="java.lang.String" access="field"/> + <property name="active" not-null="true" column="ACTIVE" type="boolean"/> + <property name="persistentId" column="PRODUCER_ID" not-null="true" unique="true" type="java.lang.String" + access="field"/> </class> <class name="org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo" table="JBP_ENDPOINT_INFO"> @@ -91,10 +92,10 @@ <param name="sequence">wsrpconsumer_seq</param> </generator> </id> - <property name="name" type="java.lang.String" not-null="true"/> - <property name="value" type="java.lang.String"/> - <property name="invalid" type="java.lang.Boolean"/> - <property name="lang" type="java.lang.String" not-null="true"/> + <property name="name" column="NAME" type="java.lang.String" not-null="true"/> + <property name="value" column="VALUE" type="java.lang.String"/> + <property name="invalid" column="INVALID" type="java.lang.Boolean"/> + <property name="lang" column="LANG" type="java.lang.String" not-null="true"/> <many-to-one name="description" column="DESC_PK" @@ -110,8 +111,8 @@ <param name="sequence">portlet_seq</param> </generator> </id> - <property name="name" type="org.jboss.portal.jems.hibernate.QNameUserType" not-null="true"/> - <property name="type" type="org.jboss.portal.jems.hibernate.QNameUserType" not-null="true"/> + <property name="name" column="NAME" type="org.jboss.portal.jems.hibernate.QNameUserType" not-null="true"/> + <property name="type" column="TYPE" type="org.jboss.portal.jems.hibernate.QNameUserType" not-null="true"/> <property name="schemaLocation" column="SCHEMA_LOCATION" type="java.lang.String"/> <component name="description" class="org.jboss.portal.wsrp.registration.LocalizedString"> <property name="value" column="DESC_VALUE"/>

18 years, 10 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits June 2007