Author: sohil.shah(a)jboss.com Date: 2007-11-12 17:40:53 -0500 (Mon, 12 Nov 2007) New Revision: 8891 Added: branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/PresentationServerImpl.java Removed: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PresentationServerImpl.java Modified: branches/UIServer/core/src/resources/portal-core-sar/META-INF/jboss-service.xml branches/UIServer/uiserver/src/resources/portal-uiserver.sar/META-INF/jboss-service.xml Log: refactoring Added: branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/PresentationServerImpl.java =================================================================== --- branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/PresentationServerImpl.java (rev 0) +++ branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/PresentationServerImpl.java 2007-11-12 22:40:53 UTC (rev 8891) @@ -0,0 +1,98 @@ +/****************************************************************************** + * 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.presentation.server; + +import org.jboss.portal.presentation.server.Processor; +import org.jboss.portal.presentation.server.PortalObjectReader; +import org.jboss.portal.presentation.server.PresentationServer; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public class PresentationServerImpl implements PresentationServer +{ + private Processor processor = null; + private PortalObjectReader portalObjectReader = null; + + /** + * + * + */ + public PresentationServerImpl() + { + + } + + /** + * + * + */ + public void start() + { + + } + + /** + * + * + */ + public void stop() + { + + } + + /** + * + */ + public PortalObjectReader getPortalObjectReader() + { + return this.portalObjectReader; + } + + /** + * + * @param portalObjectReader + */ + public void setPortalObjectReader(PortalObjectReader portalObjectReader) + { + this.portalObjectReader = portalObjectReader; + } + + /** + * + */ + public Processor getProcessor() + { + return this.processor; + } + + /** + * + * @param processor + */ + public void setProcessor(Processor processor) + { + this.processor = processor; + } +} Modified: branches/UIServer/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- branches/UIServer/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-11-12 22:33:29 UTC (rev 8890) +++ branches/UIServer/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-11-12 22:40:53 UTC (rev 8891) @@ -1092,6 +1092,25 @@ proxy-type="attribute">portal:service=ControlPolicy,type=Page</depends> </mbean> <mbean + code="org.jboss.portal.core.presentation.server.PresentationServerImpl" + name="portal:service=PresentationServer" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <depends optional-attribute-name="PortalObjectReader" proxy-type="attribute">portal:container=PortalObjectReader</depends> + <depends optional-attribute-name="Processor" proxy-type="attribute">portal:service=Processor</depends> + <depends>portal:service=PageService</depends> + <depends>portal:commandFactory=DefaultPortal</depends> + <depends>portal:urlFactory=Delegating</depends> + <depends>portal:service=InterceptorStackFactory,type=Command</depends> + <depends>portal:container=Instance</depends> + <depends>portal:service=PortalAuthorizationManagerFactory</depends> + <depends>portal:service=CustomizationManager</depends> + <depends>portal:service=ContentProviderRegistry</depends> + <depends>portal:service=ResponseHandler,type=Selector</depends> + <depends>portal:service=ControlPolicy,type=Page</depends> + </mbean> + <mbean code="org.jboss.portal.core.presentation.server.MainProcessor" name="portal:service=Processor" xmbean-dd="" Deleted: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PresentationServerImpl.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PresentationServerImpl.java 2007-11-12 22:33:29 UTC (rev 8890) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PresentationServerImpl.java 2007-11-12 22:40:53 UTC (rev 8891) @@ -1,94 +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.presentation.server; - -/** - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - * - */ -public class PresentationServerImpl implements PresentationServer -{ - private Processor processor = null; - private PortalObjectReader portalObjectReader = null; - - /** - * - * - */ - public PresentationServerImpl() - { - - } - - /** - * - * - */ - public void start() - { - - } - - /** - * - * - */ - public void stop() - { - - } - - /** - * - */ - public PortalObjectReader getPortalObjectReader() - { - return this.portalObjectReader; - } - - /** - * - * @param portalObjectReader - */ - public void setPortalObjectReader(PortalObjectReader portalObjectReader) - { - this.portalObjectReader = portalObjectReader; - } - - /** - * - */ - public Processor getProcessor() - { - return this.processor; - } - - /** - * - * @param processor - */ - public void setProcessor(Processor processor) - { - this.processor = processor; - } -} Modified: branches/UIServer/uiserver/src/resources/portal-uiserver.sar/META-INF/jboss-service.xml =================================================================== --- branches/UIServer/uiserver/src/resources/portal-uiserver.sar/META-INF/jboss-service.xml 2007-11-12 22:33:29 UTC (rev 8890) +++ branches/UIServer/uiserver/src/resources/portal-uiserver.sar/META-INF/jboss-service.xml 2007-11-12 22:40:53 UTC (rev 8891) @@ -32,25 +32,6 @@ <depends optional-attribute-name="PresentationServer" proxy-type="attribute">portal:service=PresentationServer</depends> </mbean> <mbean - code="org.jboss.portal.presentation.server.PresentationServerImpl" - name="portal:service=PresentationServer" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> - <depends optional-attribute-name="PortalObjectReader" proxy-type="attribute">portal:container=PortalObjectReader</depends> - <depends optional-attribute-name="Processor" proxy-type="attribute">portal:service=Processor</depends> - <depends>portal:service=PageService</depends> - <depends>portal:commandFactory=DefaultPortal</depends> - <depends>portal:urlFactory=Delegating</depends> - <depends>portal:service=InterceptorStackFactory,type=Command</depends> - <depends>portal:container=Instance</depends> - <depends>portal:service=PortalAuthorizationManagerFactory</depends> - <depends>portal:service=CustomizationManager</depends> - <depends>portal:service=ContentProviderRegistry</depends> - <depends>portal:service=ResponseHandler,type=Selector</depends> - <depends>portal:service=ControlPolicy,type=Page</depends> - </mbean> - <mbean code="org.jboss.portal.uiserver.service.EntryPointImpl" name="portal:service=EntryPoint" xmbean-dd=""