portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r216120 [1/5] - in /portals/jetspeed-2/trunk: applications/pam/src/java/org/apache/jetspeed/portlets/site/ applications/pam/src/webapp/WEB-INF/view/ applications/pam/src/webapp/images/tree/ components/locator/src/java/org/apache/jetspeed/pr...
Date Wed, 13 Jul 2005 06:40:35 GMT
Author: rwatler
Date: Tue Jul 12 23:40:27 2005
New Revision: 216120

URL: http://svn.apache.org/viewcvs?rev=216120&view=rev
Log:
merge from branches/MENUS_BRANCH into trunk: 209299:216085

Added:
    portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/site/AbstractPSMLTreePortlet.java
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/java/org/apache/jetspeed/portlets/site/AbstractPSMLTreePortlet.java
    portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/site/PSMLTreeLoader.java
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/java/org/apache/jetspeed/portlets/site/PSMLTreeLoader.java
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/anchorLink.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/anchorLink.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/bookshelf.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/bookshelf.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/document.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/document.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/groups.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/groups.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/handledownlast.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/handledownlast.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/handledownmiddle.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/handledownmiddle.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/handlerightlast.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/handlerightlast.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/handlerightmiddle.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/handlerightmiddle.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/html-document.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/html-document.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/linefirstnode.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/linefirstnode.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/linelastnode.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/linelastnode.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/linemiddlenode.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/linemiddlenode.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/linevertical.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/linevertical.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/link.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/link.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/other.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/other.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/pdficon.jpg   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/pdficon.jpg
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/roles.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/roles.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/root.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/root.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/space20.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/space20.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/special.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/special.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/subsites.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/subsites.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/text-document.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/text-document.gif
    portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/users.gif   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/applications/pam/src/webapp/images/tree/users.gif
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuDefinitionImpl.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuDefinitionImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuElementImpl.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuElementImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuExcludeDefinitionImpl.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuExcludeDefinitionImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuIncludeDefinitionImpl.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuIncludeDefinitionImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuMetadataImpl.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuMetadataImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuOptionsDefinitionImpl.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuOptionsDefinitionImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuSeparatorDefinitionImpl.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuSeparatorDefinitionImpl.java
    portals/jetspeed-2/trunk/components/page-manager/testdata/pages/folder.metadata
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/page-manager/testdata/pages/folder.metadata
    portals/jetspeed-2/trunk/components/portal-site/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/
    portals/jetspeed-2/trunk/components/portal-site/.cvsignore
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/.cvsignore
    portals/jetspeed-2/trunk/components/portal-site/locator.ent   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/locator.ent
    portals/jetspeed-2/trunk/components/portal-site/locator.path
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/locator.path
    portals/jetspeed-2/trunk/components/portal-site/maven.xml   (contents, props changed)
      - copied, changed from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/maven.xml
    portals/jetspeed-2/trunk/components/portal-site/project.properties   (contents, props changed)
      - copied, changed from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/project.properties
    portals/jetspeed-2/trunk/components/portal-site/project.xml   (contents, props changed)
      - copied, changed from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/project.xml
    portals/jetspeed-2/trunk/components/portal-site/src/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/
    portals/jetspeed-2/trunk/components/portal-site/src/java/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/om/
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/om/folder/
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuDefinitionImpl.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuDefinitionImpl.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuExcludeDefinitionImpl.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuExcludeDefinitionImpl.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuIncludeDefinitionImpl.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuIncludeDefinitionImpl.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuOptionsDefinitionImpl.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuOptionsDefinitionImpl.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuSeparatorDefinitionImpl.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuSeparatorDefinitionImpl.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/page/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/om/page/
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/LinkProxy.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/LinkProxy.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/PageProxy.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/PageProxy.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/page/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/page/
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/page/document/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/page/document/
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/page/document/proxy/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/page/document/proxy/
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/page/document/proxy/NodeProxy.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/page/document/proxy/NodeProxy.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/page/document/proxy/NodeSetImpl.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/page/document/proxy/NodeSetImpl.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuElementImpl.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuElementImpl.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuOptionImpl.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuOptionImpl.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuSeparatorImpl.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuSeparatorImpl.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteImpl.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteImpl.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/DefaultMenuDefinition.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/DefaultMenuDefinition.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/DefaultMenuOptionsDefinition.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/DefaultMenuOptionsDefinition.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBackMenuDefinition.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBackMenuDefinition.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBreadcrumbsMenuDefinition.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBreadcrumbsMenuDefinition.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardNavigationsMenuDefinition.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardNavigationsMenuDefinition.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardPagesMenuDefinition.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardPagesMenuDefinition.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_de.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_de.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_en.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_en.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_es.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_es.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_fr.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_fr.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_it.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_it.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ja.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ja.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ko.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ko.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_nl.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_nl.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_pt.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_pt.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_zh.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_zh.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_de.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_de.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_en.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_en.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_es.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_es.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_fr.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_fr.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_it.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_it.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ja.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ja.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ko.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ko.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_nl.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_nl.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_pt.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_pt.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_zh.properties   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_zh.properties
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewMenuDefinitionLocator.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewMenuDefinitionLocator.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewProxy.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewProxy.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewSearchPath.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewSearchPath.java
    portals/jetspeed-2/trunk/components/portal-site/src/test/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/test/
    portals/jetspeed-2/trunk/components/portal-site/src/test/META-INF/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/test/META-INF/
    portals/jetspeed-2/trunk/components/portal-site/src/test/META-INF/test-spring.xml   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/test/META-INF/test-spring.xml
    portals/jetspeed-2/trunk/components/portal-site/src/test/org/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/test/org/
    portals/jetspeed-2/trunk/components/portal-site/src/test/org/apache/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/test/org/apache/
    portals/jetspeed-2/trunk/components/portal-site/src/test/org/apache/jetspeed/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/test/org/apache/jetspeed/
    portals/jetspeed-2/trunk/components/portal-site/src/test/org/apache/jetspeed/portalsite/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/test/org/apache/jetspeed/portalsite/
    portals/jetspeed-2/trunk/components/portal-site/src/test/org/apache/jetspeed/portalsite/TestPortalSite.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/src/test/org/apache/jetspeed/portalsite/TestPortalSite.java
    portals/jetspeed-2/trunk/components/portal-site/testdata/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/__subsite-root/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/__subsite-root/
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/__subsite-root/folder.metadata
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/__subsite-root/folder.metadata
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/__subsite-root/link0.link
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/__subsite-root/link0.link
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/__subsite-root/page0.psml
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/__subsite-root/page0.psml
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/_group/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_group/
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/_group/group/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_group/group/
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/_group/group/folder1/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_group/group/folder1/
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/_group/group/folder1/folder.metadata
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_group/group/folder1/folder.metadata
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/_group/group/folder1/page1.psml
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_group/group/folder1/page1.psml
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/_group/group/link0.link
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_group/group/link0.link
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/_role/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_role/
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/_role/role0/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_role/role0/
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/_role/role0/page2.psml
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_role/role0/page2.psml
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/_role/role1/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_role/role1/
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/_role/role1/page2.psml
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_role/role1/page2.psml
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/_user/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_user/
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/_user/user/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_user/user/
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/_user/user/_mediatype/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_user/user/_mediatype/
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/_user/user/_mediatype/html/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_user/user/_mediatype/html/
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/_user/user/_mediatype/html/page2.psml
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_user/user/_mediatype/html/page2.psml
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/_user/user/folder.metadata
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_user/user/folder.metadata
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/_user/user/folder1/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_user/user/folder1/
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/_user/user/folder1/page0.psml
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_user/user/folder1/page0.psml
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/_user/user/page2.psml
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/_user/user/page2.psml
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/folder.metadata
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/folder.metadata
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/folder0/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/folder0/
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/folder0/folder.metadata
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/folder0/folder.metadata
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/folder0/page0.psml
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/folder0/page0.psml
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/folder1/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/folder1/
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/folder1/folder.metadata
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/folder1/folder.metadata
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/folder1/page0.psml
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/folder1/page0.psml
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/folder2/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/folder2/
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/link0.link
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/link0.link
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/link1.link
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/link1.link
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/page0.psml
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/page0.psml
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/page1.psml
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/page1.psml
    portals/jetspeed-2/trunk/components/portal-site/testdata/pages/page2.psml
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/testdata/pages/page2.psml
    portals/jetspeed-2/trunk/components/portal-site/xdocs/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/xdocs/
    portals/jetspeed-2/trunk/components/portal-site/xdocs/navigation.xml   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/xdocs/navigation.xml
    portals/jetspeed-2/trunk/design-docs/src/portal-site/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/design-docs/src/portal-site/
    portals/jetspeed-2/trunk/design-docs/src/portal-site/portal-site-component-figure-1.jpeg   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/design-docs/src/portal-site/portal-site-component-figure-1.jpeg
    portals/jetspeed-2/trunk/design-docs/src/portal-site/portal-site-component.html   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/design-docs/src/portal-site/portal-site-component.html
    portals/jetspeed-2/trunk/design-docs/src/portal-site/portal-site-component.sxw   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/design-docs/src/portal-site/portal-site-component.sxw
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuDefinition.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuDefinition.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuExcludeDefinition.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuExcludeDefinition.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuIncludeDefinition.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuIncludeDefinition.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuOptionsDefinition.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuOptionsDefinition.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuSeparatorDefinition.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuSeparatorDefinition.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/PageManagerEventListener.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/page/PageManagerEventListener.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/portalsite/
      - copied from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/portalsite/Menu.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/Menu.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuElement.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuElement.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuOption.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuOption.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuSeparator.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuSeparator.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSite.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSite.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSiteSessionContext.java   (props changed)
      - copied unchanged from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSiteSessionContext.java
