Author: mwringe Date: 2009-03-06 18:22:19 -0500 (Fri, 06 Mar 2009) New Revision: 12982 Modified: branches/JBoss_Portal_AS5_Deployer/widget/src/main/org/jboss/portal/widget/exceptions/WidgetFailure.java branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-netvibes-war/WEB-INF/portlet.xml branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-war/WEB-INF/portlet.xml Log: Merge JBoss_Portal_Branch_2_7 changes (rev range 12254:12964) into JBoss_Portal_AS5_Deployer branch Modified: branches/JBoss_Portal_AS5_Deployer/widget/src/main/org/jboss/portal/widget/exceptions/WidgetFailure.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/widget/src/main/org/jboss/portal/widget/exceptions/WidgetFailure.java 2009-03-06 23:22:14 UTC (rev 12981) +++ branches/JBoss_Portal_AS5_Deployer/widget/src/main/org/jboss/portal/widget/exceptions/WidgetFailure.java 2009-03-06 23:22:19 UTC (rev 12982) @@ -22,13 +22,13 @@ ******************************************************************************/ package org.jboss.portal.widget.exceptions; +import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.widget.Widget; + import java.net.URL; import java.util.Locale; import java.util.Map; -import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.widget.Widget; - /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ @@ -90,7 +90,7 @@ } else { - return "Error while retreiving Widget: "+ urlString; + return "Error while retrieving Widget: "+ urlString; } } else Modified: branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp 2009-03-06 23:22:14 UTC (rev 12981) +++ branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp 2009-03-06 23:22:19 UTC (rev 12982) @@ -12,7 +12,7 @@ <%@page import="java.util.List"%> <%@page import="java.util.Iterator"%> <%@ page language="java" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="p" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="p" %> <%@ page isELIgnored="false" %> <%@page import="org.jboss.portal.widget.Widget"%> <%@page import="org.jboss.portal.widget.exceptions.WidgetFailure"%> Modified: branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-netvibes-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-netvibes-war/WEB-INF/portlet.xml 2009-03-06 23:22:14 UTC (rev 12981) +++ branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-netvibes-war/WEB-INF/portlet.xml 2009-03-06 23:22:19 UTC (rev 12982) @@ -33,7 +33,7 @@ <display-name>Netvibes Widget Portlet</display-name> <portlet-class>org.jboss.portal.widget.netvibes.NetvibesWidgetPortlet</portlet-class> <init-param> - <description>Connection timeout when retreiving gadgets from google directory (in milliseconds)</description> + <description>Connection timeout when retrieving gadgets from google directory (in milliseconds)</description> <name>connectionTimeout</name> <value>5000</value> </init-param> Modified: branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp 2009-03-06 23:22:14 UTC (rev 12981) +++ branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp 2009-03-06 23:22:19 UTC (rev 12982) @@ -14,7 +14,7 @@ <%@ page import="java.util.Collection" %> <%@ page import="java.util.Iterator" %> <%@ page language="java" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="p" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="p" %> <%@ page isELIgnored="false" %> <%@page import="org.jboss.portal.widget.Widget"%> Modified: branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-war/WEB-INF/portlet.xml 2009-03-06 23:22:14 UTC (rev 12981) +++ branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-war/WEB-INF/portlet.xml 2009-03-06 23:22:19 UTC (rev 12982) @@ -33,7 +33,7 @@ <display-name>Google Widget Portlet</display-name> <portlet-class>org.jboss.portal.widget.google.GGWidgetPortlet</portlet-class> <init-param> - <description>Connection timeout when retreiving gadgets from google directory (in milliseconds)</description> + <description>Connection timeout when retrieving gadgets from google directory (in milliseconds)</description> <name>connectionTimeout</name> <value>5000</value> </init-param>