portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r209305 [10/10] - in /portals/jetspeed-2/branches/MENUS_BRANCH: components/locator/src/java/org/apache/jetspeed/profiler/impl/ components/page-manager/ components/page-manager/src/java/META-INF/ components/page-manager/src/java/org/apache/j...
Date Tue, 05 Jul 2005 18:58:14 GMT
Modified: portals/jetspeed-2/branches/MENUS_BRANCH/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java?rev=209305&r1=209304&r2=209305&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java Tue Jul  5 11:58:05 2005
@@ -28,7 +28,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jetspeed.components.dao.InitablePersistenceBrokerDaoSupport;
 import org.apache.jetspeed.profiler.ProfileLocator;
-import org.apache.jetspeed.profiler.ProfiledPageContext;
 import org.apache.jetspeed.profiler.Profiler;
 import org.apache.jetspeed.profiler.ProfilerException;
 import org.apache.jetspeed.profiler.rules.PrincipalRule;
@@ -61,8 +60,6 @@
 
     /** The default locator class implementation */
     private Class locatorClass = JetspeedProfileLocator.class;
-    /** The default profiled page context class implementation */
-    private Class profiledPageContextClass = JetspeedProfiledPageContext.class;
     /** The default principalRule association class implementation */
     private Class principalRuleClass = PrincipalRuleImpl.class;
     /** The base (abstract) profilingRule class implementation */
@@ -119,10 +116,6 @@
         {
             locatorClass = Class.forName(modelName);
         }
-        if ((modelName = properties.getProperty("profiledPageContext.impl")) != null)
-        {
-            profiledPageContextClass = Class.forName(modelName);
-        }
         if ((modelName = properties.getProperty("principalRule.impl")) != null)
         {
             principalRuleClass = Class.forName(modelName);
@@ -226,26 +219,6 @@
     /*
      * (non-Javadoc)
      * 
-     * @see org.apache.jetspeed.profiler.Profiler#createProfiledPageContext(java.util.Map)
-     */
-    public ProfiledPageContext createProfiledPageContext( Map locators )
-    {
-        try
-        {
-            ProfiledPageContext pageContext = (ProfiledPageContext) profiledPageContextClass.newInstance();
-            pageContext.init(this, locators);
-            return pageContext;
-        }
-        catch (Exception e)
-        {
-            log.error("Failed to create profiled page context for " + profiledPageContextClass);
-        }
-        return null;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
      * @see org.apache.jetspeed.profiler.Profiler#getRuleForPrincipal(java.security.Principal,
      *          java.lang.String)
      */
@@ -491,4 +464,4 @@
         getPersistenceBrokerTemplate().delete(rule);
     }
 