Removed:
    portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfiledPageContext.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/DocumentSetImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/DocumentSetPathImpl.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/DocumentSet.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/DocumentSetPath.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/profiler/ProfiledPageContext.java
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/Administrative/user-admin.ds
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/_role/user/top-links/more-pages.ds
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/_user/user/top-pages.ds
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/non-java.ds
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/pages.ds
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/top-pages.ds
Modified:
    portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/site/SiteBrowserPortlet.java
    portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/site-browser.jsp
    portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/profiler/impl/ProfileFallbackIterator.java
    portals/jetspeed-2/trunk/components/page-manager/project.xml
    portals/jetspeed-2/trunk/components/page-manager/src/java/META-INF/page-mapping.xml
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMetaDataImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/ContentPageImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/LinkImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageMetadataImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/AbstractNode.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/CastorFileSystemDocumentHandler.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/FileSystemFolderHandler.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/AbstractPageManager.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/CastorXmlPageManager.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java
    portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java
    portals/jetspeed-2/trunk/components/page-manager/testdata/pages/folder1/folder2/default-page.psml
    portals/jetspeed-2/trunk/components/page-manager/testdata/pages/test001.psml
    portals/jetspeed-2/trunk/components/portal/project.xml
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
    portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfiler.java
    portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java
    portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/GenericMetadataImpl.java
    portals/jetspeed-2/trunk/etc/project-dependencies/portal-webapp-deps.xml
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/Folder.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/FolderMetaData.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/page/Page.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/PageManager.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/profiler/ProfileLocator.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/profiler/Profiler.java
    portals/jetspeed-2/trunk/maven-plugin/src/plugin-resources/sql/populate-db-default.sql
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/page-manager.xml
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/pipelines.xml
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/ja/tigris/decorator-top.vm
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-macros.vm
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/Administrative/folder.metadata
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/_role/user/top-links/folder.metadata
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/_user/user/folder.metadata
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/pages/folder.metadata

