April 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r6955 - in trunk/theme/src: main/org/jboss/portal/theme/impl/render/dynamic and 1 other directory.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-04-08 08:54:10 -0400 (Sun, 08 Apr 2007) New Revision: 6955 Modified: trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java Log: update correctly the dyna-decoration Modified: trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-08 12:38:21 UTC (rev 6954) +++ trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-08 12:54:10 UTC (rev 6955) @@ -168,7 +168,7 @@ // copyInnerHTML(srcContainer, dstContainer, "dyna-portlet") - copyInnerHTML(srcContainer, dstContainer, "dyna-handle") + copyInnerHTML(srcContainer, dstContainer, "dyna-decoration") } else { Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-04-08 12:38:21 UTC (rev 6954) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-04-08 12:54:10 UTC (rev 6955) @@ -55,21 +55,25 @@ DynaRenderOptions regionOptions = (DynaRenderOptions)rendererContext.getAttribute(DynaConstants.DYNA_RENDER_OPTIONS); // + PrintWriter markup = rendererContext.getWriter(); + + // if (regionOptions.isDnDEnabled()) { DynaWindowRenderer.handleProvided.set(Boolean.TRUE); // - PrintWriter markup = rendererContext.getWriter(); + markup.print("<div class=\"dyna-handle\">"); markup.print("<div class=\"dyna-decoration\">\n"); - markup.print("<div class=\"dyna-handle\">"); delegate.render(rendererContext, drc); markup.print("</div>\n"); markup.print("</div>\n"); } else { + markup.print("<div class=\"dyna-decoration\">\n"); delegate.render(rendererContext, drc); + markup.print("</div>\n"); } } } \ No newline at end of file

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6954 - in trunk: core-samples/src/resources/portal-samples-war/WEB-INF and 1 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-04-08 08:38:21 -0400 (Sun, 08 Apr 2007) New Revision: 6954 Modified: trunk/core-samples/src/resources/portal-samples-war/WEB-INF/default-object.xml trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js Log: there was a bug in updating portlet markup on screen, the fragment origin of the event was updated and not what the server was targetting Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2007-04-08 10:31:41 UTC (rev 6953) +++ trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2007-04-08 12:38:21 UTC (rev 6954) @@ -235,8 +235,6 @@ } headerChars = fragment.getHeader(); - // Transform here the ajax stuff - // List supportedWindowStates = new ArrayList(); for (Iterator i = instance.getPortlet().getInfo().getCapabilities().getAllWindowStates().iterator(); i.hasNext();) @@ -273,8 +271,15 @@ // addStateActions(context, window, actionMap, windowNS.getWindowState(), supportedWindowStates); - // - contentChars = fragment.getContent(); + // Handle minimized here + if (WindowState.MINIMIZED == windowNS.getWindowState()) + { + contentChars = ""; + } + else + { + contentChars = fragment.getContent(); + } // Update window props after render if needed Boolean asynchronous = (Boolean)invocation.getAttribute(PortletInvocation.RESPONSE_PROPERTIES_SCOPE, "asynchronous"); Modified: trunk/core-samples/src/resources/portal-samples-war/WEB-INF/default-object.xml =================================================================== --- trunk/core-samples/src/resources/portal-samples-war/WEB-INF/default-object.xml 2007-04-08 10:31:41 UTC (rev 6953) +++ trunk/core-samples/src/resources/portal-samples-war/WEB-INF/default-object.xml 2007-04-08 12:38:21 UTC (rev 6954) @@ -65,8 +65,8 @@ <page-name>Test</page-name> <properties> <property> - <name>theme.ajax.object_enabled</name> - <value>false</value> + <name>theme.dyna.async_window_enabled</name> + <value>true</value> </property> <property> <name>order</name> Modified: trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-08 10:31:41 UTC (rev 6953) +++ trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-08 12:38:21 UTC (rev 6954) @@ -155,18 +155,25 @@ // Different than 1 is not good if (matchingElt != null) { - var markup = resp.fragments[id]; - markup = markup.substring(25, markup.length - 7); + var dstContainer = document.getElementById(id); + if (dstContainer != null) + { + // Get markup fragment + var markup = resp.fragments[id]; + markup = markup.substring(25, markup.length - 7); - var markupContainer = Element.up(matchingElt); + // Create a temporary element and paste the innerHTML in it + var srcContainer = document.createElement("div"); + srcContainer.innerHTML = markup; - // Create a temporary element and paste the innerHTML in it - var tmpElt = document.createElement("toto"); - tmpElt.innerHTML = markup; - - // - copyInnerHTML(tmpElt, container, "dyna-portlet") - copyInnerHTML(tmpElt, container, "dyna-handle") + // + copyInnerHTML(srcContainer, dstContainer, "dyna-portlet") + copyInnerHTML(srcContainer, dstContainer, "dyna-handle") + } + else + { + // Should log that somewhere + } } else {

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6953 - trunk/theme/src/bin/portal-ajax-war/dyna.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-04-08 06:31:41 -0400 (Sun, 08 Apr 2007) New Revision: 6953 Modified: trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js Log: make async portlet markup update don't mess up with the DnD Modified: trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-08 09:46:44 UTC (rev 6952) +++ trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-08 10:31:41 UTC (rev 6953) @@ -159,8 +159,19 @@ markup = markup.substring(25, markup.length - 7); var markupContainer = Element.up(matchingElt); - markupContainer.innerHTML = markup; + + // Create a temporary element and paste the innerHTML in it + var tmpElt = document.createElement("toto"); + tmpElt.innerHTML = markup; + + // + copyInnerHTML(tmpElt, container, "dyna-portlet") + copyInnerHTML(tmpElt, container, "dyna-handle") } + else + { + // Should log that somewhere + } } // update view state @@ -184,7 +195,38 @@ } +/* + * Copy the inner content of two zones of the provided containers. + * The zone are found using the css class names. The operation + * will succeed only if there is exactly one zone in each container. + */ +function copyInnerHTML(srcContainer, dstContainer, className) +{ + var srcs = Element.getElementsByClassName(srcContainer, className); + if (srcs.length == 1) + { + var src = srcs[0]; + // + var dsts = Element.getElementsByClassName(dstContainer, className) + if (dsts.length == 1) + { + var dst = dsts[0]; + + // Copy markup + dst.innerHTML = src.innerHTML; + } + else + { + // Should log that somewhere but + } + } + else + { + // Should log that somewhere + } +} + function footer() { // @@ -228,12 +270,15 @@ // Draggables.addObserver(new WindowMoveObserver()); + + // snapshot(); // Find the dyna portlets var portlets_on_page = document.getElementsByClassName("async-window"); - // Add listener for the dyna windows + // Add listener for the dyna windows on the dyna-window element + // and not async-window as this one will have its markup replaced for(var i = 0;i < portlets_on_page.length;i++) { var portlet = Element.up(portlets_on_page[i]); Event.observe(portlet, "click", bilto);

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6952 - in trunk/theme/src: main/org/jboss/portal/theme/impl/render/dynamic and 2 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-04-08 05:46:44 -0400 (Sun, 08 Apr 2007) New Revision: 6952 Modified: trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java trunk/theme/src/resources/test/theme-test-war/WEB-INF/web.xml trunk/theme/src/resources/test/theme-test-war/themes/style.css Log: style a bit the dyna css in tests Modified: trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-08 02:35:30 UTC (rev 6951) +++ trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-08 09:46:44 UTC (rev 6952) @@ -223,7 +223,7 @@ // Create draggable regions for(var i = 0;i < regions_on_page.length;i++) { var region = regions_on_page[i]; - Sortable.create(region, {dropOnEmpty:true,handle:"handle",tag:"div",containment:regions_on_page,constraint:false}); + Sortable.create(region, {dropOnEmpty:true,handle:"dyna-handle",tag:"div",containment:regions_on_page,constraint:false}); } // Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-04-08 02:35:30 UTC (rev 6951) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-04-08 09:46:44 UTC (rev 6952) @@ -62,7 +62,7 @@ // PrintWriter markup = rendererContext.getWriter(); markup.print("<div class=\"dyna-decoration\">\n"); - markup.print("<div class=\"handle\">"); + markup.print("<div class=\"dyna-handle\">"); delegate.render(rendererContext, drc); markup.print("</div>\n"); markup.print("</div>\n"); Modified: trunk/theme/src/resources/test/theme-test-war/WEB-INF/web.xml =================================================================== --- trunk/theme/src/resources/test/theme-test-war/WEB-INF/web.xml 2007-04-08 02:35:30 UTC (rev 6951) +++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/web.xml 2007-04-08 09:46:44 UTC (rev 6952) @@ -29,13 +29,6 @@ version="2.4"> <servlet> - <description>Handles test xmlhttprequests and callbacks from content rendered by the - TestThemeServlet</description> - <servlet-name>TestAJAXServlet</servlet-name> - <servlet-class>org.jboss.portal.test.theme.tmp.servlet.TestAJAXServlet</servlet-class> - <load-on-startup>0</load-on-startup> - </servlet> - <servlet> <description>Renders a theme for testing</description> <servlet-name>TestServlet</servlet-name> <servlet-class>org.jboss.portal.test.theme.TestServlet</servlet-class> Modified: trunk/theme/src/resources/test/theme-test-war/themes/style.css =================================================================== --- trunk/theme/src/resources/test/theme-test-war/themes/style.css 2007-04-08 02:35:30 UTC (rev 6951) +++ trunk/theme/src/resources/test/theme-test-war/themes/style.css 2007-04-08 09:46:44 UTC (rev 6952) @@ -1,3 +1,4 @@ +/* Test renderer styling. */ div.test-region { border: 0px; @@ -23,4 +24,10 @@ border:1px solid black; height:127px; background-color:yellow; +} + +/* Dyna renderer styling. */ + +div.dyna-handle:hover { + cursor:move; } \ No newline at end of file

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6951 - trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-04-07 22:35:30 -0400 (Sat, 07 Apr 2007) New Revision: 6951 Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/MarkupEndpoint.java trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/PortletManagementEndpoint.java trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/RegistrationEndpoint.java trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/ServiceDescriptionEndpoint.java trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java Log: - Workaround for JBWS-1515: force access to the HttpSession by endpoints so that cookies are properly transmitted to the client side. Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/MarkupEndpoint.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/MarkupEndpoint.java 2007-04-07 23:00:43 UTC (rev 6950) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/MarkupEndpoint.java 2007-04-08 02:35:30 UTC (rev 6951) @@ -57,21 +57,25 @@ { public MarkupResponse getMarkup(GetMarkup getMarkup) throws UnsupportedWindowStateFault, InvalidCookieFault, InvalidSessionFault, AccessDeniedFault, InconsistentParametersFault, InvalidHandleFault, UnsupportedLocaleFault, UnsupportedModeFault, OperationFailedFault, MissingParametersFault, InvalidUserCategoryFault, InvalidRegistrationFault, UnsupportedMimeTypeFault, RemoteException { + forceSessionAccess(); return producer.getMarkup(getMarkup); } public BlockingInteractionResponse performBlockingInteraction(PerformBlockingInteraction performBlockingInteraction) throws InvalidSessionFault, UnsupportedModeFault, UnsupportedMimeTypeFault, OperationFailedFault, UnsupportedWindowStateFault, UnsupportedLocaleFault, AccessDeniedFault, PortletStateChangeRequiredFault, InvalidRegistrationFault, MissingParametersFault, InvalidUserCategoryFault, InconsistentParametersFault, InvalidHandleFault, InvalidCookieFault, RemoteException { + forceSessionAccess(); return producer.performBlockingInteraction(performBlockingInteraction); } public ReturnAny releaseSessions(ReleaseSessions releaseSessions) throws InvalidRegistrationFault, OperationFailedFault, MissingParametersFault, AccessDeniedFault, RemoteException { + forceSessionAccess(); return producer.releaseSessions(releaseSessions); } public ReturnAny initCookie(InitCookie initCookie) throws AccessDeniedFault, OperationFailedFault, InvalidRegistrationFault, RemoteException { + forceSessionAccess(); return producer.initCookie(initCookie); } } Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/PortletManagementEndpoint.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/PortletManagementEndpoint.java 2007-04-07 23:00:43 UTC (rev 6950) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/PortletManagementEndpoint.java 2007-04-08 02:35:30 UTC (rev 6951) @@ -55,31 +55,37 @@ public PortletDescriptionResponse getPortletDescription(GetPortletDescription getPortletDescription) throws AccessDeniedFault, InvalidHandleFault, InvalidUserCategoryFault, InconsistentParametersFault, MissingParametersFault, InvalidRegistrationFault, OperationFailedFault, RemoteException { + forceSessionAccess(); return producer.getPortletDescription(getPortletDescription); } public PortletContext clonePortlet(ClonePortlet clonePortlet) throws InvalidUserCategoryFault, AccessDeniedFault, OperationFailedFault, InvalidHandleFault, InvalidRegistrationFault, InconsistentParametersFault, MissingParametersFault, RemoteException { + forceSessionAccess(); return producer.clonePortlet(clonePortlet); } public DestroyPortletsResponse destroyPortlets(DestroyPortlets destroyPortlets) throws InconsistentParametersFault, MissingParametersFault, InvalidRegistrationFault, OperationFailedFault, RemoteException { + forceSessionAccess(); return producer.destroyPortlets(destroyPortlets); } public PortletContext setPortletProperties(SetPortletProperties setPortletProperties) throws OperationFailedFault, InvalidHandleFault, MissingParametersFault, InconsistentParametersFault, InvalidUserCategoryFault, AccessDeniedFault, InvalidRegistrationFault, RemoteException { + forceSessionAccess(); return producer.setPortletProperties(setPortletProperties); } public PropertyList getPortletProperties(GetPortletProperties getPortletProperties) throws InvalidHandleFault, MissingParametersFault, InvalidRegistrationFault, AccessDeniedFault, OperationFailedFault, InconsistentParametersFault, InvalidUserCategoryFault, RemoteException { + forceSessionAccess(); return producer.getPortletProperties(getPortletProperties); } public PortletPropertyDescriptionResponse getPortletPropertyDescription(GetPortletPropertyDescription getPortletPropertyDescription) throws MissingParametersFault, InconsistentParametersFault, InvalidUserCategoryFault, InvalidRegistrationFault, AccessDeniedFault, InvalidHandleFault, OperationFailedFault, RemoteException { + forceSessionAccess(); return producer.getPortletPropertyDescription(getPortletPropertyDescription); } } Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/RegistrationEndpoint.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/RegistrationEndpoint.java 2007-04-07 23:00:43 UTC (rev 6950) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/RegistrationEndpoint.java 2007-04-08 02:35:30 UTC (rev 6951) @@ -45,18 +45,21 @@ public RegistrationContext register(RegistrationData register) throws MissingParametersFault, OperationFailedFault, RemoteException { + forceSessionAccess(); return producer.register(register); } public ReturnAny deregister(RegistrationContext deregister) throws OperationFailedFault, InvalidRegistrationFault, RemoteException { + forceSessionAccess(); return producer.deregister(deregister); } public RegistrationState modifyRegistration(ModifyRegistration modifyRegistration) throws MissingParametersFault, OperationFailedFault, InvalidRegistrationFault, RemoteException { + forceSessionAccess(); return producer.modifyRegistration(modifyRegistration); } } Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/ServiceDescriptionEndpoint.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/ServiceDescriptionEndpoint.java 2007-04-07 23:00:43 UTC (rev 6950) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/ServiceDescriptionEndpoint.java 2007-04-08 02:35:30 UTC (rev 6951) @@ -40,6 +40,7 @@ public ServiceDescription getServiceDescription(GetServiceDescription gs) throws InvalidRegistrationFault, OperationFailedFault, RemoteException { + forceSessionAccess(); return producer.getServiceDescription(gs); } } Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java 2007-04-07 23:00:43 UTC (rev 6950) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java 2007-04-08 02:35:30 UTC (rev 6951) @@ -53,6 +53,12 @@ producer = (WSRPProducer)JMX.getMBeanProxy(WSRPProducer.class, WSRPConstants.WSRP_PRODUCER_OBJECT_NAME); } + protected void forceSessionAccess() + { + // force access to HttpSession to bypass JBWS optimization and allow cookies to be transmitted to client see: JBWS-1515 + context.getHttpSession(); + } + protected WSRPProducer producer; protected ServletEndpointContext context; }

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6950 - in trunk/theme: src/bin and 1 other directory.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-04-07 19:00:43 -0400 (Sat, 07 Apr 2007) New Revision: 6950 Removed: trunk/theme/src/bin/test/ Modified: trunk/theme/build.xml Log: merge theme-test-war that was spanning over bin and resource dirs Modified: trunk/theme/build.xml =================================================================== --- trunk/theme/build.xml 2007-04-07 22:58:18 UTC (rev 6949) +++ trunk/theme/build.xml 2007-04-07 23:00:43 UTC (rev 6950) @@ -167,12 +167,6 @@ <fileset dir="${build.classes}" excludes="org/jboss/portal/test/**"/> </jar> -  - <copy todir="${build.resources}/portal-ajax-war"> <fileset dir="${source.bin}/portal-ajax-war"/> <fileset dir="${source.resources}/portal-ajax-war"/> @@ -229,7 +223,6 @@ description="Packages all the test-related artifacts. Does NOT compile classes so this should be done before calling this task."> <jar jarfile="${build.lib}/theme-test.war"> - <fileset dir="${source.bin}/test/theme-test-war"/> <fileset dir="${source.bin}/portal-ajax-war" includes="dyna/**"/> <fileset dir="${build.resources}/test/theme-test-war"/> </jar>

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6949 - in trunk/theme/src: bin/test/theme-test-war/WEB-INF and 4 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-04-07 18:58:18 -0400 (Sat, 07 Apr 2007) New Revision: 6949 Added: trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-renderSet.xml trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-themes.xml trunk/theme/src/resources/test/theme-test-war/file.txt trunk/theme/src/resources/test/theme-test-war/layouts/ trunk/theme/src/resources/test/theme-test-war/layouts/generic/ trunk/theme/src/resources/test/theme-test-war/themes/ trunk/theme/src/resources/test/theme-test-war/themes/style.css Removed: trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-layouts.xml trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-renderSet.xml trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-themes.xml trunk/theme/src/bin/test/theme-test-war/file.txt trunk/theme/src/bin/test/theme-test-war/jsunit/ trunk/theme/src/bin/test/theme-test-war/layouts/ trunk/theme/src/bin/test/theme-test-war/themes/ trunk/theme/src/resources/test/theme-test-war/layouts/generic/ trunk/theme/src/resources/test/theme-test-war/themes/style.css Log: merge theme-test-war that was spanning over bin and resource dirs Deleted: trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-layouts.xml =================================================================== --- trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-layouts.xml 2007-04-07 22:52:49 UTC (rev 6948) +++ trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-layouts.xml 2007-04-07 22:58:18 UTC (rev 6949) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<layouts> - <layout> - <name>generic</name> - <uri>/layouts/generic/index.jsp</uri> - <uri state="maximized">/layouts/generic/maximized.jsp</uri> - <regions> - <region name="left"/> - <region name="center"/> - <region name="navigation"/> - </regions> - </layout> -</layouts> Deleted: trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-renderSet.xml =================================================================== --- trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-renderSet.xml 2007-04-07 22:52:49 UTC (rev 6948) +++ trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-renderSet.xml 2007-04-07 22:58:18 UTC (rev 6949) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<portal-renderSet> - <renderSet name="divRenderer"> - <set content-type="text/html"> - <ajax-enabled>true</ajax-enabled> - <region-renderer>org.jboss.portal.theme.impl.render.div.DivRegionRenderer</region-renderer> - <window-renderer>org.jboss.portal.theme.impl.render.div.DivWindowRenderer</window-renderer> - <portlet-renderer>org.jboss.portal.theme.impl.render.div.DivPortletRenderer</portlet-renderer> - <decoration-renderer>org.jboss.portal.theme.impl.render.div.DivDecorationRenderer</decoration-renderer> - </set> - </renderSet> - <renderSet name="emptyRenderer"> - <set content-type="text/html"> - <ajax-enabled>true</ajax-enabled> - <region-renderer>org.jboss.portal.theme.impl.render.empty.EmptyRegionRenderer</region-renderer> - <window-renderer>org.jboss.portal.theme.impl.render.empty.EmptyWindowRenderer</window-renderer> - <portlet-renderer>org.jboss.portal.theme.impl.render.empty.EmptyPortletRenderer</portlet-renderer> - <decoration-renderer>org.jboss.portal.theme.impl.render.empty.EmptyDecorationRenderer</decoration-renderer> - </set> - </renderSet> - <renderSet name="testRenderer"> - <set content-type="text/html"> - <ajax-enabled>true</ajax-enabled> - <region-renderer>org.jboss.portal.test.theme.render.TestRegionRenderer</region-renderer> - <window-renderer>org.jboss.portal.test.theme.render.TestWindowRenderer</window-renderer> - <portlet-renderer>org.jboss.portal.test.theme.render.TestPortletRenderer</portlet-renderer> - <decoration-renderer>org.jboss.portal.test.theme.render.TestDecorationRenderer</decoration-renderer> - </set> - </renderSet> -</portal-renderSet> Deleted: trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-themes.xml =================================================================== --- trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-themes.xml 2007-04-07 22:52:49 UTC (rev 6948) +++ trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-themes.xml 2007-04-07 22:58:18 UTC (rev 6949) @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<themes> - <theme> - <name>testTheme</name> - <link rel="stylesheet" id="main_css" href="/themes/style.css" type="text/css"/> - </theme> -</themes> \ No newline at end of file Deleted: trunk/theme/src/bin/test/theme-test-war/file.txt =================================================================== --- trunk/theme/src/bin/test/theme-test-war/file.txt 2007-04-07 22:52:49 UTC (rev 6948) +++ trunk/theme/src/bin/test/theme-test-war/file.txt 2007-04-07 22:58:18 UTC (rev 6949) @@ -1 +0,0 @@ -Content of the file Copied: trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-renderSet.xml (from rev 6941, trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-renderSet.xml) =================================================================== --- trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-renderSet.xml (rev 0) +++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-renderSet.xml 2007-04-07 22:58:18 UTC (rev 6949) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<portal-renderSet> + <renderSet name="divRenderer"> + <set content-type="text/html"> + <ajax-enabled>true</ajax-enabled> + <region-renderer>org.jboss.portal.theme.impl.render.div.DivRegionRenderer</region-renderer> + <window-renderer>org.jboss.portal.theme.impl.render.div.DivWindowRenderer</window-renderer> + <portlet-renderer>org.jboss.portal.theme.impl.render.div.DivPortletRenderer</portlet-renderer> + <decoration-renderer>org.jboss.portal.theme.impl.render.div.DivDecorationRenderer</decoration-renderer> + </set> + </renderSet> + <renderSet name="emptyRenderer"> + <set content-type="text/html"> + <ajax-enabled>true</ajax-enabled> + <region-renderer>org.jboss.portal.theme.impl.render.empty.EmptyRegionRenderer</region-renderer> + <window-renderer>org.jboss.portal.theme.impl.render.empty.EmptyWindowRenderer</window-renderer> + <portlet-renderer>org.jboss.portal.theme.impl.render.empty.EmptyPortletRenderer</portlet-renderer> + <decoration-renderer>org.jboss.portal.theme.impl.render.empty.EmptyDecorationRenderer</decoration-renderer> + </set> + </renderSet> + <renderSet name="testRenderer"> + <set content-type="text/html"> + <ajax-enabled>true</ajax-enabled> + <region-renderer>org.jboss.portal.test.theme.render.TestRegionRenderer</region-renderer> + <window-renderer>org.jboss.portal.test.theme.render.TestWindowRenderer</window-renderer> + <portlet-renderer>org.jboss.portal.test.theme.render.TestPortletRenderer</portlet-renderer> + <decoration-renderer>org.jboss.portal.test.theme.render.TestDecorationRenderer</decoration-renderer> + </set> + </renderSet> +</portal-renderSet> Copied: trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-themes.xml (from rev 6941, trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-themes.xml) =================================================================== --- trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-themes.xml (rev 0) +++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-themes.xml 2007-04-07 22:58:18 UTC (rev 6949) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<themes> + <theme> + <name>testTheme</name> + <link rel="stylesheet" id="main_css" href="/themes/style.css" type="text/css"/> + </theme> +</themes> \ No newline at end of file Copied: trunk/theme/src/resources/test/theme-test-war/file.txt (from rev 6945, trunk/theme/src/bin/test/theme-test-war/file.txt) =================================================================== --- trunk/theme/src/resources/test/theme-test-war/file.txt (rev 0) +++ trunk/theme/src/resources/test/theme-test-war/file.txt 2007-04-07 22:58:18 UTC (rev 6949) @@ -0,0 +1 @@ +Content of the file Copied: trunk/theme/src/resources/test/theme-test-war/layouts (from rev 6941, trunk/theme/src/bin/test/theme-test-war/layouts) Copied: trunk/theme/src/resources/test/theme-test-war/layouts/generic (from rev 6948, trunk/theme/src/bin/test/theme-test-war/layouts/generic) Copied: trunk/theme/src/resources/test/theme-test-war/themes (from rev 6941, trunk/theme/src/bin/test/theme-test-war/themes) Deleted: trunk/theme/src/resources/test/theme-test-war/themes/style.css =================================================================== --- trunk/theme/src/bin/test/theme-test-war/themes/style.css 2007-04-07 00:31:37 UTC (rev 6941) +++ trunk/theme/src/resources/test/theme-test-war/themes/style.css 2007-04-07 22:58:18 UTC (rev 6949) @@ -1,26 +0,0 @@ - -div.test-region { - border: 0px; - margin:16px; - width:512px; - padding:0px; - background-color:red; -} - -div.test-window { - border:1px solid black; - padding:15px; - background-color:blue; -} - -div.test-decoration { - border:1px solid black; - height:31px; - background-color:green; -} - -div.test-portlet { - border:1px solid black; - height:127px; - background-color:yellow; -} \ No newline at end of file Copied: trunk/theme/src/resources/test/theme-test-war/themes/style.css (from rev 6948, trunk/theme/src/bin/test/theme-test-war/themes/style.css) =================================================================== --- trunk/theme/src/resources/test/theme-test-war/themes/style.css (rev 0) +++ trunk/theme/src/resources/test/theme-test-war/themes/style.css 2007-04-07 22:58:18 UTC (rev 6949) @@ -0,0 +1,26 @@ + +div.test-region { + border: 0px; + margin:16px; + width:512px; + padding:0px; + background-color:red; +} + +div.test-window { + border:1px solid black; + padding:15px; + background-color:blue; +} + +div.test-decoration { + border:1px solid black; + height:31px; + background-color:green; +} + +div.test-portlet { + border:1px solid black; + height:127px; + background-color:yellow; +} \ No newline at end of file

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6948 - in trunk: core/src/main/org/jboss/portal/core/aspects/portlet and 15 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-04-07 18:52:49 -0400 (Sat, 07 Apr 2007) New Revision: 6948 Added: trunk/core/src/main/org/jboss/portal/core/aspects/portlet/AjaxInterceptor.java trunk/core/src/main/org/jboss/portal/core/metadata/portlet/AjaxMetaData.java Modified: trunk/core-samples/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet.xml trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java trunk/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java trunk/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java trunk/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java trunk/core/src/main/org/jboss/portal/core/model/instance/command/InvokePortletInstanceRenderCommand.java trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml trunk/core/src/resources/portal-core-sar/conf/standardjboss-portlet.xml trunk/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd trunk/theme/src/main/org/jboss/portal/test/theme/TestContext.java trunk/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java trunk/theme/src/main/org/jboss/portal/test/theme/tmp/render/TestRenderedMarkup.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java trunk/theme/src/main/org/jboss/portal/theme/page/WindowContext.java trunk/theme/src/main/org/jboss/portal/theme/page/WindowResult.java trunk/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java Log: added capability in jboss-portlet.xml to configure whether or not a portlet wants to be updated asynchronously Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-04-07 21:10:13 UTC (rev 6947) +++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-04-07 22:52:49 UTC (rev 6948) @@ -122,7 +122,7 @@ windowProps.put(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER, "emptyRenderer"); windowProps.put(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER, "emptyRenderer"); windowProps.put(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER, "emptyRenderer"); - WindowResult res = new WindowResult("", tabbedNav.toString(), Collections.EMPTY_MAP, windowProps, null, null, WindowState.NORMAL, Mode.VIEW); + WindowResult res = new WindowResult("", tabbedNav.toString(), Collections.EMPTY_MAP, windowProps, null, WindowState.NORMAL, Mode.VIEW); WindowContext blah = new WindowContext("BLAH", "BLAH", "navigation", 0, res); rendition.getPageResult().addWindowContext(blah); @@ -140,7 +140,7 @@ windowProps.put(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER, "emptyRenderer"); windowProps.put(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER, "emptyRenderer"); windowProps.put(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER, "emptyRenderer"); - WindowResult res = new WindowResult("", dashboardNav.toString(), Collections.EMPTY_MAP, windowProps, null, null, WindowState.NORMAL, Mode.VIEW); + WindowResult res = new WindowResult("", dashboardNav.toString(), Collections.EMPTY_MAP, windowProps, null, WindowState.NORMAL, Mode.VIEW); WindowContext bluh = new WindowContext("BLUH", "BLUH", "dashboardnav", 0, res); rendition.getPageResult().addWindowContext(bluh); Added: trunk/core/src/main/org/jboss/portal/core/aspects/portlet/AjaxInterceptor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/aspects/portlet/AjaxInterceptor.java (rev 0) +++ trunk/core/src/main/org/jboss/portal/core/aspects/portlet/AjaxInterceptor.java 2007-04-07 22:52:49 UTC (rev 6948) @@ -0,0 +1,69 @@ +/****************************************************************************** + * 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.aspects.portlet; + +import org.jboss.portal.portlet.invocation.PortletInterceptor; +import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.invocation.response.FragmentResponse; +import org.jboss.portal.portlet.impl.jsr168.info.ContainerPortletInfo; +import org.jboss.portal.portlet.container.PortletContainerInvoker; +import org.jboss.portal.portlet.container.PortletContainer; +import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.portal.core.metadata.portlet.JBossPortletMetaData; +import org.jboss.portal.core.metadata.portlet.AjaxMetaData; + +/** + * Look at the portlet ajax meta data. + * + * Improve later when we will have the structure to build real portlet runtime meta information. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class AjaxInterceptor extends PortletInterceptor +{ + + protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException + { + PortletInvocationResponse response = (PortletInvocationResponse)invocation.invokeNext(); + + // + if (response instanceof FragmentResponse) + { + PortletContainer container = ((ContainerPortletInfo)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO)).getContainer(); + JBossPortletMetaData portletMD = (JBossPortletMetaData)container.getJBossMetaData(); + if (portletMD != null) + { + AjaxMetaData ajax = portletMD.getAjax(); + if (ajax != null) + { + invocation.setAttribute(PortletInvocation.RESPONSE_PROPERTIES_SCOPE, "asynchronous", ajax.getAsynchronous()); + } + } + } + + // + return response; + } +} Modified: trunk/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java 2007-04-07 21:10:13 UTC (rev 6947) +++ trunk/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java 2007-04-07 22:52:49 UTC (rev 6948) @@ -34,7 +34,6 @@ import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.response.FragmentResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.info.PortletInfo; import java.io.StringWriter; import java.util.Iterator; @@ -57,8 +56,13 @@ { FragmentResponse fragment = (FragmentResponse)response; + // The buffer that may become non null if we have content to write in it + StringWriter buffer = null; + + // Get existing header which may be null + String headerChars = fragment.getHeader(); + // Add declaratively injected header content here (get it via the component) - String headerChars = fragment.getHeader(); // Chris' modif: note that the header might to be re-written... PortletContainer container = ((ContainerPortletInfo)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER_INFO)).getContainer(); JBossPortletMetaData portletMD = (JBossPortletMetaData)container.getJBossMetaData(); if (portletMD != null) @@ -66,17 +70,37 @@ HeaderContentMetaData headerContent = portletMD.getHeaderContent(); if (headerContent != null) { + // Init the buffer + buffer = initBuffer(headerChars); + + // Get the context path String contextPath = (String)invocation.getDispatchedRequest().getAttribute("javax.servlet.include.context_path"); - StringWriter writer = new StringWriter(100); - if (headerChars != null) - { - writer.write(headerChars); - } - write(headerContent, writer, contextPath); - headerChars = writer.toString(); + + // Render header + render(headerContent, buffer, contextPath); } } + // Add header content coming from the response written by the portlet at runtime + String headerContent = (String)invocation.getAttribute(PortletInvocation.RESPONSE_PROPERTIES_SCOPE, "HEADER_CONTENT"); + if (headerContent != null) + { + // Init buffer if needed + if (buffer == null) + { + buffer = initBuffer(headerChars); + } + + // Append the content as it is + buffer.write(headerContent); + } + + // If the buffer is not empty, use it + if (buffer != null) + { + headerChars = buffer.toString(); + } + // fragment.setHeader(headerChars); } @@ -85,8 +109,29 @@ return response; } - protected void write(HeaderContentMetaData headerContent, StringWriter writer, String contextPath) + private StringWriter initBuffer(String existingBuffer) { + if (existingBuffer != null) + { + StringWriter buffer = new StringWriter(existingBuffer.length() + 100); + buffer.write(existingBuffer); + return buffer; + } + else + { + return new StringWriter(100); + } + } + + /** + * Render the header content provided by the portlet meta data. + * + * @param headerContent + * @param writer + * @param contextPath + */ + protected void render(HeaderContentMetaData headerContent, StringWriter writer, String contextPath) + { for (Iterator i = headerContent.getElements().iterator(); i.hasNext();) { ElementMetaData elementMD = (ElementMetaData)i.next(); Modified: trunk/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java 2007-04-07 21:10:13 UTC (rev 6947) +++ trunk/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java 2007-04-07 22:52:49 UTC (rev 6948) @@ -27,6 +27,7 @@ import org.jboss.portal.core.metadata.portlet.JBossApplicationMetaData; import org.jboss.portal.core.metadata.portlet.JBossPortletMetaData; import org.jboss.portal.core.metadata.portlet.ElementMetaData; +import org.jboss.portal.core.metadata.portlet.AjaxMetaData; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; @@ -67,6 +68,10 @@ { child = new HeaderContentMetaData(); } + else if ("ajax".equals(localName)) + { + child = new AjaxMetaData(); + } } else if (object instanceof HeaderContentMetaData) { @@ -119,6 +124,12 @@ JBossPortletMetaData portlet = (JBossPortletMetaData)parent; portlet.setHeaderContent(headerContent); } + else if (child instanceof AjaxMetaData) + { + AjaxMetaData ajax = (AjaxMetaData)child; + JBossPortletMetaData portlet = (JBossPortletMetaData)parent; + portlet.setAjax(ajax); + } else if (child instanceof ElementMetaData) { ElementMetaData element = (ElementMetaData)child; @@ -158,6 +169,14 @@ elt.init(); } } + else if (object instanceof AjaxMetaData) + { + if ("asynchronous".equals(localName)) + { + AjaxMetaData ajax = (AjaxMetaData)object; + ajax.setAsynchronous(Boolean.valueOf(value)); + } + } else { super.setValue(object, nav, nsURI, localName, value); Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2007-04-07 21:10:13 UTC (rev 6947) +++ trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2007-04-07 22:52:49 UTC (rev 6948) @@ -58,6 +58,7 @@ import org.jboss.portal.portlet.invocation.response.InsufficientPrivilegesResponse; import org.jboss.portal.theme.page.WindowResult; import org.jboss.portal.theme.render.renderer.ActionRendererContext; +import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.util.Exceptions; @@ -169,7 +170,7 @@ String contentChars; String headerChars = null; Map actionMap = new HashMap(); - Map windowProps = window.getDeclaredProperties(); + Map windowProps = new HashMap(window.getDeclaredProperties()); // try @@ -234,6 +235,8 @@ } headerChars = fragment.getHeader(); + // Transform here the ajax stuff + // List supportedWindowStates = new ArrayList(); for (Iterator i = instance.getPortlet().getInfo().getCapabilities().getAllWindowStates().iterator(); i.hasNext();) @@ -273,13 +276,20 @@ // contentChars = fragment.getContent(); + // Update window props after render if needed + Boolean asynchronous = (Boolean)invocation.getAttribute(PortletInvocation.RESPONSE_PROPERTIES_SCOPE, "asynchronous"); + if (asynchronous != null) + { + DynaRenderOptions options = DynaRenderOptions.getOptions(null, asynchronous); + options.setOptions(windowProps); + } + // return new WindowResult( windowTitle, contentChars, actionMap, windowProps, - new Properties(), headerChars, windowNS.getWindowState(), windowNS.getMode()); @@ -299,7 +309,7 @@ { contentChars = Exceptions.toHTML(t, true); } - return new WindowResult(windowTitle, contentChars, actionMap, windowProps, new Properties(), headerChars, windowNS.getWindowState(), windowNS.getMode()); + return new WindowResult(windowTitle, contentChars, actionMap, windowProps, headerChars, windowNS.getWindowState(), windowNS.getMode()); } } else if (response instanceof UnavailableResponse) @@ -311,7 +321,7 @@ actionMap = new HashMap(); actionMap.put(ActionRendererContext.MODES_KEY, Collections.EMPTY_LIST); actionMap.put(ActionRendererContext.WINDOWSTATES_KEY, Collections.EMPTY_LIST); - return new WindowResult(windowTitle, contentChars, actionMap, windowProps, new Properties(), headerChars, windowNS.getWindowState(), windowNS.getMode()); + return new WindowResult(windowTitle, contentChars, actionMap, windowProps, headerChars, windowNS.getWindowState(), windowNS.getMode()); } } else if (response instanceof InsufficientPrivilegesResponse) @@ -336,7 +346,7 @@ actionMap.put(ActionRendererContext.WINDOWSTATES_KEY, Collections.EMPTY_LIST); windowTitle = "Access denied"; contentChars = "Access denied"; - return new WindowResult(windowTitle, contentChars, actionMap, windowProps, new Properties(), headerChars, windowNS.getWindowState(), windowNS.getMode()); + return new WindowResult(windowTitle, contentChars, actionMap, windowProps, headerChars, windowNS.getWindowState(), windowNS.getMode()); } } catch (ResourceNotFoundException e) @@ -351,7 +361,7 @@ actionMap.put(ActionRendererContext.WINDOWSTATES_KEY, Collections.EMPTY_LIST); windowTitle = "Cannot render"; contentChars = "Object not found " + e.getRef(); - return new WindowResult(windowTitle, contentChars, actionMap, windowProps, new Properties(), headerChars, windowNS.getWindowState(), windowNS.getMode()); + return new WindowResult(windowTitle, contentChars, actionMap, windowProps, headerChars, windowNS.getWindowState(), windowNS.getMode()); } } catch (ControllerException e) @@ -367,7 +377,7 @@ { windowTitle = "An internal error occured while rendering window '" + window + "'"; contentChars = Exceptions.toHTML(e, true); - return new WindowResult(windowTitle, contentChars, actionMap, windowProps, new Properties(), headerChars, windowNS.getWindowState(), windowNS.getMode()); + return new WindowResult(windowTitle, contentChars, actionMap, windowProps, headerChars, windowNS.getWindowState(), windowNS.getMode()); } } Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2007-04-07 21:10:13 UTC (rev 6947) +++ trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2007-04-07 22:52:49 UTC (rev 6948) @@ -198,13 +198,10 @@ WindowResult result = (WindowResult)o; // - Map props = new HashMap(result.getWindowProperties()); + Map props = result.getProperties(); props.put("theme.windowRendererId", "emptyRenderer"); props.put("theme.decorationRendererId", "emptyRenderer"); props.put("theme.portletRendererId", "emptyRenderer"); - - // - result.setWindowProperties(props); } // Added: trunk/core/src/main/org/jboss/portal/core/metadata/portlet/AjaxMetaData.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/metadata/portlet/AjaxMetaData.java (rev 0) +++ trunk/core/src/main/org/jboss/portal/core/metadata/portlet/AjaxMetaData.java 2007-04-07 22:52:49 UTC (rev 6948) @@ -0,0 +1,44 @@ +/****************************************************************************** + * 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.metadata.portlet; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class AjaxMetaData +{ + + /** . */ + private Boolean asynchronous; + + public Boolean getAsynchronous() + { + return asynchronous; + } + + public void setAsynchronous(Boolean asynchronous) + { + this.asynchronous = asynchronous; + } +} Modified: trunk/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java 2007-04-07 21:10:13 UTC (rev 6947) +++ trunk/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java 2007-04-07 22:52:49 UTC (rev 6948) @@ -32,6 +32,9 @@ /** . */ private HeaderContentMetaData headerContent; + /** . */ + private AjaxMetaData ajax; + public HeaderContentMetaData getHeaderContent() { return headerContent; @@ -41,4 +44,38 @@ { this.headerContent = headerContent; } + + public AjaxMetaData getAjax() + { + return ajax; + } + + public void setAjax(AjaxMetaData ajax) + { + this.ajax = ajax; + } + + public void merge(org.jboss.portal.portlet.metadata.JBossPortletMetaData portlet) + { + super.merge(portlet); + + // We handle the core extension here + if (portlet instanceof JBossPortletMetaData) + { + JBossPortletMetaData portletExt = (JBossPortletMetaData)portlet; + if (ajax == null) + { + // If not defined we use the default ajax configuration + ajax = portletExt.getAjax(); + } + else + { + // If no asynchronous value provided use the one provided by the default + if (ajax.getAsynchronous() == null) + { + ajax.setAsynchronous(portletExt.getAjax().getAsynchronous()); + } + } + } + } } Modified: trunk/core/src/main/org/jboss/portal/core/model/instance/command/InvokePortletInstanceRenderCommand.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/instance/command/InvokePortletInstanceRenderCommand.java 2007-04-07 21:10:13 UTC (rev 6947) +++ trunk/core/src/main/org/jboss/portal/core/model/instance/command/InvokePortletInstanceRenderCommand.java 2007-04-07 22:52:49 UTC (rev 6948) @@ -108,7 +108,7 @@ windowProps.put(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER, "emptyRenderer"); // - WindowResult res = new WindowResult("", content, Collections.EMPTY_MAP, windowProps, null, null, WindowState.MAXIMIZED, Mode.VIEW); + WindowResult res = new WindowResult("", content, Collections.EMPTY_MAP, windowProps, null, WindowState.MAXIMIZED, Mode.VIEW); WindowContext blah = new WindowContext("BILTO", "BILTO", "maximized", 0, res); result.addWindowContext(blah); Modified: trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-04-07 21:10:13 UTC (rev 6947) +++ trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-04-07 22:52:49 UTC (rev 6948) @@ -344,6 +344,13 @@ <xmbean/> </mbean> <mbean + code="org.jboss.portal.core.aspects.portlet.AjaxInterceptor" + name="portal:service=Interceptor,type=Portlet,name=Ajax" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + </mbean> + <mbean code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" name="portal:service=InterceptorStackFactory,type=Producer" xmbean-dd="" @@ -358,6 +365,7 @@ <depends-list-element>portal:service=Interceptor,type=Portlet,name=WindowStates</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Portlet,name=Bridge</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Portlet,name=Modes</depends-list-element> + <depends-list-element>portal:service=Interceptor,type=Portlet,name=Ajax</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Portlet,name=ProducerCache</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Portlet,name=Header</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Portlet,name=Transaction</depends-list-element> Modified: trunk/core/src/resources/portal-core-sar/conf/standardjboss-portlet.xml =================================================================== --- trunk/core/src/resources/portal-core-sar/conf/standardjboss-portlet.xml 2007-04-07 21:10:13 UTC (rev 6947) +++ trunk/core/src/resources/portal-core-sar/conf/standardjboss-portlet.xml 2007-04-07 22:52:49 UTC (rev 6948) @@ -25,6 +25,9 @@ <portlet> <portlet-name>DefaultPortlet</portlet-name> <remotable>false</remotable> + <ajax> + <asynchronous>true</asynchronous> + </ajax> <transaction> <trans-attribute>NotSupported</trans-attribute> </transaction> Modified: trunk/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd =================================================================== --- trunk/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd 2007-04-07 21:10:13 UTC (rev 6947) +++ trunk/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd 2007-04-07 22:52:49 UTC (rev 6948) @@ -65,7 +65,7 @@ </portlet> --> -<!ELEMENT portlet (portlet-name,remotable?,session-config?,transaction?,header-content?)> +<!ELEMENT portlet (portlet-name,remotable?,ajax?,session-config?,transaction?,header-content?)>  +<!ELEMENT ajax (asynchronous)> + + +<!ELEMENT asynchronous (#PCDATA)> + +<!-- This element configure the portlet session of the portlet. The distributed element instructs the container to distribute the session attributes using the Modified: trunk/core-samples/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml =================================================================== --- trunk/core-samples/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml 2007-04-07 21:10:13 UTC (rev 6947) +++ trunk/core-samples/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml 2007-04-07 22:52:49 UTC (rev 6948) @@ -79,8 +79,17 @@ </portlet> <portlet> <portlet-name>URLPortlet</portlet-name> + <ajax> + <asynchronous>false</asynchronous> + </ajax> </portlet> <portlet> + <portlet-name>AsyncURLPortlet</portlet-name> + <ajax> + <asynchronous>true</asynchronous> + </ajax> + </portlet> + <portlet> <portlet-name>BasicPortlet</portlet-name> </portlet> Modified: trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml =================================================================== --- trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml 2007-04-07 21:10:13 UTC (rev 6947) +++ trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml 2007-04-07 22:52:49 UTC (rev 6948) @@ -76,6 +76,12 @@ </deployment> <deployment> <instance> + <instance-id>AsyncURLPortletInstance</instance-id> + <portlet-ref>AsyncURLPortlet</portlet-ref> + </instance> + </deployment> + <deployment> + <instance> <instance-id>TestPortletInstance</instance-id> <portlet-ref>TestPortlet</portlet-ref> </instance> Modified: trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet.xml =================================================================== --- trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet.xml 2007-04-07 21:10:13 UTC (rev 6947) +++ trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet.xml 2007-04-07 22:52:49 UTC (rev 6948) @@ -322,6 +322,20 @@ </portlet-info> </portlet> <portlet> + <description>Async URL Portlet</description> + <portlet-name>AsyncURLPortlet</portlet-name> + <display-name>Async URL Portlet</display-name> + <portlet-class>org.jboss.portal.core.portlet.test.URLPortlet</portlet-class> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>VIEW</portlet-mode> + </supports> + <portlet-info> + <title>URL Portlet</title> + <keywords>sample,test</keywords> + </portlet-info> + </portlet> + <portlet> <portlet-name>BasicPortlet</portlet-name> <portlet-class>org.jboss.portal.core.portlet.test.BasicPortlet</portlet-class> <display-name>Basic Portlet</display-name> Modified: trunk/theme/src/main/org/jboss/portal/test/theme/TestContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/TestContext.java 2007-04-07 21:10:13 UTC (rev 6947) +++ trunk/theme/src/main/org/jboss/portal/test/theme/TestContext.java 2007-04-07 22:52:49 UTC (rev 6948) @@ -86,7 +86,6 @@ new HashMap(), null, null, - null, null); } } Modified: trunk/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java 2007-04-07 21:10:13 UTC (rev 6947) +++ trunk/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java 2007-04-07 22:52:49 UTC (rev 6948) @@ -124,9 +124,8 @@ { // setup the window result Map actionsMap = Collections.EMPTY_MAP; - Properties responseProps = null; String headerChars = null; - return new WindowResult(title, content, actionsMap, windowProps, responseProps, headerChars, null, null); + return new WindowResult(title, content, actionsMap, windowProps, headerChars, null, null); } public static RenderSetMetaData createRenderSetMD() throws Exception @@ -137,8 +136,7 @@ public static List createRenderSetMDList() throws Exception { - List renderSets = (List)UnmarshallerFactory.newInstance().newUnmarshaller().unmarshal(createRenderSetDescriptor(), new RenderSetMetaDataFactory(), null); - return renderSets; + return (List)UnmarshallerFactory.newInstance().newUnmarshaller().unmarshal(createRenderSetDescriptor(), new RenderSetMetaDataFactory(), null); } private static Reader createRenderSetDescriptor() Modified: trunk/theme/src/main/org/jboss/portal/test/theme/tmp/render/TestRenderedMarkup.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/tmp/render/TestRenderedMarkup.java 2007-04-07 21:10:13 UTC (rev 6947) +++ trunk/theme/src/main/org/jboss/portal/test/theme/tmp/render/TestRenderedMarkup.java 2007-04-07 22:52:49 UTC (rev 6948) @@ -203,6 +203,6 @@ */ private WindowResult createWindowMarkup(String sTitle, String sContent) { - return new WindowResult(sTitle, sContent, Collections.EMPTY_MAP, new HashMap(), null, null, null, null); + return new WindowResult(sTitle, sContent, Collections.EMPTY_MAP, new HashMap(), null, null, null); } } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java 2007-04-07 21:10:13 UTC (rev 6947) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java 2007-04-07 22:52:49 UTC (rev 6948) @@ -93,7 +93,7 @@ { propertyMap.remove(DND_ENABLED); } - if (dnd != null) + if (asyncWindow != null) { propertyMap.put(ASYNC_WINDOW_ENABLED, asyncWindow.toString()); } Modified: trunk/theme/src/main/org/jboss/portal/theme/page/WindowContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/WindowContext.java 2007-04-07 21:10:13 UTC (rev 6947) +++ trunk/theme/src/main/org/jboss/portal/theme/page/WindowContext.java 2007-04-07 22:52:49 UTC (rev 6948) @@ -119,7 +119,7 @@ public String getProperty(String name) { - return (String)result.getWindowProperties().get(name); + return (String)result.getProperties().get(name); } public void setRegionName(String regionName) Modified: trunk/theme/src/main/org/jboss/portal/theme/page/WindowResult.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/WindowResult.java 2007-04-07 21:10:13 UTC (rev 6947) +++ trunk/theme/src/main/org/jboss/portal/theme/page/WindowResult.java 2007-04-07 22:52:49 UTC (rev 6948) @@ -25,7 +25,6 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.theme.render.renderer.ActionRendererContext; -import org.jboss.portal.portlet.Properties; import java.util.Collection; import java.util.Map; @@ -50,13 +49,10 @@ private Map actions; /** . */ - private final Properties properties; - - /** . */ private final String headerContent; /** . */ - private Map windowProperties; + private Map properties; /** . */ private final WindowState windowState; @@ -73,8 +69,6 @@ * @param content the rendered markup fragment of the portlet * @param actions a map of actions possible for this portlet * @param windowProperties the properties for this window - * @param responseProperties the properties that were set as response properties during the portlet's render or - * action * @param headerChars content that needs to be injected into the header * @see WindowResult.Action */ @@ -83,17 +77,15 @@ String content, Map actions, Map windowProperties, - Properties responseProperties, String headerChars, WindowState windowState, Mode mode) { - this.properties = responseProperties; this.title = title; this.content = content; this.actions = actions; this.headerContent = headerChars; - this.windowProperties = windowProperties; + this.properties = windowProperties; this.windowState = windowState; this.mode = mode; } @@ -123,33 +115,16 @@ return windowState; } - /** - * @param familyName - * @return a collection of triggerable actions for this portlet - * @see WindowResult.Action - */ public Collection getTriggerableActions(String familyName) { return (Collection)actions.get(familyName); } - /** @return the response properties that were set by the portlet during the render or action */ - public Properties getResponseProperties() + public Map getProperties() { return properties; } - /** @return the properties that were set for this particular window */ - public Map getWindowProperties() - { - return windowProperties; - } - - public void setWindowProperties(Map windowProperties) - { - this.windowProperties = windowProperties; - } - /** * Represents an action that can be triggered. * <p/> Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java 2007-04-07 21:10:13 UTC (rev 6947) +++ trunk/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java 2007-04-07 22:52:49 UTC (rev 6948) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.theme.tag; -import org.jboss.portal.portlet.Properties; import org.jboss.portal.theme.LayoutConstants; import org.jboss.portal.theme.page.PageResult; import org.jboss.portal.theme.page.WindowResult; @@ -50,10 +49,11 @@ { public void doTag() throws JspException, IOException { - // get page and region + // Get page and region PageContext app = (PageContext)getJspContext(); HttpServletRequest request = (HttpServletRequest)app.getRequest(); + // PageResult page = (PageResult)request.getAttribute(LayoutConstants.ATTR_PAGE); JspWriter out = this.getJspContext().getOut(); if (page == null) @@ -64,22 +64,12 @@ return; } + // Map results = page.getWindowContextMap(); for (Iterator i = results.values().iterator(); i.hasNext();) { WindowContext wc = (WindowContext)i.next(); WindowResult result = wc.getResult(); - - Properties responseProperties = result.getResponseProperties(); - if (responseProperties != null) - { - String headerContentProperty = responseProperties.getProperty("HEADER_CONTENT"); - if (headerContentProperty != null) - { - out.println(headerContentProperty); - } - } - if (result.getHeaderContent() != null) { out.println(result.getHeaderContent());

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6947 - trunk/theme/src/bin/portal-ajax-war/dyna.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-04-07 17:10:13 -0400 (Sat, 07 Apr 2007) New Revision: 6947 Modified: trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js Log: oups wrong variable name Modified: trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-07 21:07:56 UTC (rev 6946) +++ trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-07 21:10:13 UTC (rev 6947) @@ -18,7 +18,7 @@ { } } - new Ajax.Request(serverBaseURL, options); + new Ajax.Request(server_base_url, options); } function snapshot() {

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6946 - trunk/theme/src/bin/portal-ajax-war/dyna.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-04-07 17:07:56 -0400 (Sat, 07 Apr 2007) New Revision: 6946 Modified: trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js Log: don't intercept URLs that don't start with the server URL Modified: trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-07 21:06:48 UTC (rev 6945) +++ trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-07 21:07:56 UTC (rev 6946) @@ -18,7 +18,7 @@ { } } - new Ajax.Request(async_server_url, options); + new Ajax.Request(serverBaseURL, options); } function snapshot() {

17 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits April 2007