[portal-commits] JBoss Portal SVN: r8955 - in branches/UIServer: uiserver/src/main/org/jboss/portal/presentation/impl/ajax/service and 6 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Thu Nov 15 12:38:29 EST 2007
Author: sohil.shah at jboss.com
Date: 2007-11-15 12:38:28 -0500 (Thu, 15 Nov 2007)
New Revision: 8955
Removed:
branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/PortalObjectReaderImpl.java
branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Component.java
branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Container.java
branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Page.java
branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Window.java
branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PortalObjectReader.java
Modified:
branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java
branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/PresentationServerImpl.java
branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/ajax/service/PortalEntryPoint.java
branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/classic/layout/FlexibleGrid.java
branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/classic/layout/FlexibleGridLayoutManager.java
branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/classic/layout/RegionLayoutManager.java
branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/layout/LayoutManager.java
branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/layout/LayoutService.java
branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/PortalObject.java
branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PresentationServer.java
branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/ProcessorResponse.java
branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/service/PortalEntryPoint.java
branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/service/UIServer.java
branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestFlexibleGrid.java
branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestRegionLayoutManager.java
Log:
removing UI model used during prototyping
Modified: branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java
===================================================================
--- branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java 2007-11-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -46,8 +46,6 @@
import org.jboss.portal.theme.page.WindowResult;
import org.jboss.portal.presentation.RequestContext;
-import org.jboss.portal.presentation.model.Page;
-import org.jboss.portal.presentation.model.Window;
import org.jboss.portal.presentation.server.Processor;
import org.jboss.portal.presentation.server.ProcessorRequest;
import org.jboss.portal.presentation.server.ProcessorResponse;
@@ -116,6 +114,7 @@
if(task.equals("aggregate"))
{
//Handle page aggregation and sending result back to the client
+ /*
MarkupInfo markupInfo = (MarkupInfo)invocation.getResponse().getContentInfo();
PageResult pageResult = (PageResult)invocation.getServerContext().getClientRequest().getAttribute("pageResult");
@@ -139,6 +138,7 @@
//Generate the response to be sent back for processing by the Presentation Framework
response = new ProcessorResponse(dispatcher, contentType, markupInfo.getCharset(), updatedPages);
+ */
}
else if(task.equals("stream"))
{
@@ -203,7 +203,7 @@
{
List windows = null;
- if(windowContexts != null)
+ /*if(windowContexts != null)
{
windows = new ArrayList();
for(Iterator itr=windowContexts.keySet().iterator(); itr.hasNext();)
@@ -218,7 +218,7 @@
windows.add(window);
}
- }
+ }*/
return windows;
}
Deleted: branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/PortalObjectReaderImpl.java
===================================================================
--- branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/PortalObjectReaderImpl.java 2007-11-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/PortalObjectReaderImpl.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -1,203 +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.core.presentation.server;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-
-import org.jboss.portal.jems.as.system.AbstractJBossService;
-import org.jboss.portal.core.model.portal.PortalObjectContainer;
-import org.jboss.portal.core.model.portal.PortalContainer;
-
-import org.jboss.portal.presentation.model.Page;
-import org.jboss.portal.presentation.model.Portal;
-import org.jboss.portal.presentation.model.PortalObject;
-import org.jboss.portal.presentation.model.Window;
-import org.jboss.portal.presentation.server.PortalObjectReader;
-
-/**
- * @author <a href="mailto:sshah at redhat.com">Sohil Shah</a>
- *
- */
-public class PortalObjectReaderImpl extends AbstractJBossService implements PortalObjectReader
-{
- private PortalObjectContainer portalObjectContainer = null;
-
- /**
- *
- * @return
- */
- public PortalObjectContainer getPortalObjectContainer()
- {
- return portalObjectContainer;
- }
-
- /**
- *
- * @param portalObjectContainer
- */
- public void setPortalObjectContainer(
- PortalObjectContainer portalObjectContainer)
- {
- this.portalObjectContainer = portalObjectContainer;
- }
-
- /**
- *
- */
- public Portal findPortal(String id)
- {
- Portal portal = null;
- PortalContainer portalContainer = this.portalObjectContainer.getContext();
-
- org.jboss.portal.core.model.portal.Portal cour = portalContainer
- .getPortal(id);
- if (cour != null)
- {
- portal = new Portal();
- portal.setId(cour.getId().toString());
- portal.setName(cour.getName());
-
- // Setup top level children for this node
- Collection children = cour.getChildren();
- Collection portalChildren = new ArrayList();
- for (Iterator itr = children.iterator(); itr.hasNext();)
- {
- org.jboss.portal.core.model.portal.PortalObject child = (org.jboss.portal.core.model.portal.PortalObject) itr
- .next();
-
- PortalObject portalChild = null;
-
- if (child instanceof org.jboss.portal.core.model.portal.Page)
- {
- portalChild = new Page();
- portalChild.setId(child.getId().toString());
- portalChild.setName(child.getName());
- portalChild.setParent(portal);
- portalChildren.add(portalChild);
- }
- else if (child instanceof org.jboss.portal.core.model.portal.Window)
- {
- portalChild = new Window();
- portalChild.setId(child.getId().toString());
- portalChild.setName(child.getName());
- portalChild.setParent(portal);
- portalChildren.add(portalChild);
- }
- }
-
- portal.setChildren(portalChildren);
- }
-
- return portal;
- }
-
- /**
- *
- */
- public PortalObject findPortalObject(PortalObject parent, String id)
- {
- PortalObject portalObject = null;
- PortalContainer portalContainer = this.portalObjectContainer.getContext();
-
- //Find the Portal to introspect
- int startIndex = 1;
- int endIndex = id.indexOf('/', startIndex);
- String portalName = id.substring(startIndex, endIndex);
- org.jboss.portal.core.model.portal.Portal portal = portalContainer.getPortal(portalName);
- if(portal == null)
- {
- return null;
- }
-
- //Find the Portal Object inside this Portal represented by the id
- org.jboss.portal.core.model.portal.PortalObject cour = null;
- StringTokenizer st = new StringTokenizer(id, "/");
- while(st.hasMoreTokens())
- {
- String token = st.nextToken();
-
- if(cour == null)
- {
- cour = portal.getChild(token);
- }
- else
- {
- cour = cour.getChild(token);
- }
- }
-
- //Map the Portal Object to the protocol Portal Object
- if (cour != null)
- {
- if (cour instanceof org.jboss.portal.core.model.portal.Page)
- {
- portalObject = new Page();
- }
- else if (cour instanceof org.jboss.portal.core.model.portal.Window)
- {
- portalObject = new Window();
- }
-
- if (portalObject != null)
- {
- portalObject.setId(cour.getId().toString());
- portalObject.setName(cour.getName());
- portalObject.setParent(parent);
-
- // Setup top level children for this node
- Collection children = cour.getChildren();
- Collection portalChildren = new ArrayList();
- for (Iterator itr = children.iterator(); itr.hasNext();)
- {
- org.jboss.portal.core.model.portal.PortalObject child = (org.jboss.portal.core.model.portal.PortalObject) itr
- .next();
-
- PortalObject portalChild = null;
-
- if (child instanceof org.jboss.portal.core.model.portal.Page)
- {
- portalChild = new Page();
- portalChild.setId(child.getId().toString());
- portalChild.setName(child.getName());
- portalChild.setParent(portalObject);
- portalChildren.add(portalChild);
- }
- else if (child instanceof org.jboss.portal.core.model.portal.Window)
- {
- portalChild = new Window();
- portalChild.setId(child.getId().toString());
- portalChild.setName(child.getName());
- portalChild.setParent(portalObject);
- portalChildren.add(portalChild);
- }
- }
- portalObject.setChildren(portalChildren);
- }
- }
-
- return portalObject;
- }
-}
Modified: 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 2007-11-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/PresentationServerImpl.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -25,7 +25,6 @@
import org.jboss.portal.presentation.RequestContext;
import org.jboss.portal.presentation.server.Processor;
import org.jboss.portal.presentation.server.PresentationServer;
-import org.jboss.portal.presentation.server.PortalObjectReader;
import org.jboss.portal.presentation.model2.UIWindow;
import org.jboss.portal.presentation.model2.state.ModelLoader;
@@ -104,15 +103,7 @@
public void setProcessor(Processor processor)
{
this.processor = processor;
- }
-
- /**
- * @deprecated
- */
- public PortalObjectReader getPortalObjectReader()
- {
- return null;
- }
+ }
/**
*
Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/ajax/service/PortalEntryPoint.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/ajax/service/PortalEntryPoint.java 2007-11-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/ajax/service/PortalEntryPoint.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -142,6 +142,8 @@
{
Page display = null;
+ //Implement this with the new model
+ /*
org.jboss.portal.presentation.model.Page portalPage = processorResponse
.findDisplayedPage();
@@ -166,6 +168,7 @@
}
}
}
+ */
return display;
}
Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/classic/layout/FlexibleGrid.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/classic/layout/FlexibleGrid.java 2007-11-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/classic/layout/FlexibleGrid.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -24,9 +24,6 @@
import org.apache.log4j.Logger;
-import org.jboss.portal.presentation.model.Container;
-import org.jboss.portal.presentation.model.Window;
-
import java.io.Serializable;
/**
@@ -188,7 +185,7 @@
/**
*
*/
- String doLayout(Container container)
+ /*String doLayout(Container container)
{
String output = null;
@@ -224,7 +221,7 @@
output = buffer.toString();
return output;
- }
+ }*/
/**
@@ -232,7 +229,7 @@
* @param container
* @return
*/
- String generateInlineStyle(Container container)
+ /*String generateInlineStyle(Container container)
{
String style = null;
@@ -253,7 +250,7 @@
style = buffer.toString();
return style;
- }
+ }*/
/**
*
@@ -261,7 +258,7 @@
* @param column
* @return
*/
- String getCellStyle(int row, int column)
+ /*String getCellStyle(int row, int column)
{
String style = null;
@@ -311,7 +308,7 @@
}
return style;
- }
+ }*/
/**
*
@@ -319,7 +316,7 @@
* @param column
* @return
*/
- private String getPortletMarkup(Container container,int row,int column)
+ /*private String getPortletMarkup(Container container,int row,int column)
{
String markup = "";
@@ -340,5 +337,5 @@
}
return markup;
- }
+ }*/
}
Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/classic/layout/FlexibleGridLayoutManager.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/classic/layout/FlexibleGridLayoutManager.java 2007-11-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/classic/layout/FlexibleGridLayoutManager.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -22,8 +22,6 @@
******************************************************************************/
package org.jboss.portal.presentation.impl.classic.layout;
-import org.jboss.portal.presentation.model.Container;
-import org.jboss.portal.presentation.model.Page;
import org.jboss.portal.presentation.layout.LayoutManager;
@@ -72,7 +70,7 @@
/**
*
*/
- public String doLayout(Page page)
+ /*public String doLayout(Page page)
{
String layoutOutput = "";
@@ -101,7 +99,7 @@
layoutOutput = buffer.toString();
return layoutOutput;
- }
+ }*/
/**
*
@@ -109,7 +107,7 @@
* @param grids
* @return
*/
- private Container[] findContainers(Page page, FlexibleGrid[] grids)
+ /*private Container[] findContainers(Page page, FlexibleGrid[] grids)
{
Container[] containers = null;
@@ -137,7 +135,7 @@
}
return containers;
- }
+ }*/
/**
*
@@ -145,7 +143,7 @@
* @param containers
* @return
*/
- private String generateInlineStyle(FlexibleGrid[] grids,Container[] containers)
+ /*private String generateInlineStyle(FlexibleGrid[] grids,Container[] containers)
{
String inlineStyle = null;
@@ -182,5 +180,5 @@
inlineStyle = buffer.toString();
return inlineStyle;
- }
+ }*/
}
Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/classic/layout/RegionLayoutManager.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/classic/layout/RegionLayoutManager.java 2007-11-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/classic/layout/RegionLayoutManager.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -25,9 +25,6 @@
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.presentation.layout.LayoutManager;
/**
@@ -65,7 +62,7 @@
/**
*
*/
- public String doLayout(Page page)
+ /*public String doLayout(Page page)
{
String output = null;
@@ -98,7 +95,7 @@
output = buffer.toString();
return output;
- }
+ }*/
/**
*
@@ -106,7 +103,7 @@
* @param page
* @return
*/
- private Container findContainerByRegion(int regionType, Page page)
+ /*private Container findContainerByRegion(int regionType, Page page)
{
Container container = null;
@@ -132,14 +129,14 @@
}
return container;
- }
+ }*/
/**
*
* @param regionType
* @param container
*/
- private String layoutRegion(int regionType, Container container)
+ /*private String layoutRegion(int regionType, Container container)
{
String output = null;
@@ -179,5 +176,5 @@
output = buffer.toString();
return output;
- }
+ }*/
}
Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/layout/LayoutManager.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/layout/LayoutManager.java 2007-11-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/layout/LayoutManager.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -22,8 +22,6 @@
******************************************************************************/
package org.jboss.portal.presentation.layout;
-import org.jboss.portal.presentation.model.Page;
-
/**
* @author <a href="mailto:sshah at redhat.com">Sohil Shah</a>
*
@@ -35,5 +33,5 @@
* @param container
* @return
*/
- public String doLayout(Page page);
+ //public String doLayout(Page page);
}
Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/layout/LayoutService.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/layout/LayoutService.java 2007-11-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/layout/LayoutService.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -22,8 +22,6 @@
******************************************************************************/
package org.jboss.portal.presentation.layout;
-import org.jboss.portal.presentation.model.Page;
-
/**
* @author <a href="mailto:sshah at redhat.com">Sohil Shah</a>
*
@@ -44,12 +42,12 @@
* @param layoutManager
* @return
*/
- public String doLayout(Page page, LayoutManager layoutManager)
+ /*public String doLayout(Page page, LayoutManager layoutManager)
{
String output = null;
output = layoutManager.doLayout(page);
return output;
- }
+ }*/
}
Deleted: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Component.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Component.java 2007-11-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Component.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -1,53 +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.model;
-
-import java.io.Serializable;
-
-/**
- * Component represents a UI entity that will be rendered eventually on the client
- *
- * @author <a href="mailto:sshah at redhat.com">Sohil Shah</a>
- *
- */
-public interface Component extends Serializable
-{
- /**
- *
- * @return
- */
- public String getId();
-
- /**
- *
- * @param id
- */
- public void setId(String id);
-
-
- /**
- *
- * @return
- */
- public String getMarkup();
-}
Deleted: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Container.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Container.java 2007-11-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Container.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -1,134 +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.model;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- * Container is an organizational entity which aggregates the Components that will be rendered on the client
- *
- * @author <a href="mailto:sshah at redhat.com">Sohil Shah</a>
- *
- */
-public class Container implements Serializable
-{
- /**
- * required unique id of the container. uniqueness in relation to
- * other containers added to the same instance of the page
- */
- protected String id = null;
-
-
- /**
- *
- */
- private List components = null;
-
- /**
- *
- *
- */
- public Container(String id)
- {
- this.id = id;
- this.components = new ArrayList();
- }
-
- /**
- *
- * @return
- */
- public String getId()
- {
- return id;
- }
-
- /**
- *
- * @param id
- */
- public void setId(String id)
- {
- this.id = id;
- }
-
-
- /**
- *
- * @return
- */
- public List getComponents()
- {
- return components;
- }
-
- /**
- *
- * @param components
- */
- public void setComponents(List components)
- {
- this.components = components;
- }
-
- /**
- *
- * @param componentId
- * @return
- */
- public Component getComponent(String componentId)
- {
- Component component = null;
-
- if(this.components != null)
- {
- for(int i=0;i<this.components.size();i++)
- {
- Component cour = (Component)this.components.get(i);
- if(cour.getId().equals(componentId))
- {
- component = cour;
- break;
- }
- }
- }
-
- return component;
- }
-
- /**
- *
- * @param component
- */
- public void addComponent(Component component)
- {
- if(this.components == null)
- {
- this.components = new ArrayList();
- }
-
- this.components.add(component);
- }
-}
Deleted: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Page.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Page.java 2007-11-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Page.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -1,132 +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.model;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- * @author <a href="mailto:sshah at redhat.com">Sohil Shah</a>
- *
- */
-public class Page extends PortalObject
-{
- /**
- * A page consists of multiple containers that are to be displayed/aggregated along with their corresponding
- * UI components
- */
- private List containers = null;
-
- /**
- * Signifies if this page is currently being displayed on the client
- */
- private boolean currentlyDisplayed = false;
-
- /**
- *
- *
- */
- public Page()
- {
- super();
- this.containers = new ArrayList();
- }
-
- /**
- *
- */
- public String toString()
- {
- return "Page: "+super.toString();
- }
-
- /**
- *
- * @return
- */
- public List getWindows()
- {
- List windows = new ArrayList();
-
- if(this.children != null)
- {
- for(Iterator itr=this.children.iterator(); itr.hasNext();)
- {
- Object child = itr.next();
-
- if(child instanceof Window)
- {
- windows.add(child);
- }
- }
- }
-
- return windows;
- }
-
- /**
- *
- * @return
- */
- public List getContainers()
- {
- return containers;
- }
-
- /**
- *
- * @param containers
- */
- public void setContainers(List containers)
- {
- this.containers = containers;
- }
-
- /**
- *
- * @param container
- */
- public void addContainer(Container container)
- {
- this.getContainers().add(container);
- }
-
- /**
- *
- * @return
- */
- public boolean isCurrentlyDisplayed()
- {
- return currentlyDisplayed;
- }
-
- /**
- *
- * @param currentlyDisplayed
- */
- public void setCurrentlyDisplayed(boolean currentlyDisplayed)
- {
- this.currentlyDisplayed = currentlyDisplayed;
- }
-}
Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/PortalObject.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/PortalObject.java 2007-11-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/PortalObject.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -23,11 +23,6 @@
package org.jboss.portal.presentation.model;
import java.io.Serializable;
-import java.util.Map;
-import java.util.Collection;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.HashMap;
/**
* @author <a href="mailto:sshah at redhat.com">Sohil Shah</a>
@@ -37,9 +32,6 @@
{
protected String id = null;
protected String name = null;
- protected PortalObject parent = null;
- protected Collection children = null;
- protected Map properties = null;
/**
*
@@ -47,8 +39,6 @@
*/
public PortalObject()
{
- this.children = new ArrayList();
- this.properties = new HashMap(5);
}
/**
@@ -58,12 +48,10 @@
* @param parent
* @param children
*/
- public PortalObject(String id, String name, PortalObject parent, Collection children)
+ public PortalObject(String id, String name)
{
this.id = id;
this.name = name;
- this.parent = parent;
- this.children = children;
}
/**
@@ -104,97 +92,7 @@
/**
*
- * @return
*/
- public PortalObject getParent()
- {
- return parent;
- }
-
- /**
- *
- * @param parent
- */
- public void setParent(PortalObject parent)
- {
- this.parent = parent;
- }
-
- /**
- *
- * @return
- */
- public Collection getChildren()
- {
- if(this.children == null)
- {
- this.children = new ArrayList();
- }
- return children;
- }
-
- /**
- *
- * @param children
- */
- public void setChildren(Collection children)
- {
- this.children = children;
- }
-
- /**
- * Recursively traverses the Portal Object's children tree to find a child registered with the
- * specified id
- *
- * @param id
- * @return
- */
- public PortalObject findChild(String id)
- {
- PortalObject child = null;
-
- for(Iterator itr=this.children.iterator(); itr.hasNext();)
- {
- PortalObject cour = (PortalObject)itr.next();
- if(cour.id.equals(id))
- {
- child = cour;
- }
- else
- {
- child = cour.findChild(id);
- }
-
- if(child != null)
- {
- return child;
- }
- }
-
- return child;
- }
-
- /**
- *
- * @return
- */
- public Map getProperties()
- {
- return properties;
- }
-
- /**
- *
- * @param properties
- */
- public void setProperties(Map properties)
- {
- this.properties = properties;
- }
-
- /**
- *
- */
public String toString()
{
String rep = null;
Deleted: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Window.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Window.java 2007-11-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Window.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -1,240 +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.model;
-
-import java.util.Map;
-import java.util.HashMap;
-
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
-
-
-/**
- * @author <a href="mailto:sshah at redhat.com">Sohil Shah</a>
- *
- */
-public class Window extends PortalObject implements Component
-{
- /**
- * Title for this Window
- */
- private String title = null;
-
- /**
- * Content/Markup to be displayed inside this Window
- */
- private String content = null;
-
- /**
- * Content/Markup related to the header of this Window
- */
- private final String headerContent;
-
- /**
- * The State of this Window such as Normal, Maximized, Minimized etc
- */
- private final WindowState windowState;
-
- /**
- * The Mode of this Window such as View, Edit, Help etc
- */
- private final Mode mode;
-
- /**
- * Runtime View related meta data associated with this particular window.
- *
- * The meta data is provided in the form of Name/Value pairs with Name being the key of the and Value being the Value
- * of a Map entry
- */
- private Map viewMetaData = null;
-
-
- /**
- *
- *
- */
- public Window()
- {
- super();
- this.viewMetaData = new HashMap(5);
- this.headerContent = null;
- this.windowState = null;
- this.mode = null;
- }
-
- /**
- *
- *
- */
- public Window(String id,String title, String content, String headerContent, WindowState windowState, Mode mode)
- {
- super();
- this.viewMetaData = new HashMap(5);
- this.id = id;
- this.title = title;
- this.content = content;
- this.headerContent = headerContent;
- this.windowState = windowState;
- this.mode = mode;
- }
-
- /**
- *
- * @param id
- * @param content
- */
- public Window(String id, String content)
- {
- super();
- this.viewMetaData = new HashMap(5);
- this.id = id;
- this.content = content;
- this.headerContent = null;
- this.windowState = null;
- this.mode = null;
- }
-
- /**
- *
- * @param id
- * @param content
- */
- public Window(String id)
- {
- super();
- this.viewMetaData = new HashMap(5);
- this.id = id;
- this.headerContent = null;
- this.windowState = null;
- this.mode = null;
- }
-
-
- /**
- *
- * @return
- */
- public String getContent()
- {
- return content;
- }
-
-
- /**
- *
- * @param content
- */
- public void setContent(String content)
- {
- this.content = content;
- }
-
-
- /**
- *
- * @return
- */
- public String getHeaderContent()
- {
- return headerContent;
- }
-
-
- /**
- *
- * @return
- */
- public Mode getMode()
- {
- return mode;
- }
-
-
- /**
- *
- * @return
- */
- public String getTitle()
- {
- return title;
- }
-
-
- /**
- *
- * @param title
- */
- public void setTitle(String title)
- {
- this.title = title;
- }
-
-
- /**
- *
- * @return
- */
- public WindowState getWindowState()
- {
- return windowState;
- }
-
-
- /**
- *
- */
- public String toString()
- {
- return "Window: "+super.toString();
- }
-
- /**
- *
- */
- public String getMarkup()
- {
- String markup = "";
-
- markup = this.content;
-
- return markup;
- }
-
- /**
- *
- * @return
- */
- public Map getViewMetaData()
- {
- return viewMetaData;
- }
-
- /**
- *
- * @param viewMetaData
- */
- public void setViewMetaData(Map viewMetaData)
- {
- this.viewMetaData = viewMetaData;
- }
-}
Deleted: 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-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PortalObjectReader.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -1,55 +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;
-
-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
- *
- * It provides an implementation independent way to query this information without any coupling to low level Portal container
- * implementation details
- *
- * @author <a href="mailto:sshah at redhat.com">Sohil Shah</a>
- *
- */
-public interface PortalObjectReader
-{
- /**
- * Finds a Portal registered with the specified id in the system
- *
- * @param id
- * @return
- */
- public Portal findPortal(String id);
-
- /**
- * Finds a PortalObject registered as a child of the specified parent
- *
- * @param portal
- * @param id
- * @return
- */
- public PortalObject findPortalObject(PortalObject parent, String id);
-}
Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PresentationServer.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PresentationServer.java 2007-11-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PresentationServer.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -37,14 +37,8 @@
* @return
*/
Processor getProcessor();
-
+
/**
- *
- * @return
- */
- PortalObjectReader getPortalObjectReader();
-
- /**
* Obtain the markup.
*
* @param context the request context
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-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/ProcessorResponse.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -27,8 +27,6 @@
import org.jboss.portal.web.ServletContextDispatcher;
-import org.jboss.portal.presentation.model.Page;
-
/**
* @author <a href="mailto:sshah at redhat.com">Sohil Shah</a>
*
@@ -149,7 +147,7 @@
*
* @return
*/
- public Page findDisplayedPage()
+ /*public Page findDisplayedPage()
{
Page displayedPage = null;
@@ -167,5 +165,5 @@
}
return displayedPage;
- }
+ }*/
}
Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/service/PortalEntryPoint.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/service/PortalEntryPoint.java 2007-11-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/service/PortalEntryPoint.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -66,9 +66,6 @@
import org.jboss.portal.presentation.impl.classic.layout.FlexibleGridLayoutManager;
import org.jboss.portal.presentation.impl.classic.layout.RegionConstraints;
import org.jboss.portal.presentation.impl.classic.layout.RegionLayoutManager;
-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;
/**
@@ -337,7 +334,7 @@
{
InterceptorStackFactory stack = this.entryPoint.getInterceptorStackFactory();
invocation.invoke(stack.getInterceptorStack());
- ProcessorResponse processorResponse = (ProcessorResponse)req.getAttribute("processorResponse");
+ /*ProcessorResponse processorResponse = (ProcessorResponse)req.getAttribute("processorResponse");
if(processorResponse != null)
{
Page displayedPage = processorResponse.findDisplayedPage();
@@ -346,7 +343,7 @@
this.render(invocation.getServerContext().getClientResponse().getWriter(),
displayedPage);
}
- }
+ }*/
}
catch (ServerException e)
{
@@ -412,18 +409,8 @@
* @param clientConnection
* @param page
*/
- private void render(PrintWriter clientConnection, Page pageResult)
- {
- /**
- * Special Note: Currently this prototype code and layout configuration including page result creation is hard coded for the purpose
- * of getting the architecture right
- *
- * In the real implementation, LayoutState would be fetched dynamically based on the Page State/Configuration being rendered
- * Even type of Client considerations would be handled here
- *
- * Basically the UIServer would delegate functions to its various components and then send back the result to the client
- *
- */
+ /*private void render(PrintWriter clientConnection, Page pageResult)
+ {
//Some flexible grid layout testing code
Object[] gridData = this.getFlexibleGridLayoutManager(pageResult);
Page page = (Page)gridData[0];
@@ -448,16 +435,14 @@
//Sending the results back to the Client
clientConnection.write(buffer.toString());
clientConnection.flush();
- }
+ }*/
/**
*
*/
- private Object[] getFlexibleGridLayoutManager(Page pageResult)
+ /*private Object[] getFlexibleGridLayoutManager(Page pageResult)
{
- /**
- * Hard coding the FlexibleGridLayout Management here
- */
+
Page page = new Page();
Container header = new Container("header");
Container leftPanel = new Container("leftPanel");
@@ -534,7 +519,7 @@
}
return new Object[]{page, layoutManager};
- }
+ }*/
/**
@@ -544,13 +529,13 @@
* @param columns
* @return
*/
- private FlexibleGrid getGrid(String containerId,int rows, int columns)
+ /*private FlexibleGrid getGrid(String containerId,int rows, int columns)
{
FlexibleGrid grid = new FlexibleGrid(containerId);
grid.setRows(rows);
grid.setColumns(columns);
return grid;
- }
+ }*/
/**
*
@@ -561,7 +546,7 @@
* @param left
* @param right
*/
- private FlexibleGridConstraints getConstraints(String componentId, String widthPercentage, int top, int bottom, int left, int right, int row, int column)
+ /*private FlexibleGridConstraints getConstraints(String componentId, String widthPercentage, int top, int bottom, int left, int right, int row, int column)
{
FlexibleGridConstraints constraints = new FlexibleGridConstraints();
constraints.setComponentId(componentId);
@@ -573,14 +558,14 @@
constraints.setLeft(left);
constraints.setRight(right);
return constraints;
- }
+ }*/
/**
*
* @param pageResult
* @return
*/
- private Object[] getRegionBasedLayoutManager(Page pageResult)
+ /*private Object[] getRegionBasedLayoutManager(Page pageResult)
{
Page page = new Page();
Container left = new Container("left");
@@ -629,5 +614,5 @@
layoutManager.addRegionConstraints(centerConstraints);
return new Object[]{page, layoutManager};
- }
+ }*/
}
Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/service/UIServer.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/service/UIServer.java 2007-11-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/service/UIServer.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -141,7 +141,7 @@
{
ServerAction serverAction = null;
- ServerInvocationContext invocationContext = invocation.getServerContext();
+ /*ServerInvocationContext invocationContext = invocation.getServerContext();
HttpServletRequest request = invocationContext.getClientRequest();
if(request.getMethod().equals("GET"))
{
@@ -224,8 +224,8 @@
((LinkActivation)serverAction).setPortal(portal);
((LinkActivation)serverAction).setTarget(target);
}
+ */
-
return serverAction;
}
Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestFlexibleGrid.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestFlexibleGrid.java 2007-11-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestFlexibleGrid.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -28,9 +28,6 @@
import java.io.FileOutputStream;
-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.impl.classic.layout.FlexibleGrid;
import org.jboss.portal.presentation.impl.classic.layout.FlexibleGridConstraints;
import org.jboss.portal.presentation.impl.classic.layout.FlexibleGridLayoutManager;
@@ -64,7 +61,7 @@
*
* @throws Exception
*/
- public void testDoLayout() throws Exception
+ /*public void testDoLayout() throws Exception
{
// Setup a Page and a container with two portlet windows...
// This part is generic with no decoupling to anything layout specific
@@ -129,13 +126,13 @@
fos.write(buffer.toString().getBytes());
fos.flush();
fos.close();
- }
+ }*/
/**
*
* @return
*/
- private String getHtmlContent()
+ /*private String getHtmlContent()
{
String markup = null;
@@ -163,7 +160,7 @@
}
return markup;
- }
+ }*/
/**
*
@@ -172,13 +169,13 @@
* @param columns
* @return
*/
- private FlexibleGrid getGrid(String containerId,int rows, int columns)
+ /*private FlexibleGrid getGrid(String containerId,int rows, int columns)
{
FlexibleGrid grid = new FlexibleGrid(containerId);
grid.setRows(rows);
grid.setColumns(columns);
return grid;
- }
+ }*/
/**
*
@@ -189,7 +186,7 @@
* @param left
* @param right
*/
- private FlexibleGridConstraints getConstraints(String componentId, String widthPercentage, int top, int bottom, int left, int right, int row, int column)
+ /*private FlexibleGridConstraints getConstraints(String componentId, String widthPercentage, int top, int bottom, int left, int right, int row, int column)
{
FlexibleGridConstraints constraints = new FlexibleGridConstraints();
constraints.setComponentId(componentId);
@@ -201,5 +198,5 @@
constraints.setLeft(left);
constraints.setRight(right);
return constraints;
- }
+ }*/
}
Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestRegionLayoutManager.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestRegionLayoutManager.java 2007-11-15 17:17:11 UTC (rev 8954)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestRegionLayoutManager.java 2007-11-15 17:38:28 UTC (rev 8955)
@@ -28,9 +28,6 @@
import java.io.FileOutputStream;
-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.impl.classic.layout.RegionConstraints;
import org.jboss.portal.presentation.impl.classic.layout.RegionLayoutManager;
@@ -63,7 +60,7 @@
*
* @throws Exception
*/
- public void testDoLayout() throws Exception
+ /*public void testDoLayout() throws Exception
{
// Setup a Page and a container with two portlet windows...
// This part is generic with no decoupling to anything layout specific
@@ -113,13 +110,13 @@
fos.write(buffer.toString().getBytes());
fos.flush();
fos.close();
- }
+ }*/
/**
*
* @return
*/
- private String getHtmlContent()
+ /*private String getHtmlContent()
{
String markup = null;
@@ -147,5 +144,5 @@
}
return markup;
- }
+ }*/
}
More information about the portal-commits
mailing list