Author: thomas.heute(a)jboss.com Date: 2007-06-19 19:26:29 -0400 (Tue, 19 Jun 2007) New Revision: 7480 Modified: trunk/build/build-thirdparty.xml trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java trunk/faces/src/main/org/jboss/portal/faces/el/ClassConstantPublisherBean.java Log: Attempt to get the same JBoss Portal working in 4.0.x with MyFaces + JDK 1.4 and 4.2.x with JSF Sun RI + JDK 5 Modified: trunk/build/build-thirdparty.xml =================================================================== --- trunk/build/build-thirdparty.xml 2007-06-19 19:42:21 UTC (rev 7479) +++ trunk/build/build-thirdparty.xml 2007-06-19 23:26:29 UTC (rev 7480) @@ -111,7 +111,7 @@ <componentref name="wutka-dtdparser" version="1.2.1"/> <componentref name="portals-bridges" version="1.0"/> <!-- patched jsf-portlet bridge --> - <componentref name="portals-bridges/jsf-portlet" version="1.1.4-patched"/> + <componentref name="portals-bridges/jsf-portlet" version="1.2-patched"/> </build> <synchronizeinfo/> Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java 2007-06-19 19:42:21 UTC (rev 7479) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java 2007-06-19 23:26:29 UTC (rev 7480) @@ -118,4 +118,34 @@ { void pageCreated(Page page); } + + public PageContainer getPageContainer() + { + return pageContainer; + } + + public void setPageContainer(PageContainer pageContainer) + { + this.pageContainer = pageContainer; + } + + public String getMessageTarget() + { + return messageTarget; + } + + public void setMessageTarget(String messageTarget) + { + this.messageTarget = messageTarget; + } + + public Listener getListener() + { + return listener; + } + + public void setListener(Listener listener) + { + this.listener = listener; + } } Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2007-06-19 19:42:21 UTC (rev 7479) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2007-06-19 23:26:29 UTC (rev 7480) @@ -204,4 +204,44 @@ e.printStackTrace(); } } + + public PortalObjectContainer getPortalObjectContainer() + { + return portalObjectContainer; + } + + public void setPortalObjectContainer(PortalObjectContainer portalObjectContainer) + { + this.portalObjectContainer = portalObjectContainer; + } + + public LayoutService getLayoutService() + { + return layoutService; + } + + public void setLayoutService(LayoutService layoutService) + { + this.layoutService = layoutService; + } + + public ThemeService getThemeService() + { + return themeService; + } + + public void setThemeService(ThemeService themeService) + { + this.themeService = themeService; + } + + public InstanceContainer getInstanceContainer() + { + return instanceContainer; + } + + public void setInstanceContainer(InstanceContainer instanceContainer) + { + this.instanceContainer = instanceContainer; + } } Modified: trunk/faces/src/main/org/jboss/portal/faces/el/ClassConstantPublisherBean.java =================================================================== --- trunk/faces/src/main/org/jboss/portal/faces/el/ClassConstantPublisherBean.java 2007-06-19 19:42:21 UTC (rev 7479) +++ trunk/faces/src/main/org/jboss/portal/faces/el/ClassConstantPublisherBean.java 2007-06-19 23:26:29 UTC (rev 7480) @@ -139,4 +139,14 @@ return false; } } + + public String getClassName() + { + return className; + } + + public void setClassName(String className) + { + this.className = className; + } }