From portal-commits at lists.jboss.org Tue Nov 13 11:51:35 2007
Content-Type: multipart/mixed; boundary="===============4924079789898353394=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r8904 - in
 branches/UIServer/uiserver/src/main/org/jboss/portal: presentation/server and
 6 other directories.
Date: Tue, 13 Nov 2007 11:51:35 -0500
Message-ID: <E1Iryz9-0000Q5-Lm@committer01.frg.pub.inap.atl.jboss.com>

--===============4924079789898353394==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

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/layou=
t/TestFlexibleGrid.java
   branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layou=
t/TestRegionLayoutManager.java
   branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/Lay=
outManager.java
   branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/Lay=
outService.java
   branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/cla=
ssic/FlexibleGrid.java
   branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/cla=
ssic/FlexibleGridLayoutManager.java
   branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/cla=
ssic/RegionLayoutManager.java
   branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/Po=
rtalEntryPoint.java
   branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/UI=
Server.java
   branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/aj=
ax/PortalEntryPoint.java
Log:
refactoring

Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation=
/action/server/LinkActivation.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/actio=
n/server/LinkActivation.java	2007-11-13 16:25:06 UTC (rev 8903)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/actio=
n/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=3D"mailto:sshah(a)redhat.com">Sohil Shah</a>

Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation=
/server/PortalObjectReader.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/serve=
r/PortalObjectReader.java	2007-11-13 16:25:06 UTC (rev 8903)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/serve=
r/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 dif=
ferent Portal Objects stored in the system

Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation=
/server/ProcessorResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/serve=
r/ProcessorResponse.java	2007-11-13 16:25:06 UTC (rev 8903)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/serve=
r/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=3D"mailto:sshah(a)redhat.com">Sohil Shah</a>

Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserve=
r/layout/TestFlexibleGrid.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layo=
ut/TestFlexibleGrid.java	2007-11-13 16:25:06 UTC (rev 8903)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layo=
ut/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/uiserve=
r/layout/TestRegionLayoutManager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layo=
ut/TestRegionLayoutManager.java	2007-11-13 16:25:06 UTC (rev 8903)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layo=
ut/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/lay=
out/LayoutManager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/La=
youtManager.java	2007-11-13 16:25:06 UTC (rev 8903)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/La=
youtManager.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=3D"mailto:sshah(a)redhat.com">Sohil Shah</a>

Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/lay=
out/LayoutService.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/La=
youtService.java	2007-11-13 16:25:06 UTC (rev 8903)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/La=
youtService.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=3D"mailto:sshah(a)redhat.com">Sohil Shah</a>

Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/lay=
out/classic/FlexibleGrid.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/cl=
assic/FlexibleGrid.java	2007-11-13 16:25:06 UTC (rev 8903)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/cl=
assic/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/lay=
out/classic/FlexibleGridLayoutManager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/cl=
assic/FlexibleGridLayoutManager.java	2007-11-13 16:25:06 UTC (rev 8903)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/cl=
assic/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/lay=
out/classic/RegionLayoutManager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/cl=
assic/RegionLayoutManager.java	2007-11-13 16:25:06 UTC (rev 8903)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/cl=
assic/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 c=
ontain the Portlet Windows

Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/ser=
vice/PortalEntryPoint.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/P=
ortalEntryPoint.java	2007-11-13 16:25:06 UTC (rev 8903)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/P=
ortalEntryPoint.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/ser=
vice/UIServer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/U=
IServer.java	2007-11-13 16:25:06 UTC (rev 8903)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/U=
IServer.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/ser=
vice/ajax/PortalEntryPoint.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/a=
jax/PortalEntryPoint.java	2007-11-13 16:25:06 UTC (rev 8903)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/a=
jax/PortalEntryPoint.java	2007-11-13 16:51:35 UTC (rev 8904)
@@ -142,7 +142,7 @@
    {
       Page display =3D null;
       =

-      org.jboss.portal.uiserver.protocol.Page portalPage =3D processorResp=
onse
+      org.jboss.portal.presentation.model.Page portalPage =3D processorRes=
ponse
       .findDisplayedPage();
 =

       // Construct the ajax currentPage object from the portalPage that ha=
s been
@@ -158,7 +158,7 @@
             display.setWindows(windows);
             for(int i=3D0; i<pageWindows.size(); i++)
             {
-               org.jboss.portal.uiserver.protocol.Window pageWindow =3D (o=
rg.jboss.portal.uiserver.protocol.Window)pageWindows.get(i);
+               org.jboss.portal.presentation.model.Window pageWindow =3D (=
org.jboss.portal.presentation.model.Window)pageWindows.get(i);
                Window window =3D new Window();
                window.setName(pageWindow.getName());
                window.setContent(pageWindow.getContent());


--===============4924079789898353394==--