Author: thomas.heute(a)jboss.com Date: 2009-01-30 14:46:24 -0500 (Fri, 30 Jan 2009) New Revision: 12734 Modified: tags/Enterprise_Portal_Platform_4_3_GA/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml tags/Enterprise_Portal_Platform_4_3_GA/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java tags/Enterprise_Portal_Platform_4_3_GA/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java Log: - Include DnD scripts statically, and remove old RF config from identity - JBPORTAL-2273: real fix: when we get an OpaqueStateString just transmit it as is since chances are it cannot be interpreted (unless it was encoded by a Portal producer) and we cannot use the information locally to mix in the public navigational state anyway. Modified: tags/Enterprise_Portal_Platform_4_3_GA/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java =================================================================== --- tags/Enterprise_Portal_Platform_4_3_GA/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java 2009-01-30 19:43:36 UTC (rev 12733) +++ tags/Enterprise_Portal_Platform_4_3_GA/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java 2009-01-30 19:46:24 UTC (rev 12734) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * Copyright 2009, 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. * @@ -86,37 +86,35 @@ StateString state = renderResult.getNavigationalState(); - Map<String, String[]> stringMap; + // if we are in the local case, decode the parameters and mix in public navigational state if needed + // in the WSRP case, we get an OpaqueStateString that we just pass along as is if (state instanceof ParametersStateString) { - stringMap = ((ParametersStateString)state).getParameters(); - } - else - { - stringMap = StateString.decodeOpaqueValue(state.getStringValue()); - } - Map<String, String[]> parameters = new HashMap<String, String[]>(stringMap); + Map<String, String[]> stringMap = ((ParametersStateString)state).getParameters(); - if (pns != null) - { + Map<String, String[]> parameters = new HashMap<String, String[]>(stringMap); - // - for (ParameterInfo parameterInfo : portletInfo.getNavigation().getPublicParameters()) + if (pns != null) { - String key = parameterInfo.getId(); - // - String[] values = pns.getParameter(parameterInfo.getName()); - - // - if (values != null) + for (ParameterInfo parameterInfo : portletInfo.getNavigation().getPublicParameters()) { - parameters.put(key, values); + String key = parameterInfo.getId(); + + // + String[] values = pns.getParameter(parameterInfo.getName()); + + // + if (values != null) + { + parameters.put(key, values); + } } } + state = ParametersStateString.create(parameters); } - return new PortletWindowActionResponse(targetId, windowState, mode, ParametersStateString.create(parameters)); + return new PortletWindowActionResponse(targetId, windowState, mode, state); } else { Modified: tags/Enterprise_Portal_Platform_4_3_GA/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml =================================================================== --- tags/Enterprise_Portal_Platform_4_3_GA/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml 2009-01-30 19:43:36 UTC (rev 12733) +++ tags/Enterprise_Portal_Platform_4_3_GA/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml 2009-01-30 19:46:24 UTC (rev 12734) @@ -35,9 +35,6 @@ <trans-attribute>Required</trans-attribute> </transaction> <header-content> - <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript"></script> - <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript"></script> - <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss"/> <link rel="stylesheet" type="text/css" href="/style.css" media="screen"/> </header-content> <portlet-info> @@ -56,9 +53,6 @@ <trans-attribute>Required</trans-attribute> </transaction> <header-content> - <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript"></script> - <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript"></script> - <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss"/> <link rel="stylesheet" type="text/css" href="/style.css" media="screen"/> </header-content> <portlet-info> Modified: tags/Enterprise_Portal_Platform_4_3_GA/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java =================================================================== --- tags/Enterprise_Portal_Platform_4_3_GA/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2009-01-30 19:43:36 UTC (rev 12733) +++ tags/Enterprise_Portal_Platform_4_3_GA/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2009-01-30 19:46:24 UTC (rev 12734) @@ -132,9 +132,16 @@ markup.print("/prototype.js'></script>\n"); markup.print("<script type='text/javascript' src='"); markup.print(jsBase); - markup.print("/scriptaculous.js?load=effects,dragdrop'></script>\n"); + markup.print("/scriptaculous.js'></script>\n"); markup.print("<script type='text/javascript' src='"); markup.print(jsBase); + markup.print("/effects.js'></script>\n"); + markup.print("<script type='text/javascript' src='"); + markup.print(jsBase); + markup.print("/dragdrop.js'></script>\n"); + + markup.print("<script type='text/javascript' src='"); + markup.print(jsBase); markup.print("/dyna.js'></script>\n"); markup.print("<script type='text/javascript'>\n");