June 2008 - portal-commits - Jboss List Archives

JBoss Portal SVN: r11218 - in modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax: client/model/update and 2 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-06-30 13:07:44 -0400 (Mon, 30 Jun 2008) New Revision: 11218 Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxObject.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/AddChild.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/AddObject.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/CreateChildren.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/DestroyChildren.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/RemoveChild.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/RemoveObject.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/utils/Logger.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java Log: - added more logging in ajax client - piggy back object state in update of ajax client Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxObject.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxObject.java 2008-06-30 16:30:20 UTC (rev 11217) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxObject.java 2008-06-30 17:07:44 UTC (rev 11218) @@ -33,6 +33,7 @@ import org.jboss.portal.presentation.ajax.client.model.update.ObjectType; import org.jboss.portal.presentation.ajax.client.model.update.CreateChildren; import org.jboss.portal.presentation.ajax.client.model.update.AddChild; +import org.jboss.portal.presentation.ajax.client.utils.Logger; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> @@ -102,6 +103,10 @@ public static class Context { + + /** . */ + private final Logger log = Logger.getLogger(Context.class); + /** All the known objects. */ private final Map objects; @@ -130,6 +135,9 @@ ModelUpdate update = updates[i]; // + log.trace("Executing model update " + update); + + // if (update instanceof AddObject) { AddObject addObject = (AddObject)update; Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/AddChild.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/AddChild.java 2008-06-30 16:30:20 UTC (rev 11217) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/AddChild.java 2008-06-30 17:07:44 UTC (rev 11218) @@ -64,4 +64,9 @@ { this.childId = childId; } + + public String toString() + { + return "AddChild[parentId=" + parentId + ",childId=" + childId + "]"; + } } Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/AddObject.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/AddObject.java 2008-06-30 16:30:20 UTC (rev 11217) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/AddObject.java 2008-06-30 17:07:44 UTC (rev 11218) @@ -22,6 +22,9 @@ ******************************************************************************/ package org.jboss.portal.presentation.ajax.client.model.update; +import java.util.Map; +import java.util.Iterator; + /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> * @version $Revision: 630 $ @@ -35,14 +38,18 @@ /** . */ private int objectType; + /** . */ + private Map objectProperties; + public AddObject() { } - public AddObject(String objectId, int objectType) + public AddObject(String objectId, int objectType, Map objectProperties) { this.objectId = objectId; this.objectType = objectType; + this.objectProperties = objectProperties; } public String getObjectId() @@ -64,4 +71,45 @@ { this.objectType = objectType; } + + public Map getObjectProperties() + { + return objectProperties; + } + + public void setObjectProperties(Map objectProperties) + { + this.objectProperties = objectProperties; + } + + public String toString() + { + StringBuffer tmp = new StringBuffer("AddObject[objectId="); + tmp.append(objectId); + tmp.append(",objectType="); + tmp.append(objectType); + tmp.append(",objectProperties="); + if (objectProperties != null) + { + tmp.append('{'); + for (Iterator i = objectProperties.entrySet().iterator();i.hasNext();) + { + Map.Entry entry = (Map.Entry)i.next(); + String key = (String)entry.getKey(); + Object value = entry.getValue(); + tmp.append(key).append('=').append(value); + if (i.hasNext()) + { + tmp.append(','); + } + } + tmp.append('}'); + } + else + { + tmp.append("null"); + } + tmp.append(']'); + return tmp.toString(); + } } Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/CreateChildren.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/CreateChildren.java 2008-06-30 16:30:20 UTC (rev 11217) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/CreateChildren.java 2008-06-30 17:07:44 UTC (rev 11218) @@ -50,4 +50,9 @@ { this.objectId = objectId; } + + public String toString() + { + return "CreaterChildren[objectId=" + objectId + "]"; + } } Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/DestroyChildren.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/DestroyChildren.java 2008-06-30 16:30:20 UTC (rev 11217) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/DestroyChildren.java 2008-06-30 17:07:44 UTC (rev 11218) @@ -50,4 +50,9 @@ { this.objectId = objectId; } + + public String toString() + { + return "DestroyChildren[objectId=" + objectId + "]"; + } } Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/RemoveChild.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/RemoveChild.java 2008-06-30 16:30:20 UTC (rev 11217) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/RemoveChild.java 2008-06-30 17:07:44 UTC (rev 11218) @@ -64,5 +64,10 @@ { this.childId = childId; } + + public String toString() + { + return "RemoveChild[parentId=" + parentId + ",childId=" + childId + "]"; + } } Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/RemoveObject.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/RemoveObject.java 2008-06-30 16:30:20 UTC (rev 11217) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/update/RemoveObject.java 2008-06-30 17:07:44 UTC (rev 11218) @@ -50,4 +50,9 @@ { this.objectId = objectId; } + + public String toString() + { + return "RemoveObject[objectId=" + objectId + "]"; + } } Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/utils/Logger.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/utils/Logger.java 2008-06-30 16:30:20 UTC (rev 11217) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/utils/Logger.java 2008-06-30 17:07:44 UTC (rev 11218) @@ -36,6 +36,9 @@ { /** . */ + private static final String PREFIX = "org.jboss.portal.presentation.ajax.client."; + + /** . */ private static final Map loggers = new HashMap(); /** . */ @@ -57,6 +60,11 @@ // String name = clazz.toString(); + name = name.substring("class ".length()); + if (name.startsWith(PREFIX)) + { + name = name.substring(PREFIX.length()); + } // Logger logger = (Logger)loggers.get(name); Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java 2008-06-30 16:30:20 UTC (rev 11217) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java 2008-06-30 17:07:44 UTC (rev 11218) @@ -36,6 +36,7 @@ import org.jboss.portal.presentation.ajax.client.model.update.AddChild; import org.jboss.portal.presentation.ajax.client.model.update.RemoveChild; import org.jboss.portal.presentation.ajax.client.model.update.ObjectType; +import org.jboss.portal.presentation.state.StateType; import org.jboss.portal.common.NotYetImplemented; import java.util.ArrayList; @@ -75,8 +76,12 @@ public void addObject(UIObject object) { - objects.put(object.getId(), object); + String objectId = object.getId(); + // + objects.put(objectId, object); + + // int objectType; if (object instanceof UIContext) { @@ -100,7 +105,15 @@ } // - updates.add(new AddObject(object.getId(), objectType)); + Map objectProperties = new HashMap(); + for (String propertyName : object.getPropertyNames(StateType.STRUCTURAL)) + { + Object propertyValue = object.getPropertyValue(StateType.STRUCTURAL, propertyName, Object.class); + objectProperties.put(propertyName, propertyValue); + } + + // + updates.add(new AddObject(objectId, objectType, objectProperties)); } public void updateObject(String objectId)

15 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r11217 - modules/presentation/trunk/ajax.

by portal-commits＠lists.jboss.org

Author: emuckenhuber Date: 2008-06-30 12:30:20 -0400 (Mon, 30 Jun 2008) New Revision: 11217 Modified: modules/presentation/trunk/ajax/pom.xml Log: add linux profile Modified: modules/presentation/trunk/ajax/pom.xml =================================================================== --- modules/presentation/trunk/ajax/pom.xml 2008-06-30 16:18:54 UTC (rev 11216) +++ modules/presentation/trunk/ajax/pom.xml 2008-06-30 16:30:20 UTC (rev 11217) @@ -108,6 +108,26 @@ </dependency> </dependencies> </profile> + <profile> + <id>gwt-linux</id> + <activation> + <os> + <family>linux</family> + </os> + </activation> + <properties> + <gwt.os>linux</gwt.os> + <gwt.compiler.classpath>${maven.dependency.com.google.gwt.gwt-dev-linux.jar.path}</gwt.compiler.classpath> + </properties> + <dependencies> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev-linux</artifactId> + <version>${version.gwt}</version> + <scope>package</scope> + </dependency> + </dependencies> + </profile> </profiles> <build>

15 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r11216 - in branches/JBoss_Portal_Branch_2_6/core-cms/src: resources/portal-cms-war/WEB-INF/jsp/cms/admin and 1 other directory.

by portal-commits＠lists.jboss.org

Author: sohil.shah(a)jboss.com Date: 2008-06-30 12:18:54 -0400 (Mon, 30 Jun 2008) New Revision: 11216 Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp Log: JBPORTAL-2046 - Exception is thrown upon clicking the '+' symbol of the 'Root Folder' node when moving content Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-06-30 16:16:11 UTC (rev 11215) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-06-30 16:18:54 UTC (rev 11216) @@ -253,34 +253,60 @@ } else if (CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION.equals(op)) { - String sNavPath = rReq.getParameter("navpath"); - - List folders = this.getFolderList(sNavPath); - - rReq.setAttribute("folders", folders); - rRes.setContentType("text/html"); - rReq.setAttribute("navpath", sNavPath); - - String sPath = rReq.getParameter("path"); - rRes.setContentType("text/html"); - rReq.setAttribute("createpath", sPath); - javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/confirmcreatecollection.jsp"); - prd.include(rReq, rRes); + try + { + String sNavPath = rReq.getParameter("navpath"); + + List folders = this.getFolderList(sNavPath); + if((folders == null || folders.isEmpty()) && + !sNavPath.equals("/")) + { + sNavPath = NodeUtil.getParentPath(sNavPath); + folders = this.getFolderList(sNavPath); + } + + rReq.setAttribute("folders", folders); + rRes.setContentType("text/html"); + rReq.setAttribute("navpath", sNavPath); + + String sPath = rReq.getParameter("path"); + rRes.setContentType("text/html"); + rReq.setAttribute("createpath", sPath); + javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/confirmcreatecollection.jsp"); + prd.include(rReq, rRes); + } + catch(Exception e) + { + throw new PortletException(e); + } } else if (CMSAdminConstants.OP_UPLOADCONFIRM.equals(op)) { - String sPath = rReq.getParameter("path"); - String sNavPath = rReq.getParameter("navpath"); - - List folders = this.getFolderList(sNavPath); - - rReq.setAttribute("folders", folders); - rRes.setContentType("text/html"); - rReq.setAttribute("currpath", sPath); - rReq.setAttribute("navpath", sNavPath); - rReq.setAttribute("defaultlocale", CMSService.getDefaultLocale()); - javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/upload.jsp"); - prd.include(rReq, rRes); + try + { + String sPath = rReq.getParameter("path"); + String sNavPath = rReq.getParameter("navpath"); + + List folders = this.getFolderList(sNavPath); + if((folders == null || folders.isEmpty()) && + !sNavPath.equals("/")) + { + sNavPath = NodeUtil.getParentPath(sNavPath); + folders = this.getFolderList(sNavPath); + } + + rReq.setAttribute("folders", folders); + rRes.setContentType("text/html"); + rReq.setAttribute("currpath", sPath); + rReq.setAttribute("navpath", sNavPath); + rReq.setAttribute("defaultlocale", CMSService.getDefaultLocale()); + javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/upload.jsp"); + prd.include(rReq, rRes); + } + catch(Exception e) + { + throw new PortletException(e); + } } else if (CMSAdminConstants.OP_VIEWFILE.equals(op)) { @@ -364,49 +390,88 @@ } else if (CMSAdminConstants.OP_UPLOADARCHIVECONFIRM.equals(op)) { - String sPath = rReq.getParameter("path"); - String sNavPath = rReq.getParameter("navpath"); - - List folders = this.getFolderList(sNavPath); - - rReq.setAttribute("folders", folders); - rRes.setContentType("text/html"); - rReq.setAttribute("currpath", sPath); - rReq.setAttribute("navpath", sNavPath); - javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/uploadarchive.jsp"); - prd.include(rReq, rRes); + try + { + String sPath = rReq.getParameter("path"); + String sNavPath = rReq.getParameter("navpath"); + + List folders = this.getFolderList(sNavPath); + if((folders == null || folders.isEmpty()) && + !sNavPath.equals("/")) + { + sNavPath = NodeUtil.getParentPath(sNavPath); + folders = this.getFolderList(sNavPath); + } + + rReq.setAttribute("folders", folders); + rRes.setContentType("text/html"); + rReq.setAttribute("currpath", sPath); + rReq.setAttribute("navpath", sNavPath); + javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/uploadarchive.jsp"); + prd.include(rReq, rRes); + } + catch(Exception e) + { + throw new PortletException(e); + } } else if (CMSAdminConstants.OP_CONFIRMCOPY.equals(op)) { - String sPath = rReq.getParameter("path"); - String sNavPath = rReq.getParameter("navpath"); - String sType = rReq.getParameter("type"); - - List folders = this.getFolderList(sNavPath); - - rReq.setAttribute("folders", folders); - rRes.setContentType("text/html"); - rReq.setAttribute("currpath", sPath); - rReq.setAttribute("navpath", sNavPath); - rReq.setAttribute("type", sType); - javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/confirmcopy.jsp"); - prd.include(rReq, rRes); + try + { + String sPath = rReq.getParameter("path"); + String sNavPath = rReq.getParameter("navpath"); + String sType = rReq.getParameter("type"); + + List folders = this.getFolderList(sNavPath); + if((folders == null || folders.isEmpty()) && + !sNavPath.equals("/")) + { + sNavPath = NodeUtil.getParentPath(sNavPath); + folders = this.getFolderList(sNavPath); + } + + rReq.setAttribute("folders", folders); + rRes.setContentType("text/html"); + rReq.setAttribute("currpath", sPath); + rReq.setAttribute("navpath", sNavPath); + rReq.setAttribute("type", sType); + javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/confirmcopy.jsp"); + prd.include(rReq, rRes); + } + catch(Exception e) + { + throw new PortletException(e); + } } else if (CMSAdminConstants.OP_CONFIRMMOVE.equals(op)) { - String sPath = rReq.getParameter("path"); - String sNavPath = rReq.getParameter("navpath"); - String sType = rReq.getParameter("type"); - - List folders = this.getFolderList(sNavPath); - - rReq.setAttribute("folders", folders); - rRes.setContentType("text/html"); - rReq.setAttribute("currpath", sPath); - rReq.setAttribute("navpath", sNavPath); - rReq.setAttribute("type", sType); - javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/confirmmove.jsp"); - prd.include(rReq, rRes); + try + { + String sPath = rReq.getParameter("path"); + String sNavPath = rReq.getParameter("navpath"); + String sType = rReq.getParameter("type"); + + List folders = this.getFolderList(sNavPath); + if((folders == null || folders.isEmpty()) && + !sNavPath.equals("/")) + { + sNavPath = NodeUtil.getParentPath(sNavPath); + folders = this.getFolderList(sNavPath); + } + + rReq.setAttribute("folders", folders); + rRes.setContentType("text/html"); + rReq.setAttribute("currpath", sPath); + rReq.setAttribute("navpath", sNavPath); + rReq.setAttribute("type", sType); + javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/confirmmove.jsp"); + prd.include(rReq, rRes); + } + catch(Exception e) + { + throw new PortletException(e); + } } else if (CMSAdminConstants.OP_CONFIRMDELETE.equals(op)) { @@ -538,17 +603,30 @@ } else if (CMSAdminConstants.OP_EXPORTARCHIVE.equals(op)) { - String sPath = rReq.getParameter("path"); - String sNavPath = rReq.getParameter("navpath"); - - List folders = this.getFolderList(sNavPath); - - rReq.setAttribute("folders", folders); - rRes.setContentType("text/html"); - rReq.setAttribute("currpath", sPath); - rReq.setAttribute("navpath", sNavPath); - javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/exportarchive.jsp"); - prd.include(rReq, rRes); + try + { + String sPath = rReq.getParameter("path"); + String sNavPath = rReq.getParameter("navpath"); + + List folders = this.getFolderList(sNavPath); + if((folders == null || folders.isEmpty()) && + !sNavPath.equals("/")) + { + sNavPath = NodeUtil.getParentPath(sNavPath); + folders = this.getFolderList(sNavPath); + } + + rReq.setAttribute("folders", folders); + rRes.setContentType("text/html"); + rReq.setAttribute("currpath", sPath); + rReq.setAttribute("navpath", sNavPath); + javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/exportarchive.jsp"); + prd.include(rReq, rRes); + } + catch(Exception e) + { + throw new PortletException(e); + } } else if (CMSAdminConstants.OP_EXPORTARCHIVE_PICKUP.equals(op)) { Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp 2008-06-30 16:16:11 UTC (rev 11215) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp 2008-06-30 16:18:54 UTC (rev 11216) @@ -26,7 +26,7 @@ <a href="<portlet:renderURL> <portlet:param name="op" value="<%= OP %>"/> - <portlet:param name="path" value="/"/> + <portlet:param name="path" value="<%= sCurrPath %>"/> <portlet:param name="navpath" value="/"/> <% if (sCMType != null)

15 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r11215 - in modules/presentation/trunk/presentation/src: main/java/org/jboss/portal/presentation/layout and 2 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-06-30 12:16:11 -0400 (Mon, 30 Jun 2008) New Revision: 11215 Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIWindowImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/layout/ModelLayoutAdapter.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIObject.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java Log: correct naming of method Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java 2008-06-30 16:11:18 UTC (rev 11214) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java 2008-06-30 16:16:11 UTC (rev 11215) @@ -96,7 +96,7 @@ return structuralObject.getId(); } - public <T> T getProperty(StateType stateType, String propertyName, Class<T> propertyType) throws IllegalArgumentException, StateException + public <T> T getPropertyValue(StateType stateType, String propertyName, Class<T> propertyType) throws IllegalArgumentException, StateException { if (stateType == null) { Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIWindowImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIWindowImpl.java 2008-06-30 16:11:18 UTC (rev 11214) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIWindowImpl.java 2008-06-30 16:16:11 UTC (rev 11215) @@ -44,11 +44,11 @@ public WindowState getWindowState() { - return getProperty(StateType.NAVIGATIONAL, "windowstate", WindowState.class); + return getPropertyValue(StateType.NAVIGATIONAL, "windowstate", WindowState.class); } public Mode getMode() { - return getProperty(StateType.NAVIGATIONAL, "mode", Mode.class); + return getPropertyValue(StateType.NAVIGATIONAL, "mode", Mode.class); } } Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/layout/ModelLayoutAdapter.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/layout/ModelLayoutAdapter.java 2008-06-30 16:11:18 UTC (rev 11214) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/layout/ModelLayoutAdapter.java 2008-06-30 16:16:11 UTC (rev 11215) @@ -45,7 +45,7 @@ UIObject object = item.getObject(); // - return object.getProperty(StateType.STRUCTURAL, propertyName, propertyType); + return object.getPropertyValue(StateType.STRUCTURAL, propertyName, propertyType); } public Collection<? extends UINode> getChildren(UINode item) Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIObject.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIObject.java 2008-06-30 16:11:18 UTC (rev 11214) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIObject.java 2008-06-30 16:16:11 UTC (rev 11215) @@ -54,7 +54,10 @@ * @throws IllegalArgumentException if any argument is null or not valid * @throws StateException any state exception */ - <T> T getProperty(StateType stateType, String propertyName, Class<T> propertyType) throws IllegalArgumentException, StateException; + <T> T getPropertyValue( + StateType stateType, + String propertyName, + Class<T> propertyType) throws IllegalArgumentException, StateException; /** * Returns the set of property names of this object Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java 2008-06-30 16:11:18 UTC (rev 11214) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java 2008-06-30 16:16:11 UTC (rev 11215) @@ -70,7 +70,7 @@ for (String name : object.getPropertyNames(StateType.STRUCTURAL)) { - String value = object.getProperty(StateType.STRUCTURAL, name, String.class); + String value = object.getPropertyValue(StateType.STRUCTURAL, name, String.class); properties.put(name, value); } }

15 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r11214 - branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF.

by portal-commits＠lists.jboss.org

Author: prabhat.jha(a)jboss.com Date: 2008-06-30 12:11:18 -0400 (Mon, 30 Jun 2008) New Revision: 11214 Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml Log: JBPORTAL-2054 make pessimistic locking default Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-06-30 16:05:27 UTC (rev 11213) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-06-30 16:11:18 UTC (rev 11214) @@ -485,10 +485,34 @@ org.jboss.cache.JBossTransactionManagerLookup </attribute> - <attribute name="NodeLockingScheme">OPTIMISTIC</attribute> +  +  + +  <attribute name="IsolationLevel">REPEATABLE_READ</attribute> - <attribute name="CacheMode">REPL_SYNC</attribute> +  + <attribute name="CacheMode">REPL_ASYNC</attribute> <attribute name="ClusterName"> ${portal.hibernate.cache.partition.name:portal.hibernate} @@ -549,6 +573,8 @@ <pbcast.GMS print_local_addr="true" join_timeout="3000" down_thread="false" up_thread="false" join_retry_timeout="2000" shun="true" view_bundling="true" /> + <FC max_credits="2000000" down_thread="false" up_thread="false" + min_threshold="0.10"/> <FRAG2 frag_size="60000" down_thread="false" up_thread="false" /> <pbcast.STATE_TRANSFER down_thread="false"

15 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r11213 - modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-06-30 12:05:27 -0400 (Mon, 30 Jun 2008) New Revision: 11213 Removed: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/layout/ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model2/ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/ Log: remove unused stuff

15 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r11212 - in modules/presentation/trunk: classic/src/main/java/org/jboss/portal/presentation/classic/model and 10 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-06-30 12:00:29 -0400 (Mon, 30 Jun 2008) New Revision: 11212 Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicViewPortContext.java modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/page-structure.xml modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelStructuralState.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedUINode.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedViewPortContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralAdapter.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIObject.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObjectImpl.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/CustomScope.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java Log: remove name property on portal object, it can be used but should not be mandatory as some ui object won't have natural names Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -288,7 +288,7 @@ String url = encoder.encode(viewPage, encoderContext); - writer.print("<div>Link to page <a href=\"" + url + "\">" + object.getName() + "</a></div>"); + writer.print("<div>Link to page <a href=\"" + url + "\">" + object.getId() + "</a></div>"); } } } @@ -301,7 +301,7 @@ // writer.print("<li class=\"element\">"); writer.print("<div>"); - writer.print("Window " + object.getName()); + writer.print("Window " + object.getId()); writer.print("</div>"); writer.print("<div>"); writer.print(content.getMarkup()); Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -59,11 +59,6 @@ return object.getId(); } - public String getName() - { - return object.getName(); - } - public UIObject getObject() { return object; Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicViewPortContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicViewPortContext.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicViewPortContext.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -92,7 +92,7 @@ ClassicUINode child = nodes.get(childId); // - parent.children.put(child.getName(), child); + parent.children.put(child.getId(), child); child.parent = parent; } Modified: modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/page-structure.xml =================================================================== --- modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/page-structure.xml 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/page-structure.xml 2008-06-30 16:00:29 UTC (rev 11212) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <context-def xmlns="urn:jboss:portal:presentation:page:1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - name=""> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <simple-layout> <window-def name="windowA"> <portlet ref="/portal-server.Catalog"/> Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java =================================================================== --- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -237,23 +237,6 @@ } } - public String getName(Object o) - { - if (o instanceof PortalNode) - { - return ((PortalNode)o).getName(); - } - else if (o instanceof LayoutElement) - { - // no natural name, for now use id - return ((LayoutElement)o).getId(); - } - else - { - throw new NotYetImplemented(); - } - } - public Map<String, Serializable> getProperties(Object o) { if (o instanceof PageNode) @@ -311,11 +294,10 @@ public StructuralState getState(Object o) { Class<? extends UIObject> type = getType(o); - String name = getName(o); Map<String, Serializable> properties = getProperties(o); // - return new ModelStructuralState(type, name, properties); + return new ModelStructuralState(type, properties); } public void lock(Object o) Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelStructuralState.java =================================================================== --- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelStructuralState.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelStructuralState.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -39,18 +39,13 @@ private final Class<? extends UIObject> type; /** . */ - private final String name; - - /** . */ private final Map<String, Serializable> properties; public ModelStructuralState( Class<? extends UIObject> type, - String name, Map<String, Serializable> properties) { this.type = type; - this.name = name; this.properties = properties; } @@ -59,11 +54,6 @@ return type; } - public String getName() - { - return name; - } - public Map<String, Serializable> getProperties() { return properties; @@ -86,12 +76,6 @@ } // - if (!that.name.equals(this.name)) - { - return false; - } - - // return that.properties.equals(this.properties); } return false; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedUINode.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedUINode.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedUINode.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -59,11 +59,6 @@ return object.getId(); } - public String getName() - { - return object.getName(); - } - public UIObject getObject() { return object; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedViewPortContext.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedViewPortContext.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedViewPortContext.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -92,7 +92,7 @@ DetachedUINode child = nodes.get(childId); // - parent.children.put(child.getName(), child); + parent.children.put(child.getId(), child); child.parent = parent; } Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -96,11 +96,6 @@ return structuralObject.getId(); } - public String getName() - { - return structuralObject.getState().getName(); - } - public <T> T getProperty(StateType stateType, String propertyName, Class<T> propertyType) throws IllegalArgumentException, StateException { if (stateType == null) Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralAdapter.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralAdapter.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralAdapter.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -48,8 +48,6 @@ Class<? extends UIObject> getType(N n); - String getName(N n); - Map<String, Serializable> getProperties(N n); StructuralState getState(N n); Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIObject.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIObject.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIObject.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -45,13 +45,6 @@ String getId(); /** - * Returns the name. - * - * @return the name - */ - String getName(); - - /** * Returns a property value or null if it does not exist. * * @param stateType the state type Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -38,7 +38,5 @@ Class<? extends UIObject> getType(); - String getName(); - Map<String, Serializable> getProperties(); } \ No newline at end of file Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -107,7 +107,6 @@ assertEquals(rootId, root.getId()); StructuralState state = root.getState(); assertEquals(UIContext.class, state.getType()); - assertEquals("", state.getName()); assertEquals(Collections.EMPTY_MAP, state.getProperties()); } @@ -166,7 +165,6 @@ assertEquals(fooId, foo.getId()); StructuralState fooState = foo.getState(); assertNotNull(fooState); - assertEquals("foo", fooState.getName()); assertEquals(Collections.EMPTY_MAP, fooState.getProperties()); assertEquals(UIPage.class, fooState.getType()); root = getStructuralStateContext().loadParent(foo); Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObjectImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObjectImpl.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObjectImpl.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -200,11 +200,11 @@ } if (propertyBehavior != null) { - propertyBehaviors.put(name, propertyBehavior); + propertyBehaviors.put(propertyName, propertyBehavior); } else { - propertyBehaviors.remove(name); + propertyBehaviors.remove(propertyName); } } @@ -257,7 +257,7 @@ } // - StructuralStateImpl state = new StructuralStateImpl(type, name, new HashMap<String, Serializable>(propertyValues)); + StructuralStateImpl state = new StructuralStateImpl(type, new HashMap<String, Serializable>(propertyValues)); // return new StructuralObjectImpl(handle, parentHandle, childrenHandles, state); Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -39,15 +39,11 @@ private final Class<? extends UIObject> type; /** . */ - private final String name; - - /** . */ private final Map<String, Serializable> properties; - public StructuralStateImpl(Class<? extends UIObject> type, String name, Map<String, Serializable> properties) + public StructuralStateImpl(Class<? extends UIObject> type, Map<String, Serializable> properties) { this.type = type; - this.name = name; this.properties = properties; } @@ -56,11 +52,6 @@ return type; } - public String getName() - { - return name; - } - public Map<String, Serializable> getProperties() { return properties; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/CustomScope.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/CustomScope.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/CustomScope.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -76,12 +76,12 @@ } else { - NodeDef child = current.getChild(object.getName()); + NodeDef child = current.getChild(object.getId()); // if (child == null) { - throw new IllegalStateException("No such child " + object.getName()); + throw new IllegalStateException("No such child " + object.getId()); } // Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -182,7 +182,6 @@ public void assertEquals(UIObjectNode objectNode) { - Assert.assertEquals(name, objectNode.getObject().getName()); Assert.assertEquals(properties.keySet(), objectNode.getProperties().keySet()); for (String propertyName : properties.keySet()) { @@ -216,7 +215,6 @@ // for (UIObjectNode childObjectNode : objectNode.getChildren().values()) { - NodeDef child = children.get(childObjectNode.getObject().getName()); child.assertEquals(childObjectNode); } break; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -98,7 +98,7 @@ } // - String key = child.getObject().getName(); + String key = child.getObject().getId(); // if (children.containsKey(key)) @@ -118,7 +118,7 @@ } // - String key = child.getObject().getName(); + String key = child.getObject().getId(); // if (!children.containsKey(key))

15 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r11211 - in modules/presentation/trunk: ajax/src/main/java/org/jboss/portal/presentation/ajax/server and 8 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-06-30 11:29:22 -0400 (Mon, 30 Jun 2008) New Revision: 11211 Removed: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/DefaultPageViewPortScope.java Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxObject.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/PresentationClientServlet.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/page-structure.xml modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelImporter.java modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/ContextNode.java modules/presentation/trunk/portal/src/main/resources/org/jboss/portal/presentation/portal/page_structure_1_0.xsd modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIContextImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/PageViewPortScope.java Log: make the root context to BE a page, simplify quite lot of stuff Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxObject.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxObject.java 2008-06-30 15:18:57 UTC (rev 11210) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/client/model/AjaxObject.java 2008-06-30 15:29:22 UTC (rev 11211) @@ -140,15 +140,16 @@ // switch (addObject.getObjectType()) { - case ObjectType.PAGE: + case ObjectType.CONTEXT: if (root != null) { throw new IllegalStateException("Already a root page"); } - - // object = root = new AjaxPage(addObject.getObjectId()); break; + case ObjectType.PAGE: + object = root = new AjaxPage(addObject.getObjectId()); + break; case ObjectType.WINDOW: object = new AjaxWindow(addObject.getObjectId()); break; Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/PresentationClientServlet.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/PresentationClientServlet.java 2008-06-30 15:18:57 UTC (rev 11210) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/PresentationClientServlet.java 2008-06-30 15:29:22 UTC (rev 11211) @@ -37,16 +37,11 @@ import org.jboss.portal.presentation.server.PresentationResponse; import org.jboss.portal.presentation.model.UIModel; import org.jboss.portal.presentation.model.ViewPort; -import org.jboss.portal.presentation.model.ViewPortScope; -import org.jboss.portal.presentation.model.UINode; import org.jboss.portal.presentation.content.ContentFragment; import org.jboss.portal.presentation.impl.model.UIModelImpl; -import org.jboss.portal.presentation.impl.model.pull.DetachedViewPortContext; import org.jboss.portal.presentation.impl.state.navigational.NavigationalStateContextImpl; import org.jboss.portal.presentation.impl.state.navigational.DelegatingNavigationalStateContext; -import org.jboss.portal.presentation.view.DefaultPageViewPortScope; import org.jboss.portal.presentation.view.PageViewPortScope; -import org.jboss.portal.presentation.state.structural.StructuralStateContext; import org.jboss.portal.presentation.client.PresentationClient; import org.jboss.portal.presentation.protocol.codec.ActionEncoder; import org.jboss.portal.presentation.protocol.codec.ActionDecoder; @@ -80,19 +75,6 @@ super.init(); } - private String getDefaultPageId(PresentationServer server) - { - StructuralStateContext ssc = server.getStructuralStateContext(); - ViewPortScope scope = new DefaultPageViewPortScope(ssc.getRootId()); - DetachedViewPortContext context = new DetachedViewPortContext(); - UIModel model = new UIModelImpl(null, ssc); - ViewPort viewPort = model.createViewPort(context, scope); - viewPort.refresh(); - UINode root = context.getNode(ssc.getRootId()); - UINode defaultPage = root.getChildren().iterator().next(); - return defaultPage.getObject().getId(); - } - public ModelUpdate[] ping() { PresentationServer server = getPresentationServer(); @@ -104,12 +86,9 @@ AjaxViewPortContext viewPortContext = new AjaxViewPortContext(); // - String defaultPageId = getDefaultPageId(server); + ViewPort viewPort = model.createViewPort(viewPortContext, new PageViewPortScope(server.getStructuralStateContext().getRootId())); // - ViewPort viewPort = model.createViewPort(viewPortContext, new PageViewPortScope(defaultPageId)); - - // viewPort.refresh(); // Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-06-30 15:18:57 UTC (rev 11210) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-06-30 15:29:22 UTC (rev 11211) @@ -26,7 +26,6 @@ import org.jboss.portal.presentation.classic.model.ClassicViewPortContext; import org.jboss.portal.presentation.classic.protocol.ClassicActionDecoderContext; import org.jboss.portal.presentation.classic.protocol.ClassicActionEncoderContext; -import org.jboss.portal.presentation.view.DefaultPageViewPortScope; import org.jboss.portal.presentation.view.PageViewPortScope; import org.jboss.portal.presentation.protocol.codec.ActionDecoder; import org.jboss.portal.presentation.protocol.codec.ActionDecoderContext; @@ -228,15 +227,8 @@ else { StructuralStateContext ssc = server.getStructuralStateContext(); - ViewPortScope scope = new DefaultPageViewPortScope(ssc.getRootId()); - ClassicViewPortContext context = new ClassicViewPortContext(); - UIModel model = new UIModelImpl(null, ssc); - ViewPort viewPort = model.createViewPort(context, scope); - viewPort.refresh(); - UINode root = context.getNode(ssc.getRootId()); - UINode defaultPage = root.getChildren().iterator().next(); - String defaultPageId = defaultPage.getObject().getId(); - renderDocument(new PageViewPortScope(defaultPageId), defaultPageId); + ViewPortScope scope = new PageViewPortScope(ssc.getRootId()); + renderDocument(scope, ssc.getRootId()); } } Modified: modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/page-structure.xml =================================================================== --- modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/page-structure.xml 2008-06-30 15:18:57 UTC (rev 11210) +++ modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/page-structure.xml 2008-06-30 15:29:22 UTC (rev 11211) @@ -1,77 +1,56 @@ <?xml version="1.0" encoding="UTF-8"?> <context-def xmlns="urn:jboss:portal:presentation:page:1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <page-def name="default"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + name=""> + <simple-layout> + <window-def name="windowA"> + <portlet ref="/portal-server.Catalog"/> + </window-def> + <window-def name="windowB"> + <portlet ref="/portal-server.Cart"/> + </window-def> + <simple-layout orientation="horizontal"> + <window-def name="windowC"> + <markup>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</markup> + </window-def> + <window-def name="windowD"> + <markup>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</markup> + </window-def> + </simple-layout> + <simple-layout orientation="horizontal"> + <window-def name="windowE"> + <portlet ref="/portal-server.PublicParameterPortlet1"/> + </window-def> + <window-def name="windowF"> + <portlet ref="/portal-server.PublicParameterPortlet2"/> + </window-def> + <window-def name="windowG"> + <portlet ref="/portal-server.PublicParameterPortlet3"/> + </window-def> + </simple-layout> + </simple-layout> + <page-def name="child-page-1"> <simple-layout> <window-def name="windowA"> - <portlet ref="/portal-server.Catalog"/> + <markup>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</markup> </window-def> <window-def name="windowB"> - <portlet ref="/portal-server.Cart"/> + <markup>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</markup> </window-def> - <simple-layout orientation="horizontal"> - <window-def name="windowC"> - <markup>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</markup> - </window-def> - <window-def name="windowD"> - <markup>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</markup> - </window-def> - </simple-layout> - <simple-layout orientation="horizontal"> - <window-def name="windowE"> - <portlet ref="/portal-server.PublicParameterPortlet1"/> - </window-def> - <window-def name="windowF"> - <portlet ref="/portal-server.PublicParameterPortlet2"/> - </window-def> - <window-def name="windowG"> - <portlet ref="/portal-server.PublicParameterPortlet3"/> - </window-def> - </simple-layout> </simple-layout> - <page-def name="child-page-default-1"> - <simple-layout> - <window-def name="windowA"> - <markup>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</markup> - </window-def> - <window-def name="windowB"> - <markup>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</markup> - </window-def> - </simple-layout> - </page-def> - <page-def name="child-page-default-2"> - <simple-layout> - <window-def name="windowA"> - <portlet ref="/portal-server.PublicParameterPortlet1"/> - </window-def> - <window-def name="windowB"> - <portlet ref="/portal-server.PublicParameterPortlet2"/> - </window-def> - <window-def name="windowC"> - <portlet ref="/portal-server.PublicParameterPortlet3"/> - </window-def> - </simple-layout> - </page-def> </page-def> - <page-def name="default-sibling-1"> + <page-def name="child-page-2"> <simple-layout> <window-def name="windowA"> - <markup>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</markup> + <portlet ref="/portal-server.PublicParameterPortlet1"/> </window-def> <window-def name="windowB"> - <markup>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</markup> + <portlet ref="/portal-server.PublicParameterPortlet2"/> </window-def> <window-def name="windowC"> - <markup>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</markup> + <portlet ref="/portal-server.PublicParameterPortlet3"/> </window-def> - <window-def name="windowD"> - <markup>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</markup> - </window-def> - <window-def name="windowE"> - <markup>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</markup> - </window-def> </simple-layout> </page-def> </context-def> Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelImporter.java =================================================================== --- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelImporter.java 2008-06-30 15:18:57 UTC (rev 11210) +++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelImporter.java 2008-06-30 15:29:22 UTC (rev 11211) @@ -35,6 +35,7 @@ import org.jboss.portal.presentation.portal.model.node.PortalNode; import org.jboss.portal.presentation.portal.model.node.PageNode; import org.jboss.portal.presentation.portal.model.node.WindowNode; +import org.jboss.portal.presentation.portal.model.node.ContextNode; import org.jboss.portal.presentation.layout.Constants; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -80,12 +81,12 @@ } /** The root to import the children to. */ - private final PortalNode root; + private final ContextNode root; /** . */ private final LayoutStore layoutStore; - public ModelImporter(PortalNode root, LayoutStore layoutStore) + public ModelImporter(ContextNode root, LayoutStore layoutStore) { this.root = root; this.layoutStore = layoutStore; @@ -137,11 +138,8 @@ private void importContextDef(org.w3c.dom.Element contextDefElt) { - // Children pages - for (org.w3c.dom.Element childElt : getChildren(contextDefElt, "page-def")) - { - importPageDef(root, childElt); - } + // Sub pages + populatePage(root, contextDefElt); } private PageNode importPageDef(PortalNode parentNode, org.w3c.dom.Element pageDefElt) @@ -149,6 +147,15 @@ PageNode page = createStructuralNode(parentNode, PageNode.class, pageDefElt); // Sub pages + populatePage(page, pageDefElt); + + // + return page; + } + + private void populatePage(PageNode page, Element pageDefElt) + { + // Sub pages for (org.w3c.dom.Element childElt : getChildren(pageDefElt, "page-def")) { importPageDef(page, childElt); @@ -162,9 +169,6 @@ { importLayout(page, element); } - - // - return page; } private void importLayout(PageNode page, Element element) Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/ContextNode.java =================================================================== --- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/ContextNode.java 2008-06-30 15:18:57 UTC (rev 11210) +++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/node/ContextNode.java 2008-06-30 15:29:22 UTC (rev 11211) @@ -29,7 +29,7 @@ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> * @version $Revision: 630 $ */ -public class ContextNode extends PortalNode +public class ContextNode extends PageNode { public ContextNode(String name, PortalNodeManager structuralStateContext) { Modified: modules/presentation/trunk/portal/src/main/resources/org/jboss/portal/presentation/portal/page_structure_1_0.xsd =================================================================== --- modules/presentation/trunk/portal/src/main/resources/org/jboss/portal/presentation/portal/page_structure_1_0.xsd 2008-06-30 15:18:57 UTC (rev 11210) +++ modules/presentation/trunk/portal/src/main/resources/org/jboss/portal/presentation/portal/page_structure_1_0.xsd 2008-06-30 15:29:22 UTC (rev 11211) @@ -54,12 +54,7 @@ <xsd:complexType name="contextDefType"> <xsd:complexContent> - <xsd:extension base="nodeDefType"> - <xsd:sequence> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="page-def" type="pageDefType"/> - </xsd:choice> - </xsd:sequence> + <xsd:extension base="pageDefType"> </xsd:extension> </xsd:complexContent> </xsd:complexType> Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIContextImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIContextImpl.java 2008-06-30 15:18:57 UTC (rev 11210) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIContextImpl.java 2008-06-30 15:29:22 UTC (rev 11211) @@ -29,7 +29,7 @@ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> * @version $Revision: 630 $ */ -public class UIContextImpl extends UIObjectImpl implements UIContext +public class UIContextImpl extends UIPageImpl implements UIContext { public UIContextImpl( StructuralObject structuralObject, Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIContext.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIContext.java 2008-06-30 15:18:57 UTC (rev 11210) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIContext.java 2008-06-30 15:29:22 UTC (rev 11211) @@ -26,6 +26,6 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public interface UIContext extends UIObject +public interface UIContext extends UIPage { } \ No newline at end of file Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/DefaultPageViewPortScope.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/DefaultPageViewPortScope.java 2008-06-30 15:18:57 UTC (rev 11210) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/DefaultPageViewPortScope.java 2008-06-30 15:29:22 UTC (rev 11211) @@ -1,79 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2008, 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.view; - -import org.jboss.portal.presentation.model.ObjectTraversalType; -import org.jboss.portal.presentation.model.ui.UIObject; -import org.jboss.portal.presentation.model.ViewPortScope; -import org.jboss.portal.presentation.model.ui.UIContext; -import org.jboss.portal.presentation.model.ui.UIPage; - -/** - * A scope implementation that retrieves the default page of the root context. - * - * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class DefaultPageViewPortScope implements ViewPortScope -{ - - /** . */ - private final String rootId; - - public DefaultPageViewPortScope(String rootId) - { - this.rootId = rootId; - } - - public String getRootId() - { - return rootId; - } - - public ObjectTraversalType enterObject(UIObject object) - { - if (object instanceof UIContext) - { - return ObjectTraversalType.RECURSIVE; - } - if (object instanceof UIPage) - { - if ("default".equals(object.getName())) - { - return ObjectTraversalType.SINGLE; - } - else - { - return ObjectTraversalType.SKIP; - } - } - else - { - return ObjectTraversalType.SKIP; - } - } - - public void leaveObject(UIObject object) - { - } -} Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/PageViewPortScope.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/PageViewPortScope.java 2008-06-30 15:18:57 UTC (rev 11210) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/view/PageViewPortScope.java 2008-06-30 15:29:22 UTC (rev 11211) @@ -25,7 +25,6 @@ import org.jboss.portal.presentation.model.ObjectTraversalType; import org.jboss.portal.presentation.model.ui.UIObject; import org.jboss.portal.presentation.model.ViewPortScope; -import org.jboss.portal.presentation.model.ui.UIContext; import org.jboss.portal.presentation.model.ui.UIPage; import org.jboss.portal.presentation.model.ui.UIWindow; import org.jboss.portal.presentation.model.ui.UIPane; @@ -113,10 +112,6 @@ // We don't traverse windows (for now as they are supposed to be leaves) return ObjectTraversalType.SINGLE; } - else if (object instanceof UIContext) - { - return ObjectTraversalType.RECURSIVE; - } else { return ObjectTraversalType.SKIP;

15 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r11210 - in branches/JBoss_Portal_Branch_2_6: core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin and 1 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-06-30 11:18:57 -0400 (Mon, 30 Jun 2008) New Revision: 11210 Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml Log: Merging changes applied on 2.7 Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-06-30 14:24:16 UTC (rev 11209) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-06-30 15:18:57 UTC (rev 11210) @@ -123,4 +123,11 @@ CMS_CLICK_HERE=click here CMS_SELECT_ACTION=Select Action -CMS_QUERYERROR=The query you entered is not valid>>>>>>> .merge-right.r11144 +CMS_QUERYERROR=The query you entered is not valid + +CMS_ADMIN_SET_READ_PERMISSIONS=Set Read Permissions +CMS_ADMIN_SET_WRITE_PERMISSIONS=Set Write Permissions +CMS_ADMIN_SET_MANAGE_PERMISSIONS=Set Manage Permissions +CMS_ADMIN_SELECT_ROLES=Select Roles that have access to this node. +CMS_ADMIN_SELECT_USERS=Select Users that have access to this node. +CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES=You may select multiple roles by using CTRL+click on the role names. Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2008-06-30 14:24:16 UTC (rev 11209) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2008-06-30 15:18:57 UTC (rev 11210) @@ -33,7 +33,7 @@ TITLE_EDIT=Modifica File TITLE_CREATE=Creazione File TITLE_UPLOAD=Caricamento File -TITLE_SECURECONFIRM=Nodo sicuro +TITLE_SECURECONFIRM=Sicurezza sul Nodo CMS_SEARCH=Ricerca CMS_SEARCHNORESULT=Nessun risultato per questa ricerca @@ -51,19 +51,20 @@ CMS_FOLDER=Cartella CMS_FILE=File CMS_CREATE=Crea -CMS_CANCEL=annullamento +CMS_CANCEL=Annulla CMS_EDIT=Edita CMS_UPLOAD=Caricamento CMS_MODIFY=Modifica CMS_CREATEFOLDER= Crea Cartella CMS_CREATEFILE=Crea File CMS_UPLOADARCHIVE=Carica Archivio -CMS_UPLOADARCHIVE_ASYNC=Carica Archivio in modo asincrono +CMS_UPLOADARCHIVE_ASYNC=Processione asincrona CMS_BACKTOBROWSER=Torna al Navigatore delle Directory CMS_TRANSFER=Importa/Esporta CMS_EXPORTARCHIVE=Esporta Cartella -CMS_SECURE=Sicurezza +CMS_SECURE=Rendi sicuro CMS_PREVIEW=Anteprima +CMS_GO=Vai CMS_CREATEFILEINDIR=Crea File nella Directory CMS_FILENAME=Nome del File @@ -98,8 +99,8 @@ CMS_EMPTY_FOLDER=Questa cartella \u00e8 vuota . -CMS_ERROR_UPLOADARCHIVE_ASYNC=Si \u00e8 verificato un errore nell\'aggiornamento dell\'archivio. Riprova attivando la modalit\u00e0 asincrona -CMS_MSG_UPLOADARCHIVE_ASYNC=L\'archivio \u00e8 stato accettato. Le risorse appariranno nella tua cartella una volta terminato il processo +CMS_ERROR_UPLOADARCHIVE_ASYNC=Si \u00e8 verificato un errore nel processare l\'archivio. Riprova attivando il servizio di processione asincrona +CMS_MSG_UPLOADARCHIVE_ASYNC=Il tuo archivio sta per essere processato. Una volta terminato il processo le risorse appariranno nella tua cartella CMS_REQUIRED=Obbligatorio CMS_LINK_TO_RESOURCES=I link alle risorse all\'interno del portale devono essere assoluti. Per esempio: Un link a un\'immagine che si trova in in default/images/back.gif deve essere digitato esattamente come mostrato. Non iniziare mai il percorso con uno (/). Puoi verificare la correttezza del link cliccando sul bottone di anteprima dell1'editor @@ -119,4 +120,15 @@ CMS_INTRODUCTION=Introduzione CMS_HELP=La Portlet CMS visualizza e salva i contenuti di un file da dentro la finestra di una Portlet, o, nel caso di un contenuto binario, fuori della finestra CMS_TO_MODIFY=Per modificare il comportamento di questa Portlet, -CMS_CLICK_HERE=clicca qui \ No newline at end of file +CMS_CLICK_HERE=clicca qui +CMS_SELECT_ACTION=Seleziona un\'azione + +CMS_QUERYERROR=The query you entered is not valid + +CMS_ADMIN_SET_READ_PERMISSIONS=Configura i permessi in lettura +CMS_ADMIN_SET_WRITE_PERMISSIONS=Configura i permessi in scrittura +CMS_ADMIN_SET_MANAGE_PERMISSIONS=Configura i permessi in modalit\u00e0 amministrativa +CMS_ADMIN_SELECT_ROLES=Seleziona i ruoli che hanno accesso a questo nodo. +CMS_ADMIN_SELECT_USERS=Seleziona gli utenti che hanno accesso a questo nodo. +CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES=Puoi selezionare pi\u00F9 ruoli usando il CTRL+click sui nomi dei ruoli. +CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS=Puoi selezionare pi\u00F9 utenti usando il CTRL+click sui nomi degli utenti. Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2008-06-30 14:24:16 UTC (rev 11209) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2008-06-30 15:18:57 UTC (rev 11210) @@ -61,7 +61,7 @@ <td class="portlet-section-alternate" colspan="2"> <table> <tr> - <td colspan="2" class="portlet-section-header" align="center">Set Read Permissions</td> + <td colspan="2" class="portlet-section-header" align="center">${n:i18n("CMS_ADMIN_SET_READ_PERMISSIONS")}</td> </tr> <tr> <td> @@ -84,8 +84,8 @@ %> </select> </td> - <td>Select Roles that have access to this node.<br/> - (You may select multiple roles by using CTRL+click on the role names.) + <td>${n:i18n("CMS_ADMIN_SELECT_ROLES")}<br/> + (${n:i18n("CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES")}) </td> </tr> <tr> @@ -109,8 +109,8 @@ %> </select> </td> - <td>Select Users that have access to this node.<br/> - (You may select multiple users by using CTRL+click on the user names.) + <td>${n:i18n("CMS_ADMIN_SELECT_USERS")}<br/> + (${n:i18n("CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS")}) </td> </tr> </table> @@ -123,7 +123,7 @@ <td class="portlet-section-alternate" colspan="2"> <table> <tr> - <td colspan="2" class="portlet-section-header" align="center">Set Write Permissions</td> + <td colspan="2" class="portlet-section-header" align="center">${n:i18n("CMS_ADMIN_SET_WRITE_PERMISSIONS")}</td> </tr> <tr> <td> @@ -146,8 +146,8 @@ %> </select> </td> - <td>Select Roles that have access to this node.<br/> - (You may select multiple roles by using CTRL+click on the role names.) + <td>${n:i18n("CMS_ADMIN_SELECT_ROLES")}<br/> + (${n:i18n("CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES")}) </td> </tr> <tr> @@ -171,8 +171,8 @@ %> </select> </td> - <td>Select Users that have access to this node.<br/> - (You may select multiple users by using CTRL+click on the user names.) + <td>${n:i18n("CMS_ADMIN_SELECT_USERS")}<br/> + (${n:i18n("CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS")}) </td> </tr> </table> @@ -185,7 +185,7 @@ <td class="portlet-section-alternate" colspan="2"> <table> <tr> - <td colspan="2" class="portlet-section-header" align="center">Set Manage Permissions</td> + <td colspan="2" class="portlet-section-header" align="center">${n:i18n("CMS_ADMIN_SET_MANAGE_PERMISSIONS")}</td> </tr> <tr> <td> @@ -208,8 +208,8 @@ %> </select> </td> - <td>Select Roles that have access to this node.<br/> - (You may select multiple roles by using CTRL+click on the role names.) + <td>${n:i18n("CMS_ADMIN_SELECT_ROLES")}<br/> + (${n:i18n("CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES")}) </td> </tr> <tr> @@ -233,8 +233,8 @@ %> </select> </td> - <td>Select Users that have access to this node.<br/> - (You may select multiple users by using CTRL+click on the user names.) + <td>${n:i18n("CMS_ADMIN_SELECT_USERS")}<br/> + (${n:i18n("CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS")}) </td> </tr> </table> Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2008-06-30 14:24:16 UTC (rev 11209) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2008-06-30 15:18:57 UTC (rev 11210) @@ -331,6 +331,8 @@ <if-exists>keep</if-exists> <page> <page-name>TestWithAjax</page-name> + <display-name xml:lang="en">TestWithAjax</display-name> + <display-name xml:lang="it">TestConAjax</display-name> <properties> <property> <name>theme.dyna.partial_refresh_enabled</name>

15 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r11209 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-06-30 10:24:16 -0400 (Mon, 30 Jun 2008) New Revision: 11209 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java Log: JBPORTAL-2021: Tab Order does not work Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2008-06-30 14:24:03 UTC (rev 11208) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2008-06-30 14:24:16 UTC (rev 11209) @@ -278,19 +278,7 @@ case PortalObject.TYPE_PORTAL: return 1; case PortalObject.TYPE_PAGE: - String orderProperty = object.getDeclaredProperty(ORDER); - if (orderProperty == null) - { - return 2.999f; - } - try - { - return Float.parseFloat("2." + orderProperty); - } - catch (NumberFormatException e) - { - return 2.999f; - } + return 2; case PortalObject.TYPE_WINDOW: return 3; default: @@ -308,6 +296,35 @@ float weight2 = node2.getWeight(); if (weight1 == weight2) { + if (PortalObject.TYPE_PAGE == node1.getType()) + { + String orderProperty1S = (String)node1.getProperties().get(ORDER); + String orderProperty2S = (String)node2.getProperties().get(ORDER); + + if (orderProperty1S != null && orderProperty2S !=null) + { + float orderProperty1 = -1; + float orderProperty2 = -1; + + try + { + orderProperty1 = Float.parseFloat(orderProperty1S); + orderProperty2 = Float.parseFloat(orderProperty2S); + if (orderProperty1 > orderProperty2) + { + return 1; + } + else if (orderProperty1 < orderProperty2) + { + return -1; + } + } + catch (NumberFormatException e) + { + // ignore + } + } + } return node1.getName().compareTo(node2.getName()); } else if (weight1 < weight2)

15 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits June 2008