-}
\ No newline at end of file
+}

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/components/registry/src/java/org/apache/jetspeed/om/impl/GenericMetadataImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/components/registry/src/java/org/apache/jetspeed/om/impl/GenericMetadataImpl.java?rev=209305&r1=209304&r2=209305&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/registry/src/java/org/apache/jetspeed/om/impl/GenericMetadataImpl.java (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/components/registry/src/java/org/apache/jetspeed/om/impl/GenericMetadataImpl.java Tue Jul  5 11:58:05 2005
@@ -117,7 +117,8 @@
     public void setFields(Collection fields)
     {
         this.fields = fields;
-        
+        fieldMap.clear();
+
         if(fields != null)
         {    
             Iterator fieldIter = fields.iterator();

Added: portals/jetspeed-2/branches/MENUS_BRANCH/design-docs/src/portal-site/portal-site-component.sxw
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/design-docs/src/portal-site/portal-site-component.sxw?rev=209305&view=auto
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/design-docs/src/portal-site/portal-site-component.sxw
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/Folder.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/Folder.java?rev=209305&r1=209304&r2=209305&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/Folder.java (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/Folder.java Tue Jul  5 11:58:05 2005
@@ -15,8 +15,8 @@
  */
 package org.apache.jetspeed.om.folder;
 
+import java.util.List;
 
-import org.apache.jetspeed.om.folder.DocumentSet;
 import org.apache.jetspeed.om.page.Link;
 import org.apache.jetspeed.om.page.Page;
 import org.apache.jetspeed.om.page.PageSecurity;
@@ -37,6 +37,9 @@
 public interface Folder extends Node
 {
     String FOLDER_TYPE = "folder";
+
+    String FALLBACK_DEFAULT_PAGE = "default-page.psml";
+    String PAGE_NOT_FOUND_PAGE = "page_not_found.psml";
     
     /**
      * 
@@ -160,31 +163,6 @@
     /**
      * 
      * <p>
-     * getDocumentSets
-     * </p>
-     *
-     * @return NodeSet of all the Document Sets referenced by this Folder.
-     * @throws DocumentException
-     * @throws NodeException
-     */    
-    NodeSet getDocumentSets() throws NodeException;
-    
-    /**
-     * 
-     * <p>
-     * getDocumentSet
-     * </p>
-     *
-     * @param name
-     * @return A DocumentSet referenced by this folder.
-     * @throws DocumentNotFoundException if the document requested could not be found.
-     * @throws NodeException
-     */    
-    DocumentSet getDocumentSet(String name) throws DocumentNotFoundException, NodeException;
-    
-    /**
-     * 
-     * <p>
      * getPageSecurity
      * </p>
      *
@@ -207,4 +185,28 @@
      * @throws DocumentException
      */
     NodeSet getAll() throws FolderNotFoundException, DocumentException;
+
+    /**
+     * 
+     * <p>
+     * getFolderMetaData
+     * </p>
+     *
+     * @return folder metadata
+     */
+    FolderMetaData getFolderMetaData();
+
+    /**
+     * getMenuDefinitions - get list of menu definitions
+     *
+     * @return definition list
+     */
+    List getMenuDefinitions();
+
+    /**
+     * setMenuDefinitions - set list of menu definitions
+     *
+     * @param definitions definition list
+     */
+    void setMenuDefinitions(List definitions);    
 }

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/FolderMetaData.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/FolderMetaData.java?rev=209305&r1=209304&r2=209305&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/FolderMetaData.java (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/FolderMetaData.java Tue Jul  5 11:58:05 2005
@@ -15,6 +15,7 @@
  */
 package org.apache.jetspeed.om.folder;
 
+import java.util.List;
 import java.util.Vector;
 
 import org.apache.jetspeed.om.page.Document;
@@ -42,4 +43,17 @@
     
     void setDefaultPage(String defaultPage);
 
+    /**
+     * getMenuDefinitions - get list of menu definitions
+     *
+     * @return definition list
+     */
+    List getMenuDefinitions();
+
+    /**
+     * setMenuDefinitions - set list of menu definitions
+     *
+     * @param definitions definition list
+     */
+    void setMenuDefinitions(List definitions);    
 }

Added: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuDefinition.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuDefinition.java?rev=209305&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuDefinition.java (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuDefinition.java Tue Jul  5 11:58:05 2005
@@ -0,0 +1,216 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.om.folder;
+
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.jetspeed.om.common.GenericMetadata;
+
+/**
+ * This interface describes the object used to define
+ * portal site menus comprised of nested menus, options,
+ * and separators.
+ * 
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+public interface MenuDefinition
+{
+    /**
+     * ANY_PROFILE_LOCATOR - wildcard value for profile locator names
+     */
+    String ANY_PROFILE_LOCATOR = MenuOptionsDefinition.ANY_PROFILE_LOCATOR;
+
+    /**
+     * getName - get menu name
+     *
+     * @return menu name
+     */
+    String getName();
+
+    /**
+     * setName - set menu name
+     *
+     * @param name menu name
+     */
+    void setName(String name);
+
+    /**
+     * getOptions - get comma separated menu options if not specified as elements
+     *
+     * @return option paths specification
+     */
+    String getOptions();
+
+    /**
+     * setOptions - set comma separated menu options if not specified as elements
+     *
+     * @param option option paths specification
+     */
+    void setOptions(String options);
+
+    /**
+     * getDepth - get depth of inclusion for folder menu options
+     *
+     * @return inclusion depth
+     */
+    int getDepth();
+
+    /**
+     * setDepth - set depth of inclusion for folder menu options
+     *
+     * @param depth inclusion depth
+     */
+    void setDepth(int depth);
+
+    /**
+     * isPaths - get generate ordered path options for specified options
+     *
+     * @return paths options flag
+     */
+    boolean isPaths();
+    
+    /**
+     * setPaths - set generate ordered path options for specified options
+     *
+     * @param paths paths options flag
+     */
+    void setPaths(boolean paths);
+    
+    /**
+     * isRegexp - get regexp flag for interpreting specified options
+     *
+     * @return regexp flag
+     */
+    boolean isRegexp();
+
+    /**
+     * setRegexp - set regexp flag for interpreting specified options
+     *
+     * @param regexp regexp flag
+     */
+    void setRegexp(boolean regexp);
+
+    /**
+     * getProfile - get profile locator used to filter specified options
+     *
+     * @return profile locator name
+     */
+    String getProfile();
+
+    /**
+     * setProfile - set profile locator used to filter specified options
+     *
+     * @param locatorName profile locator name
+     */
+    void setProfile(String locatorName);
+
+    /**
+     * getOrder - get comma separated regexp ordering patterns for options
+     *
+     * @return ordering patterns list
+     */
+    String getOrder();
+
+    /**
+     * setOrder - set comma separated regexp ordering patterns for options
+     *
+     * @param order ordering patterns list
+     */
+    void setOrder(String order);
+
+    /**
+     * getSkin - get skin name for menu
+     *
+     * @return skin name
+     */
+    String getSkin();
+
+    /**
+     * setSkin - set skin name for menu
+     *
+     * @param name skin name
+     */
+    void setSkin(String name);
+
+    /**
+     * getTitle - get default title for menu
+     *
+     * @return title text
+     */
+    String getTitle();
+
+    /**
+     * setTitle - set default title for menu
+     *
+     * @param title title text
+     */
+    void setTitle(String title);
+
+    /**
+     * getShortTitle - get default short title for menu
+     *
+     * @return short title text
+     */
+    String getShortTitle();
+
+    /**
+     * setShortTitle - set default short title for menu
+     *
+     * @param title short title text
+     */
+    void setShortTitle(String title);
+
+    /**
+     * getTitle - get locale specific title for menu from metadata
+     *
+     * @param locale preferred locale
+     * @return title text
+     */
+    String getTitle(Locale locale);
+
+    /**
+     * getShortTitle - get locale specific short title for menu from metadata
+     *
+     * @param locale preferred locale
+     * @return short title text
+     */
+    String getShortTitle(Locale locale);
+
+    /**
+     * getMetadata - get generic metadata instance for menu
+     *
+     * @return metadata instance
+     */
+    GenericMetadata getMetadata();
+
+    /**
+     * getMenuElements - get ordered list of menu options,
+     *                   nested menus, separators, included
+     *                   menu, and excluded menu elements
+     *
+     * @return element list
+     */
+    List getMenuElements();
+
+    /**
+     * setMenuElements - set ordered list of menu options
+     *
+     * @param elements element list
+     */
+    void setMenuElements(List elements);
+}

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuExcludeDefinition.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuExcludeDefinition.java?rev=209305&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuExcludeDefinition.java (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuExcludeDefinition.java Tue Jul  5 11:58:05 2005
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.om.folder;
+
+/**
+ * This interface describes the object used to define
+ * portal site menu excluded menu options.
+ * 
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+public interface MenuExcludeDefinition
+{
+    /**
+     * getName - get menu name with options to exclude
+     *
+     * @return menu name
+     */
+    String getName();
+
+    /**
+     * setName - set menu name with options to exclude
+     *
+     * @param name menu name
+     */
+    void setName(String name);
+}

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuExcludeDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuIncludeDefinition.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuIncludeDefinition.java?rev=209305&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuIncludeDefinition.java (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuIncludeDefinition.java Tue Jul  5 11:58:05 2005
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.om.folder;
+
+/**
+ * This interface describes the object used to define
+ * portal site menu included menus.
+ * 
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+public interface MenuIncludeDefinition
+{
+    /**
+     * getName - get menu name to nest or with options to include
+     *
+     * @return menu name
+     */
+    String getName();
+
+    /**
+     * setName - set menu name to nest or with options to include
+     *
+     * @param name menu name
+     */
+    void setName(String name);
+
+    /**
+     * isNest - get nesting for included menu
+     *
+     * @return nest options flag
+     */
+    boolean isNest();
+    
+    /**
+     * setNest - set nesting for included menu
+     *
+     * @param nest nest menu flag
+     */
+    void setNest(boolean nest);    
+}

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuIncludeDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuOptionsDefinition.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuOptionsDefinition.java?rev=209305&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuOptionsDefinition.java (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuOptionsDefinition.java Tue Jul  5 11:58:05 2005
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.om.folder;
+
+/**
+ * This interface describes the object used to define
+ * portal site menu options.
+ * 
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+public interface MenuOptionsDefinition
+{
+    /**
+     * ANY_PROFILE_LOCATOR - wildcard value for profile locator names
+     */
+    String ANY_PROFILE_LOCATOR = "*";
+
+    /**
+     * getOptions - get comma separated menu options
+     *
+     * @return option paths specification
+     */
+    String getOptions();
+
+    /**
+     * setOptions - set comma separated menu options
+     *
+     * @param options option paths specification
+     */
+    void setOptions(String options);
+
+    /**
+     * getDepth - get depth of inclusion for folder options
+     *
+     * @return inclusion depth
+     */
+    int getDepth();
+
+    /**
+     * setDepth - set depth of inclusion for folder options
+     *
+     * @param depth inclusion depth
+     */
+    void setDepth(int depth);
+
+    /**
+     * isPaths - get generate ordered path options
+     *
+     * @return paths options flag
+     */
+    boolean isPaths();
+    
+    /**
+     * setPaths - set generate ordered path options
+     *
+     * @param paths paths options flag
+     */
+    void setPaths(boolean paths);
+    
+    /**
+     * isRegexp - get regexp flag for interpreting options
+     *
+     * @return regexp flag
+     */
+    boolean isRegexp();
+
+    /**
+     * setRegexp - set regexp flag for interpreting options
+     *
+     * @param regexp regexp flag
+     */
+    void setRegexp(boolean regexp);
+
+    /**
+     * getProfile - get profile locator used to filter options
+     *
+     * @return profile locator name
+     */
+    String getProfile();
+
+    /**
+     * setProfile - set profile locator used to filter options
+     *
+     * @param locatorName profile locator name
+     */
+    void setProfile(String locatorName);
+
+    /**
+     * getOrder - get comma separated regexp ordering patterns
+     *
+     * @return ordering patterns list
+     */
+    String getOrder();
+
+    /**
+     * setOrder - set comma separated regexp ordering patterns
+     *
+     * @param order ordering patterns list
+     */
+    void setOrder(String order);
+
+    /**
+     * getSkin - get skin name for options
+     *
+     * @return skin name
+     */
+    String getSkin();
+
+    /**
+     * setSkin - set skin name for options
+     *
+     * @param name skin name
+     */
+    void setSkin(String name);
+}

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuOptionsDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuSeparatorDefinition.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuSeparatorDefinition.java?rev=209305&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuSeparatorDefinition.java (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuSeparatorDefinition.java Tue Jul  5 11:58:05 2005
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.om.folder;
+
+import java.util.Locale;
+
+import org.apache.jetspeed.om.common.GenericMetadata;
+
+/**
+ * This interface describes the object used to define
+ * portal site menu separators.
+ * 
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+public interface MenuSeparatorDefinition
+{
+    /**
+     * getSkin - get skin name for separator
+     *
+     * @return skin name
+     */
+    String getSkin();
+
+    /**
+     * setSkin - set skin name for separator
+     *
+     * @param name skin name
+     */
+    void setSkin(String name);
+
+    /**
+     * getTitle - get default title for separator
+     *
+     * @return title text
+     */
+    String getTitle();
+
+    /**
+     * setTitle - set default title for separator
+     *
+     * @param title title text
+     */
+    void setTitle(String title);
+
+    /**
+     * getText - get default text for separator
+     *
+     * @return text
+     */
+    String getText();
+
+    /**
+     * setText - set default text for separator
+     *
+     * @param text text
+     */
+    void setText(String text);
+
+    /**
+     * getTitle - get locale specific title for separator from metadata
+     *
+     * @param locale preferred locale
+     * @return title text
+     */
+    String getTitle(Locale locale);
+
+    /**
+     * getText - get locale specific text for separator from metadata
+     *
+     * @param locale preferred locale
+     * @return text
+     */
+    String getText(Locale locale);
+
+    /**
+     * getMetadata - get generic metadata instance for menu
+     *
+     * @return metadata instance
+     */
+    GenericMetadata getMetadata();
+}

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuSeparatorDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/page/Page.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/page/Page.java?rev=209305&r1=209304&r2=209305&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/page/Page.java (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/om/page/Page.java Tue Jul  5 11:58:05 2005
@@ -15,6 +15,7 @@
  */
 package org.apache.jetspeed.om.page;
 
+import java.util.List;
 
 /**
  * This interface represents a complete page document used by Jetspeed
@@ -26,7 +27,6 @@
 {
     String DOCUMENT_TYPE = ".psml";
     
-
     /**
      * Returns the name of the default skin that applies to this
      * page. This name should reference an entry in the Skin
@@ -34,7 +34,7 @@
      *
      * @return the page default skin name
      */
-    public String getDefaultSkin();
+    String getDefaultSkin();
 
     /**
      * Modifies the default skin for this page.
@@ -45,7 +45,7 @@
      *
      * @param skinName the name of the new skin for the page
      */
-    public void setDefaultSkin(String skinName);
+    void setDefaultSkin(String skinName);
 
     /**
      * Returns the name of the default decorator that applies in this page
@@ -54,7 +54,7 @@
      * @param fragmentType the type of fragment considered
      * @return the decorator name for the selected type
      */
-    public String getDefaultDecorator(String fragmentType);
+    String getDefaultDecorator(String fragmentType);
 
     /**
      * Modifies the default decorator for the specified fragment type.
@@ -62,7 +62,7 @@
      * @param decoratorName the name of the new decorator for the type
      * @param fragmentType the type of fragment considered
      */
-    public void setDefaultDecorator(String decoratorName, String fragmentType);
+    void setDefaultDecorator(String decoratorName, String fragmentType);
 
     /**
      * Retrieves the top level fragment of this page. This Fragment should
@@ -70,7 +70,7 @@
      *
      * @return the base Fragment object for this page.
      */
-    public Fragment getRootFragment();
+    Fragment getRootFragment();
 
     /**
      * Sets the top level fragment of this page. This Fragment should
@@ -78,7 +78,7 @@
      *
      * @return the base Fragment object for this page.
      */    
-    public void setRootFragment(Fragment fragment);
+    void setRootFragment(Fragment fragment);
 
     /**
      * Retrieves the fragment contained within this page, with the
@@ -87,12 +87,25 @@
      * @param id the fragment id to look for
      * @return the found Fragment object or null if not found
      */
-    public Fragment getFragmentById(String id);
+    Fragment getFragmentById(String id);
 
     /**
      * Create a clone of this object
      */
-    public Object clone()
-        throws java.lang.CloneNotSupportedException;
+    Object clone() throws java.lang.CloneNotSupportedException;
+
+    /**
+     * getMenuDefinitions - get list of menu definitions
+     *
+     * @return definition list
+     */
+    List getMenuDefinitions();
+
+    /**
+     * setMenuDefinitions - set list of menu definitions
+     *
+     * @param definitions definition list
+     */
+    void setMenuDefinitions(List definitions);    
 }
 

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/page/PageManager.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/page/PageManager.java?rev=209305&r1=209304&r2=209305&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/page/PageManager.java (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/page/PageManager.java Tue Jul  5 11:58:05 2005
@@ -17,10 +17,14 @@
 package org.apache.jetspeed.page;
 
 import org.apache.jetspeed.exception.JetspeedException;
-import org.apache.jetspeed.om.folder.DocumentSet;
 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.folder.MenuDefinition;
+import org.apache.jetspeed.om.folder.MenuExcludeDefinition;
+import org.apache.jetspeed.om.folder.MenuIncludeDefinition;
+import org.apache.jetspeed.om.folder.MenuOptionsDefinition;
+import org.apache.jetspeed.om.folder.MenuSeparatorDefinition;
 import org.apache.jetspeed.om.page.ContentPage;
 import org.apache.jetspeed.om.page.Fragment;
 import org.apache.jetspeed.om.page.Link;
@@ -31,7 +35,6 @@
 import org.apache.jetspeed.page.document.DocumentNotFoundException;
 import org.apache.jetspeed.page.document.NodeException;
 import org.apache.jetspeed.page.document.UnsupportedDocumentTypeException;
-import org.apache.jetspeed.profiler.ProfiledPageContext;
 
 /**
  * This service is responsible for loading and saving Pages into
@@ -83,6 +86,41 @@
      */
     public Property newProperty();
 
+    /**
+     * newMenuDefinition - creates a new empty menu definition
+     *
+     * @return a newly created MenuDefinition object
+     */
+    public MenuDefinition newMenuDefinition();
+
+    /**
+     * newMenuExcludeDefinition - creates a new empty menu exclude definition
+     *
+     * @return a newly created MenuExcludeDefinition object
+     */
+    public MenuExcludeDefinition newMenuExcludeDefinition();
+
+    /**
+     * newMenuIncludeDefinition - creates a new empty menu include definition
+     *
+     * @return a newly created MenuIncludeDefinition object
+     */
+    public MenuIncludeDefinition newMenuIncludeDefinition();
+
+    /**
+     * newMenuOptionsDefinition - creates a new empty menu options definition
+     *
+     * @return a newly created MenuOptionsDefinition object
+     */
+    public MenuOptionsDefinition newMenuOptionsDefinition();
+
+    /**
+     * newMenuSeparatorDefinition - creates a new empty menu separator definition
+     *
+     * @return a newly created MenuSeparatorDefinition object
+     */
+    public MenuSeparatorDefinition newMenuSeparatorDefinition();
+
    /**
     * 
     * <p>
@@ -131,20 +169,6 @@
    /**
     * 
     * <p>
-    * getDocumentSet
-    * </p>
-    *
-    * Returns a DocumentSet document for the given path
-    *
-    * @param name The path of the document to be retrieved.
-    * @throws PageNotFoundException if the page cannot be found
-    * @throws NodeException
-    */
-    public DocumentSet getDocumentSet(String name) throws DocumentNotFoundException, UnsupportedDocumentTypeException, FolderNotFoundException, NodeException;
-    
-   /**
-    * 
-    * <p>
     * getPageSecurity
     * </p>
     *
@@ -171,20 +195,6 @@
      */
     Folder getFolder(String folderPath) throws FolderNotFoundException, InvalidFolderException, NodeException;
 
-    /**
-     * <p>
-     * Compute profiled page context elements based on named profile
-     * locators associated with a session/principal in supplied
-     * context instance.
-     * </p>
-     *
-     * @param page
-     * @throws PageNotFoundException if the page cannot be found.
-     * @throws DocumentException
-     * @throws NodeException
-     */
-    public void computeProfiledPageContext(ProfiledPageContext pageContext) throws PageNotFoundException, DocumentException, NodeException;
-
     /** Store the page on disk
      *
      * @param page The page to be stored.
@@ -203,4 +213,4 @@
      */
     public void removePage(Page page) throws JetspeedException, PageNotRemovedException;
 
-}
\ No newline at end of file
+}

Added: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/Menu.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/Menu.java?rev=209305&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/Menu.java (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/Menu.java Tue Jul  5 11:58:05 2005
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.portalsite;
+
+import java.util.List;
+
+/**
+ * This interface describes the portal-site menu elements
+ * constructed and returned to decorators.
+ * 
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+public interface Menu extends MenuElement
+{
+    /**
+     * getName - get name of menu
+     *
+     * @return menu name
+     */
+    String getName();
+
+    /**
+     * getUrl - get url of top level folder that defined
+     *          menu options; only available for menus
+     *          defined without multiple options, nested
+     *          menus, or separators
+     *
+     * @return folder url
+     */
+    String getUrl();
+
+    /**
+     * isHidden - get hidden state of folder that defined
+     *            menu options; only available for menus
+     *            defined without multiple options, nested
+     *            menus, or separators
+     *
+     * @return hidden state
+     */
+    boolean isHidden();
+
+    /**
+     * isSelected - return true if an option or nested
+     *              menu within this menu are selected by
+     *              the specified request context
+     *
+     * @param context request context
+     * @return selected state
+     */
+    boolean isSelected(PortalSiteRequestContext context);
+
+    /**
+     * getElements - get ordered list of menu elements that
+     *               are members of this menu; possibly contains
+     *               options, nested menus, or separators
+     *
+     * @return menu elements list
+     */
+    List getElements();
+
+    /**
+     * getSelectedElement - return selected option or nested
+     *                      menu within this menu selected by
+     *                      the specified request context
+     *
+     * @return selected menu element
+     */
+    MenuElement getSelectedElement(PortalSiteRequestContext context);
+}

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/Menu.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuElement.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuElement.java?rev=209305&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuElement.java (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuElement.java Tue Jul  5 11:58:05 2005
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.portalsite;
+
+import java.util.Locale;
+
+import org.apache.jetspeed.om.common.GenericMetadata;
+
+/**
+ * This interface describes common features of portal-site
+ * menu elements constructed and returned to decorators.
+ * 
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+public interface MenuElement
+{
+    /**
+     * MENU_ELEMENT_TYPE - element type of menu elements
+     */
+    String MENU_ELEMENT_TYPE = "menu";
+
+    /**
+     * OPTION_ELEMENT_TYPE - element type of menu elements
+     */
+    String OPTION_ELEMENT_TYPE = "option";
+
+    /**
+     * SEPARATOR_ELEMENT_TYPE - element type of separator elements
+     */
+    String SEPARATOR_ELEMENT_TYPE = "separator";
+
+    /**
+     * getElementType - get type of menu element
+     *
+     * @return MENU_ELEMENT_TYPE, OPTION_ELEMENT_TYPE, or
+     *         SEPARATOR_ELEMENT_TYPE
+     */
+    String getElementType();
+
+    /**
+     * getParentMenu - get menu that contains menu element 
+     *
+     * @return parent menu
+     */    
+    Menu getParentMenu();
+
+    /**
+     * getTitle - get default title for menu element
+     *
+     * @return title text
+     */
+    String getTitle();
+
+    /**
+     * getShortTitle - get default short title for menu element
+     *
+     * @return short title text
+     */
+    String getShortTitle();
+
+    /**
+     * getTitle - get locale specific title for menu element
+     *            from metadata
+     *
+     * @param locale preferred locale
+     * @return title text
+     */
+    String getTitle(Locale locale);
+
+    /**
+     * getShortTitle - get locale specific short title for menu
+     *                 element from metadata
+     *
+     * @param locale preferred locale
+     * @return short title text
+     */
+    String getShortTitle(Locale locale);
+
+    /**
+     * getMetadata - get generic metadata for menu element
+     *
+     * @return metadata
+     */    
+    GenericMetadata getMetadata();
+
+    /**
+     * getSkin - get skin name for menu element
+     *
+     * @return skin name
+     */
+    String getSkin();
+}

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuElement.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuOption.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuOption.java?rev=209305&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuOption.java (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuOption.java Tue Jul  5 11:58:05 2005
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.portalsite;
+
+/**
+ * This interface describes the portal-site menu option
+ * elements constructed and returned to decorators.
+ * 
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+public interface MenuOption extends MenuElement
+{
+    /**
+     * FOLDER_OPTION_TYPE - type of folder menu option
+     */
+    String FOLDER_OPTION_TYPE = "folder";
+
+    /**
+     * PAGE_OPTION_TYPE - type of page menu option
+     */
+    String PAGE_OPTION_TYPE = "page";
+
+    /**
+     * LINK_OPTION_TYPE - type of link menu option
+     */
+    String LINK_OPTION_TYPE = "link";
+
+    /**
+     * getType - get type of menu option
+     *
+     * @return FOLDER_OPTION_TYPE, PAGE_OPTION_TYPE, or
+     *         LINK_OPTION_TYPE
+     */
+    String getType();
+
+    /**
+     * getUrl - get url of menu option
+     *
+     * @return folder, page, or link url
+     */
+    String getUrl();
+
+    /**
+     * getTarget - get target for url of menu option
+     *
+     * @return url target
+     */
+    String getTarget();
+
+    /**
+     * isHidden - get hidden state of menu option
+     *
+     * @return hidden state
+     */
+    boolean isHidden();
+
+    /**
+     * isSelected - return true if menu option is selected in
+     *              the specified request context
+     *
+     * @param context request context
+     * @return selected state
+     */
+    boolean isSelected(PortalSiteRequestContext context);
+}

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuOption.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuSeparator.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuSeparator.java?rev=209305&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuSeparator.java (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuSeparator.java Tue Jul  5 11:58:05 2005
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.portalsite;
+
+import java.util.Locale;
+
+/**
+ * This interface describes the portal-site menu separator
+ * elements constructed and returned to decorators.
+ * 
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+public interface MenuSeparator extends MenuElement
+{
+    /**
+     * getText - get default text for menu separator
+     *
+     * @return text
+     */
+    String getText();
+
+    /**
+     * getText - get locale specific text for menu separator
+     *           from metadata
+     *
+     * @param locale preferred locale
+     * @return text
+     */
+    String getText(Locale locale);
+}

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuSeparator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSite.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSite.java?rev=209305&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSite.java (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSite.java Tue Jul  5 11:58:05 2005
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.portalsite;
+
+import org.apache.jetspeed.page.PageManager;
+
+/**
+ * This interface describes the portal-site component.
+ * 
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+public interface PortalSite
+{
+    /**
+     * newSessionContext - create a new session context instance
+     *
+     * @return new session context instance
+     */
+    PortalSiteSessionContext newSessionContext();
+
+    /**
+     * getPageManager - return PageManager component instance
+     *
+     * @return PageManager instance
+     */
+    PageManager getPageManager();
+}

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSite.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java?rev=209305&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java Tue Jul  5 11:58:05 2005
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.portalsite;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.jetspeed.om.folder.Folder;
+import org.apache.jetspeed.om.page.Page;
+import org.apache.jetspeed.page.document.NodeNotFoundException;
+import org.apache.jetspeed.page.document.NodeSet;
+
+/**
+ * This describes the request context for the portal-site component.
+ * 
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+public interface PortalSiteRequestContext
+{
+    /**
+     * getSessionContext - get component session context
+     *
+     * @return component session context
+     */
+    PortalSiteSessionContext getSessionContext();
+
+    /**
+     * getLocators - get profile locators by locator names
+     *  
+     * @return request profile locators
+     */
+    Map getLocators();
+
+    /**
+     * getManagedPage - get request profiled concrete page instance
+     *                  as managed by the page manager
+     *  
+     * @return page
+     * @throws NodeNotFoundException if page not found
+     * @throws SecurityException if page view access not granted
+     */
+    Page getManagedPage() throws NodeNotFoundException;
+
+    /**
+     * getPage - get request profiled page proxy
+     *  
+     * @return page proxy
+     * @throws NodeNotFoundException if page not found
+     * @throws SecurityException if page view access not granted
+     */
+    Page getPage() throws NodeNotFoundException;
+
+    /**
+     * getFolder - get folder proxy relative to request profiled page
+     *  
+     * @return page folder proxy
+     * @throws NodeNotFoundException if page not found
+     * @throws SecurityException if page view access not granted
+     */
+    Folder getFolder() throws NodeNotFoundException;
+
+    /**
+     * getSiblingPages - get node set of sibling page proxies relative
+     *                   to request profiled page, (includes profiled
+     *                   page proxy)
+     *  
+     * @return sibling page proxies
+     * @throws NodeNotFoundException if page not found
+     * @throws SecurityException if page view access not granted
+     */
+    NodeSet getSiblingPages() throws NodeNotFoundException;
+
+    /**
+     * getParentFolder - get parent folder proxy relative to request
+     *                   profiled page
+     *  
+     * @return parent folder proxy or null
+     * @throws NodeNotFoundException if page not found
+     * @throws SecurityException if page view access not granted
+     */
+    Folder getParentFolder() throws NodeNotFoundException;
+
+    /**
+     * getSiblingFolders - get node set of sibling folder proxies relative
+     *                     to request profiled page, (includes profiled
+     *                     page folder proxy)
+     *  
+     * @return sibling folder proxies
+     * @throws NodeNotFoundException if page not found
+     * @throws SecurityException if page view access not granted
+     */
+    NodeSet getSiblingFolders() throws NodeNotFoundException;
+
+    /**
+     * getRootFolder - get root profiled folder proxy
+     *  
+     * @return parent folder proxy
+     * @throws NodeNotFoundException if page not found
+     * @throws SecurityException if page view access not granted
+     */
+    Folder getRootFolder() throws NodeNotFoundException;
+
+    /**
+     * getRootLinks - get node set of link proxies relative to
+     *                profiled root folder
+     *  
+     * @return root link proxies
+     * @throws NodeNotFoundException if page not found
+     * @throws SecurityException if page view access not granted
+     */
+    NodeSet getRootLinks() throws NodeNotFoundException;
+
+    /**
+     * getStandardMenuNames - get set of available standard menu names
+     *  
+     * @return menu names set
+     */
+    Set getStandardMenuNames();
+
+    /**
+     * getCustomMenuNames - get set of custom menu names available as
+     *                      defined for the request profiled page and folder
+     *  
+     * @return menu names set
+     * @throws NodeNotFoundException if page not found
+     * @throws SecurityException if page view access not granted
+     */
+    Set getCustomMenuNames() throws NodeNotFoundException;
+
+    /**
+     * getMenu - get instantiated menu available for the request
+     *           profiled page and folder
+     *  
+     * @param name menu definition name
+     * @return menu instance
+     * @throws NodeNotFoundException if page not found
+     * @throws SecurityException if page view access not granted
+     */
+    Menu getMenu(String name) throws NodeNotFoundException;
+}

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSiteSessionContext.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSiteSessionContext.java?rev=209305&view=auto
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSiteSessionContext.java (added)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSiteSessionContext.java Tue Jul  5 11:58:05 2005
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.portalsite;
+
+import java.util.Map;
+
+import org.apache.jetspeed.page.PageManager;
+
+/**
+ * This describes the session context for the portal-site component.
+ * 
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+public interface PortalSiteSessionContext
+{
+    /**
+     * newRequestContext - create a new request context instance
+     *
+     * @param requestProfileLocators request profile locators
+     * @return new request context instance
+     */
+    PortalSiteRequestContext newRequestContext(Map requestProfileLocators);
+
+    /**
+     * getPageManager - return PageManager component instance
+     *
+     * @return PageManager instance
+     */
+    PageManager getPageManager();
+}

Propchange: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/portalsite/PortalSiteSessionContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/profiler/ProfileLocator.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/profiler/ProfileLocator.java?rev=209305&r1=209304&r2=209305&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/profiler/ProfileLocator.java (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/profiler/ProfileLocator.java Tue Jul  5 11:58:05 2005
@@ -42,7 +42,6 @@
 {
     public final static String PAGE_LOCATOR = "page";
     public final static String SECURITY_LOCATOR = "security";
-    public final static String DOCSET_LOCATOR = "docset";
 
     public final static String PATH_SEPARATOR = ":";
     

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/profiler/Profiler.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/profiler/Profiler.java?rev=209305&r1=209304&r2=209305&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/profiler/Profiler.java (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/jetspeed-api/src/java/org/apache/jetspeed/profiler/Profiler.java Tue Jul  5 11:58:05 2005
@@ -85,16 +85,6 @@
     ProfileLocator createLocator(RequestContext context);
         
     /**
-      * Creates a new ProfiledPageContext object that references
-      * the specified locator and can be managed by the current
-      * Profiler implementation
-      *
-      * @param locators Map of ProfileLocator objects used to select page
-      * @return A new ProfiledPageContext object
-      */
-    ProfiledPageContext createProfiledPageContext(Map locators);
-        
-    /**
      * For a given principal, lookup the associated profiling rule to that principal name.
      * 
      * @param principal Lookup the profiling rule based on this principal. 

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/portal/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/portal/project.xml?rev=209305&r1=209304&r2=209305&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/portal/project.xml (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/portal/project.xml Tue Jul  5 11:58:05 2005
@@ -175,6 +175,13 @@
       </properties>
     </dependency>
     <dependency>
+      <id>jetspeed2:jetspeed-portal-site</id>
+      <version>&jetspeed-version;</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
       <id>jetspeed2:jetspeed-portlet-factory</id>
       <version>&jetspeed-version;</version>
       <properties>

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java?rev=209305&r1=209304&r2=209305&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java Tue Jul  5 11:58:05 2005
@@ -33,8 +33,10 @@
 import org.apache.jetspeed.pipeline.valve.AbstractValve;
 import org.apache.jetspeed.pipeline.valve.PageProfilerValve;
 import org.apache.jetspeed.pipeline.valve.ValveContext;
+import org.apache.jetspeed.portalsite.PortalSite;
+import org.apache.jetspeed.portalsite.PortalSiteRequestContext;
+import org.apache.jetspeed.portalsite.PortalSiteSessionContext;
 import org.apache.jetspeed.profiler.ProfileLocator;
-import org.apache.jetspeed.profiler.ProfiledPageContext;
 import org.apache.jetspeed.profiler.Profiler;
 import org.apache.jetspeed.profiler.ProfilerException;
 import org.apache.jetspeed.request.RequestContext;
@@ -51,19 +53,50 @@
 {
     protected Log log = LogFactory.getLog(ProfilerValveImpl.class);   
 
+    /**
+     * PORTAL_SITE_REQUEST_CONTEXT_ATTR_KEY - session portal site context attribute key
+     */
+    public static final String PORTAL_SITE_SESSION_CONTEXT_ATTR_KEY = "org.apache.jetspeed.portalsite.PortalSiteSessionContext";
+
+    /**
+     * PORTAL_SITE_REQUEST_CONTEXT_ATTR_KEY - request portal site context attribute key
+     */
+    public static final String PORTAL_SITE_REQUEST_CONTEXT_ATTR_KEY = "org.apache.jetspeed.portalsite.PortalSiteRequestContext";
+
+    /**
+     * PROFILED_PAGE_CONTEXT_ATTR_KEY - legacy request portal site context attribute key
+     */
     public static final String PROFILED_PAGE_CONTEXT_ATTR_KEY = "org.apache.jetspeed.profiledPageContext";
 
+    /**
+     * profiler - profiler component
+     */
     private Profiler profiler;
+
+    /**
+     * portalSite - portal site component
+     */
+    private PortalSite portalSite;
+
+    /**
+     * pageManager - page manager component
+     */
     private PageManager pageManager;
    
-
-    public ProfilerValveImpl( Profiler profiler, PageManager pageManager )
+    /**
+     * ProfilerValveImpl - constructor
+     *
+     * @param profiler profiler component reference
+     * @param portalSite portal site component reference
+     * @param pageManager page manager component reference
+     */
+    public ProfilerValveImpl( Profiler profiler, PortalSite portalSite, PageManager pageManager )
     {
         this.profiler = profiler;
+        this.portalSite = portalSite;
         this.pageManager = pageManager;
     }
-    
- 
+     
     /*
      * (non-Javadoc)
      * 
@@ -86,6 +119,7 @@
                 throw new ProfilerException("Missing principal for request: " + request.getPath());
             }
             
+            // get request specific profile locators if required
             Map locators = null;
             String locatorName = (String)request.getAttribute(PROFILE_LOCATOR_REQUEST_ATTR_KEY);
             if ( locatorName != null )
@@ -97,38 +131,49 @@
                     locators.put(ProfileLocator.PAGE_LOCATOR, locator);
                 }
             }
-            
-            if ( locators ==  null )
+
+            // get specified or default locators for the current user,
+            // falling back to global defaults and, if necessary, explicity
+            // fallback to 'page' profile locators
+            if ( locators == null )
             {
-                // get all locators for the current user
                 locators = profiler.getProfileLocators(request, principal);
             }
-
             if (locators.size() == 0)
             {
                 locators = profiler.getDefaultProfileLocators(request);                
             }
-            
             if (locators.size() == 0)
             {
                 locators.put(ProfileLocator.PAGE_LOCATOR, profiler.getProfile(request, ProfileLocator.PAGE_LOCATOR));
             }
             
-            // get profiled page context using the profiler and page manager
-            ProfiledPageContext profiledPageContext = profiler.createProfiledPageContext(locators);
-            pageManager.computeProfiledPageContext(profiledPageContext);
-            if (profiledPageContext.getPage() == null)
-            {
-                throw new NodeNotFoundException("Unable to profile request: " + request.getPath());
+            // get profiled page using the profiler, page manager,
+            // and portal site components
+            if (locators != null)
+            {
+                // get or create portalsite session context
+                PortalSiteSessionContext sessionContext = (PortalSiteSessionContext)request.getSessionAttribute(PORTAL_SITE_SESSION_CONTEXT_ATTR_KEY);
+                if (sessionContext == null)
+                {
+                    sessionContext = portalSite.newSessionContext();
+                    request.setSessionAttribute(PORTAL_SITE_SESSION_CONTEXT_ATTR_KEY, sessionContext);
+                }
+
+                // construct and save a new portalsite request context
+                // using session context and locators map
+                PortalSiteRequestContext requestContext = sessionContext.newRequestContext(locators);
+                request.setAttribute(PORTAL_SITE_REQUEST_CONTEXT_ATTR_KEY, requestContext);
+
+                // additionally save request context under legacy key
+                // to support existing decorator access
+                request.setAttribute(PROFILED_PAGE_CONTEXT_ATTR_KEY, requestContext);
+
+                // get profiled page from portalsite request context
+                // and save profile locators map
+                request.setPage(new ContentPageImpl(requestContext.getManagedPage()));
+                request.setProfileLocators(requestContext.getLocators());
             }
-            
-            // set request page and profile locator
-            request.setPage(new ContentPageImpl(profiledPageContext.getPage()));
-            request.setProfileLocators(profiledPageContext.getLocators());
-
-            // return profiled page context in request attribute
-            HttpServletRequest httpRequest = request.getRequest();
-            httpRequest.setAttribute(PROFILED_PAGE_CONTEXT_ATTR_KEY, profiledPageContext);
 
             // continue
             context.invokeNext(request);

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/assembly/page-manager.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/assembly/page-manager.xml?rev=209305&r1=209304&r2=209305&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/assembly/page-manager.xml (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/assembly/page-manager.xml Tue Jul  5 11:58:05 2005
@@ -17,17 +17,15 @@
 -->
 <beans>
 
-  <!-- Profiler DAO-->
+  <!-- Profiler -->  
   <bean id="profilerImpl" class="org.apache.jetspeed.profiler.impl.JetspeedProfilerImpl" init-method="init">
        <constructor-arg index="0"><value>META-INF/profiler-ojb.xml</value></constructor-arg>
        <constructor-arg index="1"><value>j1</value></constructor-arg>
-    </bean>
+  </bean>
   
-  <!-- Profiler -->  
   <bean id="org.apache.jetspeed.profiler.Profiler" 
         name="profiler"
-        parent="baseTransactionProxy"        
-  >        
+        parent="baseTransactionProxy">        
         <property name="proxyInterfaces">
             <value>org.apache.jetspeed.profiler.Profiler</value>
         </property>
@@ -44,6 +42,7 @@
         </property>            
   </bean>
     
+  <!-- PageManager -->
   <bean id="PsmlDocumentHandler"      
        class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >         
        <constructor-arg index="0"><value>/META-INF/page-mapping.xml</value></constructor-arg>
@@ -62,15 +61,6 @@
        <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
-  <bean id="DocumentSetDocumentHandler"        
-       class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >         
-       <constructor-arg index="0"><value>/META-INF/page-mapping.xml</value></constructor-arg>
-       <constructor-arg index="1"><value>.ds</value></constructor-arg>
-       <constructor-arg index="2" ><value>org.apache.jetspeed.om.folder.DocumentSet</value></constructor-arg>      
-       <constructor-arg index="3" ><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
-  </bean>
-  
   <bean id="FolderMetaDataDocumentHandler"         
        class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >         
        <constructor-arg index="0"><value>/META-INF/page-mapping.xml</value></constructor-arg>
@@ -99,9 +89,6 @@
           <entry key=".link">
             <ref bean="LinkDocumentHandler" />
           </entry>  
-          <entry key=".ds">
-            <ref bean="DocumentSetDocumentHandler" />
-          </entry>  
           <entry key="folder.metadata">
             <ref bean="FolderMetaDataDocumentHandler" />
           </entry>        
@@ -119,8 +106,6 @@
        <constructor-arg index="2"><ref bean="PageFileCache"/></constructor-arg>        
   </bean>
     
-    
-  <!-- PageManager -->
   <bean id="org.apache.jetspeed.page.PageManager" 
        name="pageManager"
        class="org.apache.jetspeed.page.impl.CastorXmlPageManager">         
@@ -128,14 +113,17 @@
        <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
        <constructor-arg index="2"><ref bean="FolderHandler"/></constructor-arg>
        <constructor-arg index="3"><ref bean="PageFileCache"/></constructor-arg>        
-       <!-- size of profiled page context LRU cache, default=100 -->
-       <constructor-arg index="4"><value>100</value></constructor-arg>
-       <!-- profiling enabled flag, default=true -->
-       <constructor-arg index="5"><value>true</value></constructor-arg>
        <!-- permissions security enabled flag, default=false -->
-       <constructor-arg index="6"><value>false</value></constructor-arg>
+       <constructor-arg index="4"><value>false</value></constructor-arg>
        <!-- constraints security enabled flag, default=true -->
-       <constructor-arg index="7"><value>true</value></constructor-arg>
+       <constructor-arg index="5"><value>true</value></constructor-arg>
+  </bean>
+
+  <!-- PortalSite -->
+  <bean id="org.apache.jetspeed.portalsite.PortalSite" 
+       name="portalSite"
+       class="org.apache.jetspeed.portalsite.impl.PortalSiteImpl">         
+       <constructor-arg index="0"><ref bean="pageManager"/></constructor-arg>
   </bean>
 
 </beans>

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/assembly/pipelines.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/assembly/pipelines.xml?rev=209305&r1=209304&r2=209305&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/assembly/pipelines.xml (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/assembly/pipelines.xml Tue Jul  5 11:58:05 2005
@@ -88,6 +88,9 @@
    	<ref bean="org.apache.jetspeed.profiler.Profiler" />
    </constructor-arg>
    <constructor-arg>
+   	<ref bean="org.apache.jetspeed.portalsite.PortalSite" />
+   </constructor-arg>
+   <constructor-arg>
    	<ref bean="org.apache.jetspeed.page.PageManager" />
    </constructor-arg>
   </bean> 
@@ -193,4 +196,4 @@
   </bean> 
   
   
-</beans>
\ No newline at end of file
+</beans>

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/pages/Administrative/folder.metadata
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/pages/Administrative/folder.metadata?rev=209305&r1=209304&r2=209305&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/pages/Administrative/folder.metadata (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/pages/Administrative/folder.metadata Tue Jul  5 11:58:05 2005
@@ -16,4 +16,10 @@
   <security-constraints>
     <security-constraints-ref>manager</security-constraints-ref>
   </security-constraints>
+
+  <menu name="page-navigations">
+    <separator>Users Admin Pages</separator>
+    <options>/Administrative/user-mgt.psml</options>
+    <options>/Administrative/users-jsf.psml</options>
+  </menu>
 </folder>

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/pages/_user/user/folder.metadata
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/pages/_user/user/folder.metadata?rev=209305&r1=209304&r2=209305&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/pages/_user/user/folder.metadata (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/pages/_user/user/folder.metadata Tue Jul  5 11:58:05 2005
@@ -25,6 +25,17 @@
   <document-order>pages.ds</document-order>
   <document-order>non-java.ds</document-order>
 
+  <menu name="page-navigations">
+    <separator>
+      <text>[USER] Top Pages</text>
+      <metadata name="text" xml:lang="fr">[USER] Page haut</metadata>
+    </separator>
+    <options regexp="true" profile="menu">/top-links/*.*</options>
+    <menu regexp="true" profile="menu" options="/top-links/more/*.*">
+      <title>[USER] More Pages</title>
+    </menu>
+  </menu>
+
   <security-constraints>
     <owner>user</owner>
     <security-constraints-ref>manager</security-constraints-ref>

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/pages/folder.metadata
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/pages/folder.metadata?rev=209305&r1=209304&r2=209305&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/pages/folder.metadata (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/portal/src/webapp/WEB-INF/pages/folder.metadata Tue Jul  5 11:58:05 2005
@@ -9,6 +9,18 @@
   <document-order>apache_portals.link</document-order>
   <document-order>apache.link</document-order>
 
+  <menu name="page-navigations">
+    <separator>
+      <text>Top Pages</text>
+      <metadata name="text" xml:lang="fr">Page haut</metadata>
+    </separator>
+    <options profile="menu">/Administrative</options>
+    <separator>Profiled Pages</separator>
+    <options regexp="true">/p[0-9][0-9][0-9].psml</options>
+    <separator>Non Java Pages</separator>
+    <options>/non-java</options>
+  </menu>
+
   <security-constraints>
     <security-constraints-ref>public-view</security-constraints-ref>
   </security-constraints>

Modified: portals/jetspeed-2/branches/MENUS_BRANCH/src/sql/populate-db-default.sql
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/MENUS_BRANCH/src/sql/populate-db-default.sql?rev=209305&r1=209304&r2=209305&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/src/sql/populate-db-default.sql (original)
+++ portals/jetspeed-2/branches/MENUS_BRANCH/src/sql/populate-db-default.sql Tue Jul  5 11:58:05 2005
@@ -381,9 +381,9 @@
 
 insert into PRINCIPAL_RULE_ASSOC values ( 'guest', 'page', 'j1' );
 insert into PRINCIPAL_RULE_ASSOC values ( 'jetspeed', 'page', 'role-fallback' );
-insert into PRINCIPAL_RULE_ASSOC values ( 'jetspeed', 'docset', 'role-group' );
+insert into PRINCIPAL_RULE_ASSOC values ( 'jetspeed', 'menu', 'role-group' );
 insert into PRINCIPAL_RULE_ASSOC values ( 'user', 'page', 'j1' );
-insert into PRINCIPAL_RULE_ASSOC values ( 'user', 'docset', 'role-group' );
+insert into PRINCIPAL_RULE_ASSOC values ( 'user', 'menu', 'role-group' );
 
 -- test data for db browser
 insert into CLUBS values ('AC Milan', 'Italy', 'Milan', 'San Siro', 85700, 1926, '105x68m', '');



---------------------------------------------------------------------
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