[gatein-commits] gatein SVN: r8579 - in components/wsrp/branches/2.1.x/admin-gui/src/main: webapp/WEB-INF and 1 other directory.

Author: chris.laprun(a)jboss.com Date: 2012-03-13 12:16:36 -0400 (Tue, 13 Mar 2012) New Revision: 8579 Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/WEB-INF/web.xml Log: - GTNWSRP-250: Make portletHandles, existingExports and currentExport transient and regenerate the data from persistence instead. Re-activated distributable mode. Needs to be more thoroughly tested. Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java =================================================================== --- components/wsrp/branches/2.1.x/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2012-03-13 16:15:00 UTC (rev 8578) +++ components/wsrp/branches/2.1.x/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2012-03-13 16:16:36 UTC (rev 8579) @@ -88,9 +88,9 @@ private static final String FAILED_PORTLETS = "bean_consumer_import_failed_portlets"; private static final String CONSUMER_TYPE = "CONSUMER_TYPE"; - private DataModel portletHandles; - private DataModel existingExports; - private ExportInfoDisplay currentExport; + private transient DataModel portletHandles; + private transient DataModel existingExports; + private transient ExportInfoDisplay currentExport; private static void bypassAndRedisplay() { @@ -571,7 +571,7 @@ public boolean isReadyForExport() { - List<SelectablePortletHandle> handles = (List<SelectablePortletHandle>)portletHandles.getWrappedData(); + List<SelectablePortletHandle> handles = (List<SelectablePortletHandle>)getPortlets().getWrappedData(); for (SelectablePortletHandle handle : handles) { if (handle.isSelected()) @@ -588,7 +588,7 @@ final WSRPConsumer consumer = getConsumer(); if (consumer != null) { - List<SelectablePortletHandle> handles = (List<SelectablePortletHandle>)portletHandles.getWrappedData(); + List<SelectablePortletHandle> handles = (List<SelectablePortletHandle>)getPortlets().getWrappedData(); List<String> selectedHandles = new ArrayList<String>(handles.size()); for (SelectablePortletHandle selectablePortletHandle : handles) { @@ -737,7 +737,7 @@ public void selectExport() { - currentExport = (ExportInfoDisplay)existingExports.getRowData(); + currentExport = (ExportInfoDisplay)getExistingExports().getRowData(); } public boolean isSupportsExport() Modified: components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/WEB-INF/web.xml =================================================================== --- components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/WEB-INF/web.xml 2012-03-13 16:15:00 UTC (rev 8578) +++ components/wsrp/branches/2.1.x/admin-gui/src/main/webapp/WEB-INF/web.xml 2012-03-13 16:16:36 UTC (rev 8579) @@ -79,7 +79,7 @@ <location>/faces/jsf/error.xhtml</location> </error-page> - <!--<distributable/>--> + <distributable/> </web-app>