[portal-commits] JBoss Portal SVN: r8904 - in branches/UIServer/uiserver/src/main/org/jboss/portal: presentation/server and 6 other directories.

Author: sohil.shah(a)jboss.com Date: 2007-11-13 11:51:35 -0500 (Tue, 13 Nov 2007) New Revision: 8904 Removed: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/protocol/ Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/LinkActivation.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PortalObjectReader.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/ProcessorResponse.java branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout/TestFlexibleGrid.java branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout/TestRegionLayoutManager.java branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/LayoutManager.java branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/LayoutService.java branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/FlexibleGrid.java branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/FlexibleGridLayoutManager.java branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/RegionLayoutManager.java branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/PortalEntryPoint.java branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/UIServer.java branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/ajax/PortalEntryPoint.java Log: refactoring Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/LinkActivation.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/LinkActivation.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/LinkActivation.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -24,8 +24,8 @@ import java.util.Map; -import org.jboss.portal.uiserver.protocol.Portal; -import org.jboss.portal.uiserver.protocol.PortalObject; +import org.jboss.portal.presentation.model.Portal; +import org.jboss.portal.presentation.model.PortalObject; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PortalObjectReader.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PortalObjectReader.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PortalObjectReader.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.server; -import org.jboss.portal.uiserver.protocol.Portal; -import org.jboss.portal.uiserver.protocol.PortalObject; +import org.jboss.portal.presentation.model.Portal; +import org.jboss.portal.presentation.model.PortalObject; /** * The PortalObjectReader service is used to provide information about different Portal Objects stored in the system Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/ProcessorResponse.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/ProcessorResponse.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/ProcessorResponse.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -27,7 +27,7 @@ import org.jboss.portal.web.ServletContextDispatcher; -import org.jboss.portal.uiserver.protocol.Page; +import org.jboss.portal.presentation.model.Page; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout/TestFlexibleGrid.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout/TestFlexibleGrid.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout/TestFlexibleGrid.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -28,9 +28,9 @@ import java.io.FileOutputStream; -import org.jboss.portal.uiserver.protocol.Container; -import org.jboss.portal.uiserver.protocol.Window; -import org.jboss.portal.uiserver.protocol.Page; +import org.jboss.portal.presentation.model.Container; +import org.jboss.portal.presentation.model.Page; +import org.jboss.portal.presentation.model.Window; import org.jboss.portal.uiserver.layout.classic.FlexibleGrid; import org.jboss.portal.uiserver.layout.classic.FlexibleGridConstraints; import org.jboss.portal.uiserver.layout.classic.FlexibleGridLayoutManager; Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout/TestRegionLayoutManager.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout/TestRegionLayoutManager.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout/TestRegionLayoutManager.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -28,9 +28,9 @@ import java.io.FileOutputStream; -import org.jboss.portal.uiserver.protocol.Container; -import org.jboss.portal.uiserver.protocol.Window; -import org.jboss.portal.uiserver.protocol.Page; +import org.jboss.portal.presentation.model.Container; +import org.jboss.portal.presentation.model.Page; +import org.jboss.portal.presentation.model.Window; import org.jboss.portal.uiserver.layout.classic.RegionConstraints; import org.jboss.portal.uiserver.layout.classic.RegionLayoutManager; Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/LayoutManager.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/LayoutManager.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/LayoutManager.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.uiserver.layout; -import org.jboss.portal.uiserver.protocol.Page; +import org.jboss.portal.presentation.model.Page; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/LayoutService.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/LayoutService.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/LayoutService.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.uiserver.layout; -import org.jboss.portal.uiserver.protocol.Page; +import org.jboss.portal.presentation.model.Page; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/FlexibleGrid.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/FlexibleGrid.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/FlexibleGrid.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -24,8 +24,8 @@ import org.apache.log4j.Logger; -import org.jboss.portal.uiserver.protocol.Container; -import org.jboss.portal.uiserver.protocol.Window; +import org.jboss.portal.presentation.model.Container; +import org.jboss.portal.presentation.model.Window; import java.io.Serializable; Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/FlexibleGridLayoutManager.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/FlexibleGridLayoutManager.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/FlexibleGridLayoutManager.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.uiserver.layout.classic; -import org.jboss.portal.uiserver.protocol.Container; -import org.jboss.portal.uiserver.protocol.Page; +import org.jboss.portal.presentation.model.Container; +import org.jboss.portal.presentation.model.Page; import org.jboss.portal.uiserver.layout.LayoutManager; Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/RegionLayoutManager.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/RegionLayoutManager.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/RegionLayoutManager.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -25,10 +25,10 @@ import java.util.List; import java.util.ArrayList; +import org.jboss.portal.presentation.model.Container; +import org.jboss.portal.presentation.model.Page; +import org.jboss.portal.presentation.model.Window; import org.jboss.portal.uiserver.layout.LayoutManager; -import org.jboss.portal.uiserver.protocol.Page; -import org.jboss.portal.uiserver.protocol.Container; -import org.jboss.portal.uiserver.protocol.Window; /** * This layout manager splits the page up into Regions. Containers which contain the Portlet Windows Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/PortalEntryPoint.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/PortalEntryPoint.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/PortalEntryPoint.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -66,9 +66,9 @@ import org.jboss.portal.uiserver.layout.classic.FlexibleGridLayoutManager; import org.jboss.portal.uiserver.layout.classic.RegionConstraints; import org.jboss.portal.uiserver.layout.classic.RegionLayoutManager; -import org.jboss.portal.uiserver.protocol.Container; -import org.jboss.portal.uiserver.protocol.Page; -import org.jboss.portal.uiserver.protocol.Window; +import org.jboss.portal.presentation.model.Container; +import org.jboss.portal.presentation.model.Page; +import org.jboss.portal.presentation.model.Window; import org.jboss.portal.presentation.server.ProcessorResponse; /** Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/UIServer.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/UIServer.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/UIServer.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest; -import org.jboss.portal.uiserver.protocol.PortalObject; -import org.jboss.portal.uiserver.protocol.Portal; import org.jboss.portal.presentation.RequestContext; +import org.jboss.portal.presentation.model.Portal; +import org.jboss.portal.presentation.model.PortalObject; import org.jboss.portal.presentation.server.ProcessorRequest; import org.jboss.portal.presentation.server.ProcessorResponse; import org.jboss.portal.presentation.server.PresentationServer; Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/ajax/PortalEntryPoint.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/ajax/PortalEntryPoint.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/ajax/PortalEntryPoint.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -142,7 +142,7 @@ { Page display = null; - org.jboss.portal.uiserver.protocol.Page portalPage = processorResponse + org.jboss.portal.presentation.model.Page portalPage = processorResponse .findDisplayedPage(); // Construct the ajax currentPage object from the portalPage that has been @@ -158,7 +158,7 @@ display.setWindows(windows); for(int i=0; i<pageWindows.size(); i++) { - org.jboss.portal.uiserver.protocol.Window pageWindow = (org.jboss.portal.uiserver.protocol.Window)pageWindows.get(i); + org.jboss.portal.presentation.model.Window pageWindow = (org.jboss.portal.presentation.model.Window)pageWindows.get(i); Window window = new Window(); window.setName(pageWindow.getName()); window.setContent(pageWindow.getContent());