[portal-commits] JBoss Portal SVN: r10529 - in modules/portlet/trunk: controller/src/main/java/org/jboss/portal/portlet/controller and 2 other directories.

Author: chris.laprun(a)jboss.com Date: 2008-04-10 20:20:29 -0400 (Thu, 10 Apr 2008) New Revision: 10529 Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java modules/portlet/trunk/releaseLibs.sh Log: - Minor. Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java 2008-04-11 00:20:05 UTC (rev 10528) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java 2008-04-11 00:20:29 UTC (rev 10529) @@ -33,10 +33,7 @@ import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.spi.PortletInvocationContext; -import javax.servlet.ServletContext; import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -59,13 +56,13 @@ /** * Create a portlet invocation context for the specified window id. * - * @param windowId the window id + * @param windowId the window id * @param pageNavigationalState the page navigational state * @return a portlet invocation context */ PortletInvocationContext createPortletInvocationContext(String windowId, PageNavigationalState pageNavigationalState); - PortletInvocationResponse invoke( ActionInvocation actionInvocation) throws PortletInvokerException; + PortletInvocationResponse invoke(ActionInvocation actionInvocation) throws PortletInvokerException; PortletInvocationResponse invoke(List<Cookie> requestCookies, EventInvocation eventInvocation) throws PortletInvokerException; Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java =================================================================== --- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java 2008-04-11 00:20:05 UTC (rev 10528) +++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java 2008-04-11 00:20:29 UTC (rev 10529) @@ -22,24 +22,24 @@ ******************************************************************************/ package org.jboss.portal.portlet.portal.admin.ui; +import org.jboss.portal.portlet.ParametersStateString; +import org.jboss.portal.portlet.invocation.response.ErrorResponse; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; +import org.jboss.portal.portlet.portal.jsp.EventAcknowledgement; +import org.jboss.portal.portlet.portal.jsp.EventRoute; import org.jboss.portal.portlet.portal.jsp.PageEventControllerContext; -import org.jboss.portal.portlet.portal.jsp.EventRoute; import org.jboss.portal.portlet.portal.jsp.PagePortletControllerContext; -import org.jboss.portal.portlet.portal.jsp.EventAcknowledgement; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; -import org.jboss.portal.portlet.invocation.response.ErrorResponse; -import org.jboss.portal.portlet.ParametersStateString; import javax.portlet.GenericPortlet; +import javax.portlet.PortletException; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; -import javax.portlet.PortletException; import java.io.IOException; import java.io.PrintWriter; +import java.util.Iterator; +import java.util.Map; import java.util.Random; -import java.util.Map; -import java.util.Iterator; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> @@ -70,7 +70,7 @@ int id; for (EventRoute route : eventCC.getRoots()) { - id = rand(1,1000); + id = rand(1, 1000); writer.println("<div class=\"event\" id=\"event-" + id + "\">\n"); printRoute(route, writer, context, id, ""); writer.println("</div>\n"); @@ -83,13 +83,13 @@ } } - private void printRoute(EventRoute route, PrintWriter writer,PagePortletControllerContext context, int id, String cid) + private void printRoute(EventRoute route, PrintWriter writer, PagePortletControllerContext context, int id, String cid) { writer.print("<div onmouseover=\"showDetails(this,'details-" + id + cid + "')\" onmouseout=\"hideDetails(this,'details-" + id + cid + "')\" onclick=\"new Effect.Highlight('" + context.getPortletInfo(route.getSource()).getName() + "', {startcolor:'#990000', endcolor:'ffffdd',queue: {position:'start', scope: 'highlight', limit:2}});new Effect.Highlight('" + context.getPortletInfo(route.getDestination()).getName() + "', {startcolor:'#990000', endcolor:'ffffdd',queue: {position:'end', scope: 'highlight', limit:2}});\" >" + "<div class=\"event-header\">\n" + - " <h4>" + context.getPortletInfo(route.getSource()).getName() + "</h4>\n" + - " <div>Event: " + route.getName().getLocalPart() + "</div>\n" + - " </div>\n"); + " <h4>" + context.getPortletInfo(route.getSource()).getName() + "</h4>\n" + + " <div>Event: " + route.getName().getLocalPart() + "</div>\n" + + " </div>\n"); writer.print("<div class=\"event-body\">" + "<p><label>Source: </label>" + context.getPortletInfo(route.getSource()).getName() + "<img src=\"/simple-portal/images/debug/arrow.gif\" alt=\"\"/>"); @@ -106,7 +106,7 @@ for (EventRoute child : route.getChildren()) { - id = rand(1,1000); + id = rand(1, 1000); writer.println("<div class=\"children\">"); printRoute(child, writer, context, id, "a"); writer.println("</div>"); @@ -203,7 +203,7 @@ private void formatMap(Map<String, String[]> map, StringBuilder sb) { sb.append("{"); - for (Iterator<Map.Entry<String, String[]>> i = map.entrySet().iterator();i.hasNext();) + for (Iterator<Map.Entry<String, String[]>> i = map.entrySet().iterator(); i.hasNext();) { Map.Entry<String, String[]> entry = i.next(); @@ -226,13 +226,15 @@ } public static int rand(int lo, int hi) - { - Random rn2 = new Random(); - int n = hi - lo + 1; - int i = rn2.nextInt() % n; - if (i < 0) - i = -i; - return lo + i; - } + { + Random rn2 = new Random(); + int n = hi - lo + 1; + int i = rn2.nextInt() % n; + if (i < 0) + { + i = -i; + } + return lo + i; + } } Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java =================================================================== --- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java 2008-04-11 00:20:05 UTC (rev 10528) +++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java 2008-04-11 00:20:29 UTC (rev 10529) @@ -22,42 +22,42 @@ ******************************************************************************/ package org.jboss.portal.portlet.portal.jsp; -import org.jboss.portal.portlet.controller.impl.PortletURLRenderer; -import org.jboss.portal.portlet.controller.impl.URLParameterConstants; +import org.jboss.portal.common.io.IOTools; +import org.jboss.portal.common.io.SerializationFilter; +import org.jboss.portal.common.util.Base64; import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.URLFormat; -import org.jboss.portal.portlet.portal.Constants; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.ErrorResponse; -import org.jboss.portal.portlet.invocation.response.ContentResponse; -import org.jboss.portal.portlet.invocation.response.UnavailableResponse; import org.jboss.portal.portlet.controller.PortletController; -import org.jboss.portal.portlet.controller.request.PortletActionRequest; +import org.jboss.portal.portlet.controller.impl.PortletURLRenderer; +import org.jboss.portal.portlet.controller.impl.URLParameterConstants; import org.jboss.portal.portlet.controller.impl.request.ControllerRequestFactory; +import org.jboss.portal.portlet.controller.impl.request.ControllerRequestParameterNames; import org.jboss.portal.portlet.controller.request.ControllerRequest; -import org.jboss.portal.portlet.controller.impl.request.ControllerRequestParameterNames; +import org.jboss.portal.portlet.controller.request.PortletActionRequest; import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.controller.response.PageUpdateResponse; +import org.jboss.portal.portlet.controller.response.PortletResponse; import org.jboss.portal.portlet.controller.response.ResourceResponse; -import org.jboss.portal.portlet.controller.response.PortletResponse; import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.controller.state.PageNavigationalStateSerialization; -import org.jboss.portal.common.io.IOTools; -import org.jboss.portal.common.io.SerializationFilter; -import org.jboss.portal.common.util.Base64; +import org.jboss.portal.portlet.invocation.response.ContentResponse; +import org.jboss.portal.portlet.invocation.response.ErrorResponse; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.invocation.response.UnavailableResponse; +import org.jboss.portal.portlet.portal.Constants; import org.jboss.portal.web.WebRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; -import javax.servlet.Filter; -import javax.servlet.FilterConfig; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import javax.servlet.FilterChain; -import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.Writer; @@ -228,9 +228,10 @@ ErrorResponse errorResponse = (ErrorResponse)pir; // - if (errorResponse.getCause() != null) + Throwable cause = errorResponse.getCause(); + if (cause != null) { - throw new ServletException(Constants.PORTLET_ERROR, errorResponse.getCause()); + throw new ServletException(Constants.PORTLET_ERROR, cause); } else { Modified: modules/portlet/trunk/releaseLibs.sh =================================================================== --- modules/portlet/trunk/releaseLibs.sh 2008-04-11 00:20:05 UTC (rev 10528) +++ modules/portlet/trunk/releaseLibs.sh 2008-04-11 00:20:29 UTC (rev 10529) @@ -1,4 +1,4 @@ -repos=$HOME/Dev/portal-modules-respo/portlet/trunk-SNAPSHOT/lib +repos=$HOME/Dev/portal-modules-repos/portlet/trunk-SNAPSHOT/lib thirdparty=$HOME/Dev/jboss-portal-2.7/thirdparty/jboss-portal/modules/portlet/lib echo "Copies current version of portlet libraries either to local repository copy or Portal thirdparty to test or release purpose"