Modified: portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/site/SiteBrowserPortlet.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/site/SiteBrowserPortlet.java?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/site/SiteBrowserPortlet.java (original)
+++ portals/jetspeed-2/trunk/applications/pam/src/java/org/apache/jetspeed/portlets/site/SiteBrowserPortlet.java Tue Jul 12 23:40:27 2005
@@ -16,7 +16,6 @@
 package org.apache.jetspeed.portlets.site;
 
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.Locale;
 
 import javax.portlet.ActionRequest;
@@ -27,17 +26,12 @@
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 
-import org.apache.jetspeed.CommonPortletServices;
+import org.apache.jetspeed.exception.JetspeedException;
 import org.apache.jetspeed.om.folder.Folder;
 import org.apache.jetspeed.om.folder.FolderNotFoundException;
 import org.apache.jetspeed.om.folder.InvalidFolderException;
-import org.apache.jetspeed.om.page.Page;
-import org.apache.jetspeed.page.PageManager;
-import org.apache.jetspeed.page.document.DocumentException;
 import org.apache.jetspeed.page.document.NodeException;
-import org.apache.jetspeed.page.document.NodeSet;
 import org.apache.jetspeed.portlets.pam.PortletApplicationResources;
-import org.apache.portals.bridges.common.GenericServletPortlet;
 import org.apache.portals.messaging.PortletMessaging;
 import org.apache.webapp.admin.TreeControl;
 import org.apache.webapp.admin.TreeControlNode;
@@ -47,35 +41,40 @@
  * pages and folders.
  * 
  * @author <a href="mailto:jford@apache.com">Jeremy Ford </a>
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
  * @version $Id$
  */
