[portal-commits] JBoss Portal SVN: r6921 - in trunk: core/src/main/org/jboss/portal/core/controller/ajax and 9 other directories.

Author: julien(a)jboss.com Date: 2007-04-04 17:12:14 -0400 (Wed, 04 Apr 2007) New Revision: 6921 Added: trunk/theme/src/main/org/jboss/portal/theme/PageService.java trunk/theme/src/main/org/jboss/portal/theme/impl/PageServiceImpl.java Removed: trunk/theme/src/main/org/jboss/portal/theme/impl/page/ trunk/theme/src/main/org/jboss/portal/theme/page/PageService.java Modified: trunk/core/src/main/org/jboss/portal/core/controller/Controller.java trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxController.java trunk/core/src/main/org/jboss/portal/core/model/instance/command/InvokePortletInstanceRenderCommand.java trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml trunk/theme/src/main/org/jboss/portal/test/theme/TestHelper.java trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestThemeServlet.java trunk/theme/src/main/org/jboss/portal/theme/page/PageRendition.java trunk/theme/src/resources/test/theme-test-sar/META-INF/jboss-service.xml Log: moved the PageService to an upper package Modified: trunk/core/src/main/org/jboss/portal/core/controller/Controller.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/Controller.java 2007-04-04 20:09:09 UTC (rev 6920) +++ trunk/core/src/main/org/jboss/portal/core/controller/Controller.java 2007-04-04 21:12:14 UTC (rev 6921) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.core.controller; -import org.jboss.portal.theme.page.PageService; +import org.jboss.portal.theme.PageService; import org.jboss.portal.core.controller.command.mapper.CommandFactory; import org.jboss.portal.core.controller.command.mapper.URLFactory; import org.jboss.portal.core.model.portal.PortalObjectContainer; Modified: trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxController.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxController.java 2007-04-04 20:09:09 UTC (rev 6920) +++ trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxController.java 2007-04-04 21:12:14 UTC (rev 6921) @@ -400,7 +400,7 @@ renderContext.render(wc); // - updatePage.addFragment(_window.getName(), renderContext.getMarkupFragment().toString()); + updatePage.addFragment(wc.getId(), renderContext.getMarkupFragment().toString()); } } catch (Exception e) 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-04 20:09:09 UTC (rev 6920) +++ trunk/core/src/main/org/jboss/portal/core/model/instance/command/InvokePortletInstanceRenderCommand.java 2007-04-04 21:12:14 UTC (rev 6921) @@ -38,7 +38,7 @@ import org.jboss.portal.theme.LayoutService; import org.jboss.portal.theme.PortalLayout; import org.jboss.portal.theme.ThemeConstants; -import org.jboss.portal.theme.page.PageService; +import org.jboss.portal.theme.PageService; import org.jboss.portal.theme.page.PageResult; import org.jboss.portal.theme.page.WindowResult; import org.jboss.portal.theme.page.WindowContext; Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java 2007-04-04 20:09:09 UTC (rev 6920) +++ trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java 2007-04-04 21:12:14 UTC (rev 6921) @@ -46,8 +46,8 @@ import org.jboss.portal.theme.ThemeConstants; import org.jboss.portal.theme.ThemeResult; import org.jboss.portal.theme.ThemeService; +import org.jboss.portal.theme.PageService; import org.jboss.portal.theme.page.PageResult; -import org.jboss.portal.theme.page.PageService; import org.jboss.portal.theme.page.WindowResult; import org.jboss.portal.theme.page.WindowContext; 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-04 20:09:09 UTC (rev 6920) +++ trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-04-04 21:12:14 UTC (rev 6921) @@ -382,7 +382,7 @@ <attribute name="DefaultLayoutName">generic</attribute> </mbean> <mbean - code="org.jboss.portal.theme.impl.page.PageServiceImpl" + code="org.jboss.portal.theme.impl.PageServiceImpl" name="portal:service=PageService" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> Modified: trunk/theme/src/main/org/jboss/portal/test/theme/TestHelper.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/TestHelper.java 2007-04-04 20:09:09 UTC (rev 6920) +++ trunk/theme/src/main/org/jboss/portal/test/theme/TestHelper.java 2007-04-04 21:12:14 UTC (rev 6921) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.theme; -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; import org.jboss.portal.common.invocation.AttributeResolver; import org.jboss.portal.portlet.Properties; import org.jboss.portal.server.ServerRequest; @@ -34,11 +32,11 @@ import org.jboss.portal.theme.deployment.jboss.RenderSetMetaDataFactory; import org.jboss.portal.theme.impl.LayoutServiceImpl; import org.jboss.portal.theme.impl.ThemeServiceImpl; -import org.jboss.portal.theme.impl.page.PageServiceImpl; +import org.jboss.portal.theme.impl.PageServiceImpl; import org.jboss.portal.theme.metadata.PortalLayoutMetaData; import org.jboss.portal.theme.metadata.RenderSetMetaData; import org.jboss.portal.theme.page.PageResult; -import org.jboss.portal.theme.page.PageService; +import org.jboss.portal.theme.PageService; import org.jboss.portal.theme.page.WindowContext; import org.jboss.portal.theme.page.WindowResult; import org.jboss.system.ServiceMBeanSupport; Modified: trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestThemeServlet.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestThemeServlet.java 2007-04-04 20:09:09 UTC (rev 6920) +++ trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestThemeServlet.java 2007-04-04 21:12:14 UTC (rev 6921) @@ -28,20 +28,17 @@ import org.jboss.portal.common.util.MediaType; import org.jboss.portal.common.util.MarkupInfo; import org.jboss.portal.server.ServerRequest; -import org.jboss.portal.theme.LayoutConstants; -import org.jboss.portal.theme.LayoutDispatcher; import org.jboss.portal.theme.LayoutService; import org.jboss.portal.theme.PortalLayout; import org.jboss.portal.theme.PortalTheme; import org.jboss.portal.theme.ThemeConstants; import org.jboss.portal.theme.ThemeService; +import org.jboss.portal.theme.PageService; import org.jboss.portal.theme.impl.render.dynamic.DynaConstants; -import org.jboss.portal.theme.page.PageService; import org.jboss.portal.theme.page.WindowContext; import org.jboss.portal.theme.page.WindowResult; import org.jboss.portal.theme.page.PageResult; import org.jboss.portal.theme.render.PortalRenderSet; -import org.jboss.portal.theme.render.RenderContext; import javax.management.MBeanServer; import javax.management.ObjectName; Copied: trunk/theme/src/main/org/jboss/portal/theme/PageService.java (from rev 6917, trunk/theme/src/main/org/jboss/portal/theme/page/PageService.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/PageService.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/PageService.java 2007-04-04 21:12:14 UTC (rev 6921) @@ -0,0 +1,41 @@ +/****************************************************************************** + * 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.theme; + +import org.jboss.portal.theme.LayoutService; +import org.jboss.portal.theme.ThemeService; + +/** + * @author <a href="mailto:mholzner@novell.com">Martin Holzner</a> + * @version $Revision$ + */ +public interface PageService +{ + void setLayoutService(LayoutService layoutService); + + LayoutService getLayoutService(); + + void setThemeService(ThemeService themeService); + + ThemeService getThemeService(); +} Property changes on: trunk/theme/src/main/org/jboss/portal/theme/PageService.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/theme/src/main/org/jboss/portal/theme/impl/PageServiceImpl.java (from rev 6917, trunk/theme/src/main/org/jboss/portal/theme/impl/page/PageServiceImpl.java) =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/PageServiceImpl.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/PageServiceImpl.java 2007-04-04 21:12:14 UTC (rev 6921) @@ -0,0 +1,61 @@ +/****************************************************************************** + * 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.theme.impl; + +import org.jboss.portal.jems.as.system.AbstractJBossService; +import org.jboss.portal.theme.LayoutService; +import org.jboss.portal.theme.ThemeService; +import org.jboss.portal.theme.PageService; + +/** + * @author <a href="mailto:mholzner@novell.com">Martin Holzner</a> + * @version $Revision$ + */ +public final class PageServiceImpl extends AbstractJBossService implements PageService +{ + private LayoutService layoutService; + private ThemeService themeService; +// private InterceptorStack pageStack; + + /** Inject the layout service (must be defined as a dependent service in service descriptor). */ + public void setLayoutService(LayoutService layoutService) + { + this.layoutService = layoutService; + } + + public LayoutService getLayoutService() + { + return layoutService; + } + + /** Inject the theme service (must be defined as a dependent service in service descriptor). */ + public void setThemeService(ThemeService themeService) + { + this.themeService = themeService; + } + + public ThemeService getThemeService() + { + return themeService; + } +} Property changes on: trunk/theme/src/main/org/jboss/portal/theme/impl/PageServiceImpl.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: trunk/theme/src/main/org/jboss/portal/theme/page/PageRendition.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/PageRendition.java 2007-04-04 20:09:09 UTC (rev 6920) +++ trunk/theme/src/main/org/jboss/portal/theme/page/PageRendition.java 2007-04-04 21:12:14 UTC (rev 6921) @@ -23,23 +23,17 @@ package org.jboss.portal.theme.page; import org.jboss.portal.server.ServerInvocation; -import org.jboss.portal.theme.page.PageService; +import org.jboss.portal.theme.PageService; import org.jboss.portal.theme.page.PageResult; -import org.jboss.portal.theme.page.WindowResult; -import org.jboss.portal.theme.page.WindowContext; import org.jboss.portal.theme.render.RenderContext; -import org.jboss.portal.theme.render.PageRenderer; import org.jboss.portal.theme.render.RenderException; import org.jboss.portal.theme.PortalLayout; import org.jboss.portal.theme.ThemeConstants; -import org.jboss.portal.WindowState; import org.jboss.portal.common.util.MarkupInfo; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import java.io.IOException; -import java.util.Collection; -import java.util.Iterator; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Deleted: trunk/theme/src/main/org/jboss/portal/theme/page/PageService.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/PageService.java 2007-04-04 20:09:09 UTC (rev 6920) +++ trunk/theme/src/main/org/jboss/portal/theme/page/PageService.java 2007-04-04 21:12:14 UTC (rev 6921) @@ -1,41 +0,0 @@ -/****************************************************************************** - * 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.theme.page; - -import org.jboss.portal.theme.LayoutService; -import org.jboss.portal.theme.ThemeService; - -/** - * @author <a href="mailto:mholzner@novell.com">Martin Holzner</a> - * @version $Revision$ - */ -public interface PageService -{ - void setLayoutService(LayoutService layoutService); - - LayoutService getLayoutService(); - - void setThemeService(ThemeService themeService); - - ThemeService getThemeService(); -} Modified: trunk/theme/src/resources/test/theme-test-sar/META-INF/jboss-service.xml =================================================================== --- trunk/theme/src/resources/test/theme-test-sar/META-INF/jboss-service.xml 2007-04-04 20:09:09 UTC (rev 6920) +++ trunk/theme/src/resources/test/theme-test-sar/META-INF/jboss-service.xml 2007-04-04 21:12:14 UTC (rev 6921) @@ -39,7 +39,7 @@ <xmbean/> </mbean> <mbean - code="org.jboss.portal.theme.impl.page.PageServiceImpl" + code="org.jboss.portal.theme.impl.PageServiceImpl" name="portal:service=PageService" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">