-public class SiteBrowserPortlet extends GenericServletPortlet
+public class SiteBrowserPortlet extends AbstractPSMLTreePortlet
 {
-
     private PortletContext context;
-
-    private PageManager pageManager;
+    private static final String SITE_TREE_ATTRIBUTE = "site-tree";
 
     public void init(PortletConfig config) throws PortletException
     {
         super.init(config);
         context = getPortletContext();
-        pageManager = (PageManager) context.getAttribute(CommonPortletServices.CPS_PAGE_MANAGER_COMPONENT);
-        if (null == pageManager) { throw new PortletException(
-                "Failed to find the Page Manager on portlet initialization"); }
     }
 
     public void doView(RenderRequest request, RenderResponse response) throws PortletException, IOException
     {
         response.setContentType("text/html");
 
-        TreeControl control = (TreeControl) request.getPortletSession().getAttribute("j2_tree");
+        TreeControl control = prepareSiteTree(request);
+        request.setAttribute(SITE_TREE_ATTRIBUTE, control);
+
+        super.doView(request, response);
+
+    }
+
+    private TreeControl prepareSiteTree(RenderRequest request)
+    {
+        TreeControl control = (TreeControl) request.getPortletSession().getAttribute(SITE_TREE_ATTRIBUTE);
         if (control == null)
         {
             Folder root = null;
             try
             {
-                root = pageManager.getFolder("/");
+                root = pageManager.getFolder(psmlRoot);
             }
             catch (FolderNotFoundException e)
             {
@@ -96,19 +95,16 @@
             if (root != null)
             {
                 control = buildTree(root, request.getLocale());
-                request.getPortletSession().setAttribute("j2_tree", control);
+                request.getPortletSession().setAttribute(SITE_TREE_ATTRIBUTE, control);
             }
         }
-        request.setAttribute("j2_tree", control);
-
-        super.doView(request, response);
-
+        return control;
     }
-
+    
     public void processAction(ActionRequest actionRequest, ActionResponse actionResponse) throws PortletException,
             IOException
     {
-        TreeControl control = (TreeControl) actionRequest.getPortletSession().getAttribute("j2_tree");
+        TreeControl control = (TreeControl) actionRequest.getPortletSession().getAttribute(SITE_TREE_ATTRIBUTE);
         //assert control != null
         if (control != null)
         {
@@ -116,10 +112,39 @@
             if (node != null)
             {
                 TreeControlNode controlNode = control.findNode(node);
-                if (controlNode != null)
+                if (controlNode != null && controlNode.isLazy() && !controlNode.isLoaded()) 
+                {
+                    //loader.loadChildren(actionRequest, controlNode, refToURIMap);
+                    String domain = controlNode.getDomain();
+                    //if (domain.equals(PSMLTreeLoader.FOLDER_DOMAIN))
+                    {
+                        try
+                        {
+                            Folder folder = pageManager.getFolder(controlNode.getName());
+                            loader.loadChildren(folder, controlNode, actionRequest.getLocale());
+                        }
+                        catch (JetspeedException e)
+                        {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+                controlNode.setExpanded(!controlNode.isExpanded());
+                //actionRequest.getPortletSession().setAttribute("tree_anchor", node);
+                
+                if(controlNode.isExpanded() && controlNode != control.getRoot())
                 {
-                    controlNode.setExpanded(!controlNode.isExpanded());
+                    TreeControlNode[] siblings = controlNode.getParent().findChildren();
+                    for(int i=0; i<siblings.length; i++)
+                    {
+                        TreeControlNode sibling = siblings[i];
+                        if(sibling != controlNode)
+                        {
+                            sibling.setExpanded(false);
+                        }
+                    }
                 }
+                
             }
 
             String selectedNode = actionRequest.getParameter(PortletApplicationResources.REQUEST_SELECT_NODE);
@@ -172,74 +197,13 @@
     private TreeControl buildTree(Folder folder, Locale locale)
     {
 
-        TreeControlNode root = new TreeControlNode(folder.getName(), null, folder.getTitle(locale),
-                PortletApplicationResources.PORTLET_URL, null, true, "FOLDER_DOMAIN");
-
+        TreeControlNode root = loader.createRootNode(folder, locale);
+        
         TreeControl control = new TreeControl(root);
-
-        buildFolderNodes(folder, root, locale);
+        loader.loadChildren(folder, root, locale);
 
         return control;
     }
 
-    private void buildFolderNodes(Folder folder, TreeControlNode parent, Locale locale)
-    {
-        NodeSet childFolders = null;
-        try
-        {
-            childFolders = folder.getFolders();
-        }
-        catch (FolderNotFoundException e)
-        {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-        catch (DocumentException e)
-        {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-
-        if (childFolders != null)
-        {
-            Iterator folderIter = childFolders.iterator();
-            while (folderIter.hasNext())
-            {
-                Folder childFolder = (Folder) folderIter.next();                
-                TreeControlNode childNode = new TreeControlNode(childFolder.getPath(), null, childFolder
-                        .getTitle(locale), PortletApplicationResources.PORTLET_URL, null, false, "FOLDER_DOMAIN");
-                parent.addChild(childNode);
-                buildFolderNodes(childFolder, childNode, locale);
-            }
-
-            buildPageNodes(folder, parent, locale);
-        }
-    }
 
-    private void buildPageNodes(Folder folder, TreeControlNode node, Locale locale)
-    {
-        NodeSet pages = null;
-        try
-        {
-            pages = folder.getPages();
-        }
-        catch (NodeException e)
-        {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-
-        if (pages != null)
-        {
-            Iterator pageIter = pages.iterator();
-
-            while (pageIter.hasNext())
-            {
-                Page page = (Page) pageIter.next();
-                TreeControlNode child = new TreeControlNode(page.getPath(), null, page.getTitle(locale),
-                        PortletApplicationResources.PORTLET_URL, null, false, "PAGE_DOMAIN");
-                node.addChild(child);
-            }
-        }
-    }
 }

Modified: portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/site-browser.jsp
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/site-browser.jsp?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/site-browser.jsp (original)
+++ portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/view/site-browser.jsp Tue Jul 12 23:40:27 2005
@@ -40,7 +40,7 @@
 	<portlet:param name="node" value="${name}" />
 </portlet:actionURL>
 
-<pam:tree tree="j2_tree" images="/pam/images" scope="portlet_request"
+<pam:tree tree="site-tree" images="/pam/images/tree" scope="portlet_request"
           action="<%= nodeLink %>"
           style="tree-control"
           styleSelected="portlet-section-alternate"          

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/anchorLink.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/bookshelf.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/document.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/groups.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/handledownlast.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/handledownmiddle.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/handlerightlast.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/handlerightmiddle.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/html-document.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/linefirstnode.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/linelastnode.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/linemiddlenode.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/linevertical.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/link.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/other.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/pdficon.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/roles.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/root.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/space20.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/special.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/subsites.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/text-document.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/images/tree/users.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/profiler/impl/ProfileFallbackIterator.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/profiler/impl/ProfileFallbackIterator.java?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/profiler/impl/ProfileFallbackIterator.java (original)
+++ portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/profiler/impl/ProfileFallbackIterator.java Tue Jul 12 23:40:27 2005
@@ -75,9 +75,6 @@
             hasNext = true;
         }
         
-        ProfileLocatorPropertyImpl element = (ProfileLocatorPropertyImpl)elements.get(last);
-        state = element.getFallbackType();
-                
         return hasNext;
     }
     
@@ -90,11 +87,21 @@
 
         if (last >= 0)
         {
+            // generate properties list to return
             List elements = locator.getElements();
             properties = new ProfileLocatorProperty[last+1];
+            ProfileLocatorProperty lastElement = null;
             Iterator it = elements.listIterator();
             for (int count = 0; (count <= last) && it.hasNext(); count++)
-                properties[count] = (ProfileLocatorProperty)it.next();
+            {
+                lastElement = (ProfileLocatorProperty)it.next();
+                properties[count] = lastElement;
+            }
+
+            // modify iterator state based on fallback type;
+            // performed here to prevent multiple calls to
+            // hasNext() from changing iterator state
+            state = lastElement.getFallbackType();
             last--;
         }
 

Modified: portals/jetspeed-2/trunk/components/page-manager/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/project.xml?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/project.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/project.xml Tue Jul 12 23:40:27 2005
@@ -90,18 +90,6 @@
                 &jetspeed-version;
             </version>
         </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-locator</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-profiler</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
         <!-- Testing only -->
         <dependency>
             <id>jetspeed2:jetspeed-rdbms</id>

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/META-INF/page-mapping.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/META-INF/page-mapping.xml?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/META-INF/page-mapping.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/META-INF/page-mapping.xml Tue Jul 12 23:40:27 2005
@@ -39,6 +39,12 @@
            collection="collection">
       <bind-xml name="metadata"/>
     </field>
+
+	<field name="menuDefinitions"
+           type="org.apache.jetspeed.om.folder.impl.MenuDefinitionImpl" 
+           collection="collection">
+      <bind-xml name="menu"/>
+    </field>
   </class>
   
   <class name="org.apache.jetspeed.om.page.psml.PageLocalizedFieldImpl">
@@ -108,8 +114,7 @@
       <bind-xml name="property"/>
     </field>
   </class>
-  
-  
+    
   <class name="org.apache.jetspeed.om.page.psml.LinkImpl">
     <map-to xml="link"/>
 
@@ -145,27 +150,83 @@
     </field>
   </class>
   
-  <class name="org.apache.jetspeed.om.folder.impl.DocumentSetImpl">
-    <map-to xml="document-set"/>
+  <class name="org.apache.jetspeed.om.folder.impl.FolderMetaDataImpl">
+    <map-to xml="folder"/>
 
     <field name="hidden" type="boolean">
       <bind-xml name="hidden" node="attribute"/>
-    </field>
+    </field>    
 
     <field name="securityConstraints"
            type="org.apache.jetspeed.om.page.psml.SecurityConstraintsImpl">
       <bind-xml name="security-constraints"/>
     </field>
     
-    <field name="profileLocatorName" type="java.lang.String">
-      <bind-xml name="profile-locator" />
+    <field name="title" type="java.lang.String">
+      <bind-xml name="title"/>
+    </field>
+    
+    <field name="shortTitle" type="java.lang.String">
+      <bind-xml name="short-title"/>
+    </field>
+    
+    <field name="defaultPage" type="java.lang.String">
+      <bind-xml name="default-page"/>
+    </field>
+
+    <field name="documentOrder"
+           type="java.lang.String" 
+           collection="vector">
+      <bind-xml name="document-order"/>
+    </field>    
+
+	<field name="metadataFields"
+           type="org.apache.jetspeed.om.page.psml.PageLocalizedFieldImpl" 
+           collection="collection">
+      <bind-xml name="metadata"/>
     </field>
 
-	<field name="documentPaths"
-           type="org.apache.jetspeed.om.folder.impl.DocumentSetPathImpl"
+	<field name="menuDefinitions"
+           type="org.apache.jetspeed.om.folder.impl.MenuDefinitionImpl" 
            collection="collection">
-      <bind-xml name="document-path"/>
+      <bind-xml name="menu"/>
     </field>
+  </class>
+
+  <class name="org.apache.jetspeed.om.folder.impl.MenuDefinitionImpl">
+    <map-to xml="menu"/>
+
+    <field name="name" type="java.lang.String">
+      <bind-xml name="name" node="attribute"/>
+    </field>    
+
+    <field name="options" type="java.lang.String">
+      <bind-xml name="options" node="attribute"/>
+    </field>    
+
+    <field name="depth" type="integer">
+      <bind-xml name="depth" node="attribute"/>
+    </field>    
+
+    <field name="paths" type="boolean">
+      <bind-xml name="paths" node="attribute"/>
+    </field>    
+
+    <field name="regexp" type="boolean">
+      <bind-xml name="regexp" node="attribute"/>
+    </field>    
+
+    <field name="profile" type="java.lang.String">
+      <bind-xml name="profile" node="attribute"/>
+    </field>    
+
+    <field name="order" type="java.lang.String">
+      <bind-xml name="order" node="attribute"/>
+    </field>    
+
+    <field name="skin" type="java.lang.String">
+      <bind-xml name="skin" node="attribute"/>
+    </field>    
 
     <field name="title" type="java.lang.String">
       <bind-xml name="title"/>
@@ -175,60 +236,124 @@
       <bind-xml name="short-title"/>
     </field>
     
- 	<field name="metadataFields"
+	<field name="metadataFields"
            type="org.apache.jetspeed.om.page.psml.PageLocalizedFieldImpl" 
            collection="collection">
       <bind-xml name="metadata"/>
     </field>
+
+	<field name="menuElementImpls"
+           type="org.apache.jetspeed.om.folder.impl.MenuElementImpl" 
+           collection="collection">
+      <bind-xml name="menu-element"/>
+    </field>
   </class>
 
-  <class name="org.apache.jetspeed.om.folder.impl.DocumentSetPathImpl">
-    <map-to xml="document-path"/>
+  <class name="org.apache.jetspeed.om.folder.impl.MenuElementImpl">
+    <map-to xml="menu-element"/>
 
-    <field name="regexp" type="boolean">
-      <bind-xml name="regexp" node="attribute"/>
+    <field name="options"
+           type="org.apache.jetspeed.om.folder.impl.MenuOptionsDefinitionImpl">
+      <bind-xml name="options"/>
     </field>
 
-    <field name="path" type="java.lang.String">
-      <bind-xml node="text"/>
+    <field name="menu"
+           type="org.apache.jetspeed.om.folder.impl.MenuDefinitionImpl">
+      <bind-xml name="menu"/>
+    </field>
+
+    <field name="separator"
+           type="org.apache.jetspeed.om.folder.impl.MenuSeparatorDefinitionImpl">
+      <bind-xml name="separator"/>
+    </field>
+
+    <field name="include"
+           type="org.apache.jetspeed.om.folder.impl.MenuIncludeDefinitionImpl">
+      <bind-xml name="include"/>
+    </field>
+
+    <field name="exclude"
+           type="org.apache.jetspeed.om.folder.impl.MenuExcludeDefinitionImpl">
+      <bind-xml name="exclude"/>
     </field>
   </class>
 
-  <class name="org.apache.jetspeed.om.folder.impl.FolderMetaDataImpl">
-    <map-to xml="folder"/>
+  <class name="org.apache.jetspeed.om.folder.impl.MenuOptionsDefinitionImpl">
+    <map-to xml="options"/>
 
-    <field name="hidden" type="boolean">
-      <bind-xml name="hidden" node="attribute"/>
+    <field name="options" type="java.lang.String">
+      <bind-xml node="text"/>
+    </field>    
+
+    <field name="depth" type="integer">
+      <bind-xml name="depth" node="attribute"/>
+    </field>    
+
+    <field name="paths" type="boolean">
+      <bind-xml name="paths" node="attribute"/>
+    </field>    
+
+    <field name="regexp" type="boolean">
+      <bind-xml name="regexp" node="attribute"/>
+    </field>    
+
+    <field name="profile" type="java.lang.String">
+      <bind-xml name="profile" node="attribute"/>
+    </field>    
+
+    <field name="order" type="java.lang.String">
+      <bind-xml name="order" node="attribute"/>
+    </field>    
+
+    <field name="skin" type="java.lang.String">
+      <bind-xml name="skin" node="attribute"/>
+    </field>    
+  </class>
+
+  <class name="org.apache.jetspeed.om.folder.impl.MenuSeparatorDefinitionImpl">
+    <map-to xml="separator"/>
+
+    <field name="skin" type="java.lang.String">
+      <bind-xml name="skin" node="attribute"/>
     </field>    
 
-    <field name="securityConstraints"
-           type="org.apache.jetspeed.om.page.psml.SecurityConstraintsImpl">
-      <bind-xml name="security-constraints"/>
-    </field>
-    
     <field name="title" type="java.lang.String">
       <bind-xml name="title"/>
     </field>
     
-    <field name="shortTitle" type="java.lang.String">
-      <bind-xml name="short-title"/>
+    <field name="textChild" type="java.lang.String">
+      <bind-xml name="text"/>
     </field>
     
-    <field name="defaultPage" type="java.lang.String">
-      <bind-xml name="default-page"/>
+    <field name="textBody" type="java.lang.String">
+      <bind-xml node="text"/>
     </field>
-
-    <field name="documentOrder"
-           type="java.lang.String" 
-           collection="vector">
-      <bind-xml name="document-order"/>
-    </field>    
-
+    
 	<field name="metadataFields"
            type="org.apache.jetspeed.om.page.psml.PageLocalizedFieldImpl" 
            collection="collection">
       <bind-xml name="metadata"/>
     </field>
+  </class>
+
+  <class name="org.apache.jetspeed.om.folder.impl.MenuIncludeDefinitionImpl">
+    <map-to xml="include"/>
+
+    <field name="name" type="java.lang.String">
+      <bind-xml node="text"/>
+    </field>    
+
+    <field name="nest" type="boolean">
+      <bind-xml name="nest" node="attribute"/>
+    </field>
+  </class>
+
+  <class name="org.apache.jetspeed.om.folder.impl.MenuExcludeDefinitionImpl">
+    <map-to xml="exclude"/>
+
+    <field name="name" type="java.lang.String">
+      <bind-xml node="text"/>
+    </field>    
   </class>
 
   <class name="org.apache.jetspeed.om.page.psml.Defaults">

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java Tue Jul 12 23:40:27 2005
@@ -18,6 +18,7 @@
 import java.security.AccessController;
 import java.io.File;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Locale;
 
 import org.apache.commons.logging.Log;
@@ -25,7 +26,6 @@
 import org.apache.jetspeed.om.common.GenericMetadata;
 import org.apache.jetspeed.om.common.SecuredResource;
 import org.apache.jetspeed.om.common.SecurityConstraints;
-import org.apache.jetspeed.om.folder.DocumentSet;
 import org.apache.jetspeed.om.folder.Folder;
 import org.apache.jetspeed.om.folder.FolderMetaData;
 import org.apache.jetspeed.om.folder.FolderNotFoundException;
@@ -33,6 +33,7 @@
 import org.apache.jetspeed.om.page.Link;
 import org.apache.jetspeed.om.page.Page;
 import org.apache.jetspeed.om.page.PageSecurity;
+import org.apache.jetspeed.page.PageManager;
 import org.apache.jetspeed.page.PageNotFoundException;
 import org.apache.jetspeed.page.document.AbstractNode;
 import org.apache.jetspeed.page.document.DocumentException;
@@ -57,9 +58,6 @@
  */
 public class FolderImpl extends AbstractNode implements Folder, Reset
 {
-    public static final String FALLBACK_DEFAULT_PAGE = "default-page.psml";
-
-    private static final String PAGE_NOT_FOUND_PAGE = "page_not_found.psml";
     private final static String FOLDER_PERMISSION_WILD_CHAR = new String(new char[]{FolderPermission.WILD_CHAR});
     
     private String defaultTheme;
@@ -67,6 +65,7 @@
     private File directory;
     private FolderMetaData metadata;
     private FolderHandler folderHandler;
+    private int reservedType = RESERVED_FOLDER_NONE;
     
     private static final Log log = LogFactory.getLog(FolderImpl.class);
 
@@ -77,23 +76,24 @@
         this.metadata.setParent(this);
         this.folderHandler = folderHandler;
         setId(path);
+        setPath(path);
+        setReservedType();
         setHandlerFactory(handlerFactory);
         setPermissionsEnabled(handlerFactory.getPermissionsEnabled());
         setConstraintsEnabled(handlerFactory.getConstraintsEnabled());
-        setPath(path);
     }
 
     public FolderImpl( String path, DocumentHandlerFactory handlerFactory, FolderHandler folderHandler )
     {
         this.metadata = new FolderMetaDataImpl();
-        this.metadata.setTitle(path);
         this.metadata.setParent(this);
         this.folderHandler = folderHandler;
         setId(path);
+        setPath(path);
+        setReservedType();
         setHandlerFactory(handlerFactory);
         setPermissionsEnabled(handlerFactory.getPermissionsEnabled());
         setConstraintsEnabled(handlerFactory.getConstraintsEnabled());
-        setPath(path);
     }
 
     /*
@@ -108,7 +108,7 @@
             String defaultPage = metadata.getDefaultPage();
             if(defaultPage == null)
             {
-                defaultPage = FALLBACK_DEFAULT_PAGE;
+                defaultPage = Folder.FALLBACK_DEFAULT_PAGE;
             }
             return getPage(defaultPage, false).getName();
         }
@@ -125,12 +125,12 @@
                     }
                     else
                     {
-                        return PAGE_NOT_FOUND_PAGE;
+                        return Folder.PAGE_NOT_FOUND_PAGE;
                     }
                 }
                 catch (NodeException e1)
                 {
-                    return PAGE_NOT_FOUND_PAGE;
+                    return Folder.PAGE_NOT_FOUND_PAGE;
                 }
             }
         }
@@ -197,8 +197,8 @@
      */
     public NodeSet getFolders() throws FolderNotFoundException, DocumentException
     {
-        // by default disable access checks to facilitate navigation
-        return getFolders(false);
+        // by default enable access checks
+        return getFolders(true);
     }
 
     /**
@@ -236,8 +236,8 @@
      */
     public Folder getFolder(String name) throws FolderNotFoundException, DocumentException
     {
-        // by default disable access checks to facilitate navigation
-        return getFolder(name, false);
+        // by default enable access checks
+        return getFolder(name, true);
     }
 
     /**
@@ -386,78 +386,6 @@
 
     /**
      * <p>
-     * getDocumentSets
-     * </p>
-     * 
-     * @param checkAccess flag
-     * @return documentSets node set
-     * @throws NodeException
-     */
-    public NodeSet getDocumentSets(boolean checkAccess) throws NodeException
-    {
-        // get list of all documentSets
-        NodeSet documentSets = getAllNodes().subset(DocumentSet.DOCUMENT_TYPE);
-
-        // filter node set by access
-        if (checkAccess)
-        {
-            documentSets = checkAccess(documentSets, SecuredResource.VIEW_ACTION);
-        }
-        return documentSets;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.jetspeed.om.folder.Folder#getDocumentSets()
-     */
-    public NodeSet getDocumentSets() throws NodeException
-    {
-        // by default enable access checks
-        return getDocumentSets(true);
-    }
-
-    /**
-     * <p>
-     * getDocumentSet
-     * </p>
-     * 
-     * @param name
-     * @param checkAccess flag
-     * @return document set
-     * @throws DocumentNotFoundException
-     * @throws NodeException
-     */
-    public DocumentSet getDocumentSet(String name, boolean checkAccess) throws DocumentNotFoundException, NodeException
-    {
-        // get documentSet
-        DocumentSet documentSet = (DocumentSet) getAllNodes().subset(DocumentSet.DOCUMENT_TYPE).get(name);
-        if (documentSet == null)
-        {
-            throw new DocumentNotFoundException("Jetspeed PSML document set not found: " + name);
-        }
-
-        // check access
-        if (checkAccess)
-        {
-            documentSet.checkAccess(SecuredResource.VIEW_ACTION);
-        }
-        return documentSet;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.jetspeed.om.folder.Folder#getDocumentSet(java.lang.String)
-     */
-    public DocumentSet getDocumentSet(String name) throws DocumentNotFoundException, NodeException
-    {
-        // by default enable access checks
-        return getDocumentSet(name, true);
-    }
-
-    /**
-     * <p>
      * getPageSecurity
      * </p>
      * 
@@ -502,9 +430,8 @@
      */
     public NodeSet getAll() throws FolderNotFoundException, DocumentException
     {
-        // return secure set of all nodes: disable access checks on
-        // folders to facilitate navigation, but enforce on documents
-        // while creating filtered nodes
+        // return secure set of all nodes: enforce access checks
+        // on folders and documents while creating filtered nodes
         NodeSet nodes = getAllNodes();
         NodeSet filteredNodes = null;
         Iterator checkAccessIter = nodes.iterator();
@@ -628,13 +555,13 @@
 
     /**
      * <p>
-     * getMetaData
+     * getFolderMetaData
      * </p>
      * 
-     * @see org.apache.jetspeed.om.folder.Folder#getMetaData()
+     * @see org.apache.jetspeed.om.folder.Folder#getFolderMetaData()
      * @return
      */
-    public FolderMetaData getMetaData()
+    public FolderMetaData getFolderMetaData()
     {
         return metadata;
     }
@@ -823,4 +750,84 @@
         allNodes = null;
         
     }
+
+    /**
+     * getMenuDefinitions - get list of menu definitions
+     *
+     * @return definition list
+     */
+    public List getMenuDefinitions()
+    {
+        return metadata.getMenuDefinitions();
+    }
+
+    /**
+     * setMenuDefinitions - set list of menu definitions
+     *
+     * @param definitions definition list
+     */
+    public void setMenuDefinitions(List definitions)
+    {
+        metadata.setMenuDefinitions(definitions);
+    }
+
+    /**
+     * unmarshalled - notification that this instance has been
+     *                loaded from the persistent store
+     */
+    public void unmarshalled()
+    {
+        // notify super class implementation
+        super.unmarshalled();
+
+        // default title of pages to name
+        if (getTitle() == null)
+        {
+            setTitle(getTitleName());
+        }
+    }
+    
+    public boolean isReserved()
+    {
+        return (reservedType > RESERVED_FOLDER_NONE);
+    }
+    
+    public int getReservedType()
+    {
+        return reservedType;
+    }
+    
+    private static final String RESERVED_FOLDER_PREFIX = "_";
+    private static final String RESERVED_USER_FOLDER_NAME = "_user";
+    private static final String RESERVED_ROLE_FOLDER_NAME = "_role";
+    private static final String RESERVED_GROUP_FOLDER_NAME = "_group";
+    private static final String RESERVED_SUBSITES_FOLDER_NAME = "__subsite-root";
+    private static final String RESERVED_MEDIATYPE_FOLDER_NAME = "_mediatype";
+    private static final String RESERVED_LANGUAGE_FOLDER_NAME = "_language";
+    private static final String RESERVED_COUNTRY_FOLDER_NAME = "_country";
+    
+    private void setReservedType()
+    {
+        String name = getName();
+        if (name != null && name.startsWith(RESERVED_FOLDER_PREFIX))            
+        {
+            if (name.equals(RESERVED_USER_FOLDER_NAME))
+                reservedType = RESERVED_FOLDER_USERS;
+            else if (name.equals(RESERVED_ROLE_FOLDER_NAME))
+                reservedType = RESERVED_FOLDER_ROLES;
+            else if (name.equals(RESERVED_GROUP_FOLDER_NAME))
+                reservedType = RESERVED_FOLDER_GROUPS;
+            else if (name.equals(RESERVED_SUBSITES_FOLDER_NAME))
+                reservedType = RESERVED_FOLDER_SUBSITES;
+            else if (name.equals(RESERVED_MEDIATYPE_FOLDER_NAME))
+                reservedType = RESERVED_FOLDER_MEDIATYPE;
+            else if (name.equals(RESERVED_LANGUAGE_FOLDER_NAME))
+                reservedType = RESERVED_FOLDER_LANGUAGE;
+            else if (name.equals(RESERVED_COUNTRY_FOLDER_NAME))
+                reservedType = RESERVED_FOLDER_COUNTRY;
+            else
+                reservedType = RESERVED_FOLDER_OTHER;            
+        }
+    }
+    
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message