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 [4/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
Modified: portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java Tue Jul 12 23:40:27 2005
@@ -18,6 +18,7 @@
 // Java imports
 import java.io.File;
 import java.io.FileFilter;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
@@ -31,9 +32,13 @@
 import org.apache.jetspeed.idgenerator.IdGenerator;
 import org.apache.jetspeed.idgenerator.JetspeedIdGenerator;
 import org.apache.jetspeed.om.common.GenericMetadata;
-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.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.Document;
 import org.apache.jetspeed.om.page.Fragment;
 import org.apache.jetspeed.om.page.Link;
@@ -67,39 +72,36 @@
      * 
      * @see junit.framework.TestCase#setUp()
      */
-protected void setUp() throws Exception
+    protected void setUp() throws Exception
     {
         super.setUp();
         dirHelper = new DirectoryHelper(new File("target/testdata/pages"));
-        FileFilter noCVS = new FileFilter() {
+        FileFilter noCVSorSVNorBackups = new FileFilter() {
 
             public boolean accept( File pathname )
             {
-                return !pathname.getName().equals("CVS");                
+                return !pathname.getName().equals("CVS") && !pathname.getName().equals(".svn") && !pathname.getName().endsWith("~");
             }
             
         };
-        dirHelper.copyFrom(new File("testdata/pages"), noCVS);
+        dirHelper.copyFrom(new File("testdata/pages"), noCVSorSVNorBackups);
         IdGenerator idGen = new JetspeedIdGenerator(65536,"P-","");
         FileCache cache = new FileCache(10, 12);
         
-        
         DocumentHandler psmlHandler = new CastorFileSystemDocumentHandler("/META-INF/page-mapping.xml", Page.DOCUMENT_TYPE, Page.class, "target/testdata/pages", cache);
         DocumentHandler linkHandler = new CastorFileSystemDocumentHandler("/META-INF/page-mapping.xml", Link.DOCUMENT_TYPE, Link.class, "target/testdata/pages", cache);
         DocumentHandler folderMetaDataHandler = new CastorFileSystemDocumentHandler("/META-INF/page-mapping.xml", FolderMetaData.DOCUMENT_TYPE, FolderMetaData.class, "target/testdata/pages", cache);
-        DocumentHandler documentSetHandler = new CastorFileSystemDocumentHandler("/META-INF/page-mapping.xml", DocumentSet.DOCUMENT_TYPE, DocumentSet.class, "target/testdata/pages", cache);
         DocumentHandler pageSecurityHandler = new CastorFileSystemDocumentHandler("/META-INF/page-mapping.xml", PageSecurity.DOCUMENT_TYPE, PageSecurity.class, "target/testdata/pages", cache);
         
         DocumentHandlerFactory handlerFactory = new DocumentHandlerFactoryImpl();
         handlerFactory.registerDocumentHandler(psmlHandler);
         handlerFactory.registerDocumentHandler(linkHandler);
         handlerFactory.registerDocumentHandler(folderMetaDataHandler);        
-        handlerFactory.registerDocumentHandler(documentSetHandler);        
         handlerFactory.registerDocumentHandler(pageSecurityHandler);        
         
         FolderHandler folderHandler = new FileSystemFolderHandler("target/testdata/pages", handlerFactory, cache);
         
-        pageManager = new CastorXmlPageManager(idGen, handlerFactory, folderHandler, cache, -1, false, false, false);
+        pageManager = new CastorXmlPageManager(idGen, handlerFactory, folderHandler, cache, false, false);
         
         
     }
@@ -266,7 +268,7 @@
         }
         catch (Exception e)
         {
-            String errmsg = "Exception in page registratio: " + e.toString();
+            String errmsg = "Exception in page registration: " + e.toString();
             e.printStackTrace();
             System.err.println(errmsg);
             assertNotNull(errmsg, null);
@@ -306,34 +308,6 @@
         assertTrue(page.getTitle().equals("Updated Title"));
     }
 
-    public void testRemovePage() throws Exception
-    {
-        Page page = pageManager.getPage(this.testId);
-
-        try
-        {
-            pageManager.removePage(page);
-        }
-        catch (Exception e)
-        {
-            String errmsg = "Exception in page remove: " + e.toString();
-            e.printStackTrace();
-            System.err.println(errmsg);
-            assertNotNull(errmsg, null);
-        }
-
-        boolean exceptionFound = false;
-        try
-        {
-            page = pageManager.getPage(this.testId);
-        }
-        catch (PageNotFoundException pnfe)
-        {
-            exceptionFound = true;
-        }
-        assertTrue(exceptionFound);
-    }
-
     public void testFolders() throws Exception
     {
 
@@ -383,14 +357,12 @@
         assertNull(folder3.getAll().exclusiveSubset("Jetspeed2\\.link").get("Jetspeed2.link"));
         assertNull(folder3.getAll().inclusiveSubset("apache\\.link").get("Jetspeed2.link"));
         assertNotNull(folder3.getAll().inclusiveSubset("apache\\.link").get("apache.link"));
-        
-
     }
 
     public void testFolderMetaData() throws Exception
     {
         Folder folder1French = pageManager.getFolder("/folder1");        
-;
+
         assertEquals("Titre francais pour la chemise 1", folder1French.getTitle(Locale.FRENCH));
         assertEquals("Titre francais pour la chemise 1", folder1French.getTitle(Locale.FRANCE));
 
@@ -405,11 +377,19 @@
         
         // Test folder with no metadata assigned
         Folder rootFolder = pageManager.getFolder("/");
-
-        assertEquals("/", rootFolder.getTitle());
         assertEquals(rootFolder.getTitle(), rootFolder.getTitle(Locale.FRENCH));
     }
 
+    public void testDefaultTitles() throws Exception
+    {
+        Page defaultPage = pageManager.getPage("/folder1/folder2/default-page.psml");
+        assertNotNull(defaultPage);
+        assertEquals("Default Page", defaultPage.getTitle());
+
+        Folder rootFolder = pageManager.getFolder("/");
+        assertEquals("Top", rootFolder.getTitle());
+    }
+
     public void testPageMetaData() throws Exception
     {
         Page page = pageManager.getPage("/default-page.psml");
@@ -435,6 +415,179 @@
         assertNotNull(folder.getLinks());
         assertEquals(folder.getLinks().size(), 1);
         assertEquals("http://portals.apache.org", ((Document) folder.getLinks().iterator().next()).getUrl());
-       
+    }
+
+    public void testMenuDefinitions() throws Exception
+    {
+        // test folder resident menu definitions
+        Folder folder = pageManager.getFolder("/");
+        assertNotNull(folder);
+        List menus = folder.getMenuDefinitions();
+        assertNotNull(menus);
+        assertEquals(5, menus.size());
+
+        MenuDefinition simpleMenu = (MenuDefinition)menus.get(0);
+        assertNotNull(simpleMenu);
+        assertEquals("simple", simpleMenu.getName());
+        assertNotNull(simpleMenu.getMenuElements());
+        assertEquals(1, simpleMenu.getMenuElements().size());
+        assertTrue(simpleMenu.getMenuElements().get(0) instanceof MenuOptionsDefinition);
+        assertEquals("/test001.psml,/folder1/folder2", ((MenuOptionsDefinition)simpleMenu.getMenuElements().get(0)).getOptions());
+
+        MenuDefinition top2LevelsMenu = (MenuDefinition)menus.get(1);
+        assertNotNull(top2LevelsMenu);
+        assertEquals("top-2-levels", top2LevelsMenu.getName());
+        assertNull(top2LevelsMenu.getMenuElements());
+        assertEquals("/", top2LevelsMenu.getOptions());
+        assertEquals(2, top2LevelsMenu.getDepth());
+        assertEquals("dhtml-pull-down", top2LevelsMenu.getSkin());
+
+        MenuDefinition topRolePagesMenu = (MenuDefinition)menus.get(2);
+        assertNotNull(topRolePagesMenu);
+        assertEquals("top-role-pages", topRolePagesMenu.getName());
+        assertTrue(topRolePagesMenu.isRegexp());
+        assertEquals("roles", topRolePagesMenu.getProfile());
+        assertEquals("*.psml,*.link", topRolePagesMenu.getOrder());
+
+        MenuDefinition breadCrumbsMenu = (MenuDefinition)menus.get(3);
+        assertNotNull(breadCrumbsMenu);
+        assertEquals("bread-crumbs", breadCrumbsMenu.getName());
+        assertTrue(breadCrumbsMenu.isPaths());
+
+        MenuDefinition topCustomMenu = (MenuDefinition)menus.get(4);
+        assertNotNull(topCustomMenu);
+        assertEquals("top-custom", topCustomMenu.getName());
+        assertEquals("Top Menu", topCustomMenu.getTitle());
+        assertEquals("Top", topCustomMenu.getShortTitle());
+        assertEquals("Haut", topCustomMenu.getTitle(Locale.FRENCH));
+        assertEquals("H", topCustomMenu.getShortTitle(Locale.FRENCH));
+        assertNotNull(topCustomMenu.getMenuElements());
+        assertEquals(5, topCustomMenu.getMenuElements().size());
+        assertTrue(topCustomMenu.getMenuElements().get(0) instanceof MenuOptionsDefinition);
+        assertTrue(((MenuOptionsDefinition)topCustomMenu.getMenuElements().get(0)).isRegexp());
+        assertEquals("groups", ((MenuOptionsDefinition)topCustomMenu.getMenuElements().get(0)).getProfile());
+        assertTrue(topCustomMenu.getMenuElements().get(1) instanceof MenuDefinition);
+        assertTrue(topCustomMenu.getMenuElements().get(2) instanceof MenuExcludeDefinition);
+        assertEquals("top-role-pages", ((MenuExcludeDefinition)topCustomMenu.getMenuElements().get(2)).getName());
+        assertTrue(topCustomMenu.getMenuElements().get(3) instanceof MenuSeparatorDefinition);
+        assertEquals("More Top Pages", ((MenuSeparatorDefinition)topCustomMenu.getMenuElements().get(3)).getText());
+        assertTrue(topCustomMenu.getMenuElements().get(4) instanceof MenuIncludeDefinition);
+        assertEquals("simple", ((MenuIncludeDefinition)topCustomMenu.getMenuElements().get(4)).getName());
+        assertTrue(((MenuIncludeDefinition)topCustomMenu.getMenuElements().get(4)).isNest());
+
+        MenuDefinition topCustomNestedMenu = (MenuDefinition)topCustomMenu.getMenuElements().get(1);
+        assertEquals("/", topCustomNestedMenu.getOptions());
+        assertEquals("page", topCustomNestedMenu.getProfile());
+        assertEquals(5, topCustomNestedMenu.getMenuElements().size());
+        assertTrue(topCustomNestedMenu.getMenuElements().get(0) instanceof MenuSeparatorDefinition);
+        assertEquals("Top Pages", ((MenuSeparatorDefinition)topCustomNestedMenu.getMenuElements().get(0)).getText());
+        assertEquals("Ye Olde Top Pages", ((MenuSeparatorDefinition)topCustomNestedMenu.getMenuElements().get(0)).getText(Locale.ENGLISH));
+        assertEquals("Select from Top Pages menu...", ((MenuSeparatorDefinition)topCustomNestedMenu.getMenuElements().get(0)).getTitle());
+        assertEquals("Haut", ((MenuSeparatorDefinition)topCustomNestedMenu.getMenuElements().get(0)).getTitle(Locale.FRENCH));
+        assertTrue(topCustomNestedMenu.getMenuElements().get(1) instanceof MenuOptionsDefinition);
+        assertTrue(topCustomNestedMenu.getMenuElements().get(2) instanceof MenuSeparatorDefinition);
+        assertEquals("bold", ((MenuSeparatorDefinition)topCustomNestedMenu.getMenuElements().get(2)).getSkin());
+        assertEquals("Custom Pages", ((MenuSeparatorDefinition)topCustomNestedMenu.getMenuElements().get(2)).getTitle());
+        assertTrue(topCustomNestedMenu.getMenuElements().get(3) instanceof MenuOptionsDefinition);
+        assertEquals(1, ((MenuOptionsDefinition)topCustomNestedMenu.getMenuElements().get(3)).getDepth());
+        assertEquals("*.psml", ((MenuOptionsDefinition)topCustomNestedMenu.getMenuElements().get(3)).getOrder());
+        assertTrue(topCustomNestedMenu.getMenuElements().get(4) instanceof MenuOptionsDefinition);
+        assertTrue(((MenuOptionsDefinition)topCustomNestedMenu.getMenuElements().get(4)).isPaths());
+        assertEquals("*", ((MenuOptionsDefinition)topCustomNestedMenu.getMenuElements().get(4)).getProfile());
+        assertEquals("links", ((MenuOptionsDefinition)topCustomNestedMenu.getMenuElements().get(4)).getSkin());
+        assertEquals("@", ((MenuOptionsDefinition)topCustomNestedMenu.getMenuElements().get(4)).getOptions());
+
+        // test page resident menu definitions
+        Page page = pageManager.getPage("/test001.psml");
+        assertNotNull(page);
+        menus = page.getMenuDefinitions();
+        assertNotNull(menus);
+        assertEquals(1, menus.size());
+
+        simpleMenu = (MenuDefinition)menus.get(0);
+        assertNotNull(simpleMenu);
+        assertEquals("simple", simpleMenu.getName());
+        assertNotNull(simpleMenu.getMenuElements());
+        assertEquals(2, simpleMenu.getMenuElements().size());
+
+        // test writing page menu definitions
+        page = pageManager.getPage(this.testId);
+        page.setMenuDefinitions(new ArrayList());
+        MenuDefinition newMenu = pageManager.newMenuDefinition();
+        newMenu.setName("updated-menu");
+        newMenu.setSkin("tabs");
+        newMenu.setMenuElements(new ArrayList());
+        MenuSeparatorDefinition newSeparator = pageManager.newMenuSeparatorDefinition();
+        newSeparator.setText("-- Updated Menu --");
+        newMenu.getMenuElements().add(newSeparator);
+        MenuOptionsDefinition newOptions0 = pageManager.newMenuOptionsDefinition();
+        newOptions0.setOptions("/*.psml");
+        newOptions0.setRegexp(true);
+        newMenu.getMenuElements().add(newOptions0);
+        MenuOptionsDefinition newOptions1 = pageManager.newMenuOptionsDefinition();
+        newOptions1.setOptions("/folder0");
+        newMenu.getMenuElements().add(newOptions1);
+        MenuDefinition newNestedMenu = pageManager.newMenuDefinition();
+        newNestedMenu.setOptions("/*/");
+        newNestedMenu.setRegexp(true);
+        newMenu.getMenuElements().add(newNestedMenu);
+        MenuExcludeDefinition newExcludeMenu = pageManager.newMenuExcludeDefinition();
+        newExcludeMenu.setName("exclude-menu");
+        newMenu.getMenuElements().add(newExcludeMenu);
+        MenuIncludeDefinition newIncludeMenu = pageManager.newMenuIncludeDefinition();
+        newIncludeMenu.setName("include-menu");
+        newIncludeMenu.setNest(true);
+        newMenu.getMenuElements().add(newIncludeMenu);
+        page.getMenuDefinitions().add(newMenu);
+        try
+        {
+            pageManager.updatePage(page);
+        }
+        catch (Exception e)
+        {
+            String errmsg = "Exception in page update: " + e.toString();
+            e.printStackTrace();
+            System.err.println(errmsg);
+            assertNotNull(errmsg, null);
+        }
+        page = pageManager.getPage(this.testId);
+        assertNotNull(page.getMenuDefinitions());
+        assertEquals(1, page.getMenuDefinitions().size());
+        assertNotNull(((MenuDefinition)page.getMenuDefinitions().get(0)).getMenuElements());
+        assertEquals(6,((MenuDefinition)page.getMenuDefinitions().get(0)).getMenuElements().size());
+        assertTrue(((MenuDefinition)page.getMenuDefinitions().get(0)).getMenuElements().get(0) instanceof MenuSeparatorDefinition);
+        assertTrue(((MenuDefinition)page.getMenuDefinitions().get(0)).getMenuElements().get(1) instanceof MenuOptionsDefinition);
+        assertTrue(((MenuDefinition)page.getMenuDefinitions().get(0)).getMenuElements().get(2) instanceof MenuOptionsDefinition);
+        assertTrue(((MenuDefinition)page.getMenuDefinitions().get(0)).getMenuElements().get(3) instanceof MenuDefinition);
+        assertTrue(((MenuDefinition)page.getMenuDefinitions().get(0)).getMenuElements().get(4) instanceof MenuExcludeDefinition);
+        assertTrue(((MenuDefinition)page.getMenuDefinitions().get(0)).getMenuElements().get(5) instanceof MenuIncludeDefinition);
+    }
+
+    public void testRemovePage() throws Exception
+    {
+        Page page = pageManager.getPage(this.testId);
+
+        try
+        {
+            pageManager.removePage(page);
+        }
+        catch (Exception e)
+        {
+            String errmsg = "Exception in page remove: " + e.toString();
+            e.printStackTrace();
+            System.err.println(errmsg);
+            assertNotNull(errmsg, null);
+        }
+
+        boolean exceptionFound = false;
+        try
+        {
+            page = pageManager.getPage(this.testId);
+        }
+        catch (PageNotFoundException pnfe)
+        {
+            exceptionFound = true;
+        }
+        assertTrue(exceptionFound);
     }
 }

Modified: portals/jetspeed-2/trunk/components/page-manager/testdata/pages/folder1/folder2/default-page.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/testdata/pages/folder1/folder2/default-page.psml?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/components/page-manager/testdata/pages/test001.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/testdata/pages/test001.psml?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
Binary files - no diff available.

Propchange: portals/jetspeed-2/trunk/components/portal-site/locator.ent
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/jetspeed-2/trunk/components/portal-site/maven.xml (from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/maven.xml)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal-site/maven.xml?p2=portals/jetspeed-2/trunk/components/portal-site/maven.xml&p1=portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/maven.xml&r1=216085&r2=216120&rev=216120&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/portal-site/maven.xml Tue Jul 12 23:40:27 2005
@@ -1,28 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-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
-
+    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.
+    
+    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.
 -->
-
-<project default="java:jar"
-         xmlns:j="jelly:core" 
-         xmlns:define="jelly:define">
-
-  <goal name="deployJar">
-    <property name='maven.test.skip' value='true'/> 
-    <attainGoal name="jar:install"/>
-    <copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
-  </goal>
+<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define">
 
   <preGoal name="test:test">
     <copy todir="target/testdata">

Propchange: portals/jetspeed-2/trunk/components/portal-site/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/jetspeed-2/trunk/components/portal-site/project.properties (from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/project.properties)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal-site/project.properties?p2=portals/jetspeed-2/trunk/components/portal-site/project.properties&p1=portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/project.properties&r1=216085&r2=216120&rev=216120&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/project.properties (original)
+++ portals/jetspeed-2/trunk/components/portal-site/project.properties Tue Jul 12 23:40:27 2005
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# $Id: project.properties,v 1.4 2004/07/11 03:23:45 paulsp Exp $
+# $Id$
 #
 
 maven.multiproject.type=jar

Propchange: portals/jetspeed-2/trunk/components/portal-site/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/project.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Copied: portals/jetspeed-2/trunk/components/portal-site/project.xml (from r216085, portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/project.xml)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal-site/project.xml?p2=portals/jetspeed-2/trunk/components/portal-site/project.xml&p1=portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/project.xml&r1=216085&r2=216120&rev=216120&view=diff
==============================================================================
--- portals/jetspeed-2/branches/MENUS_BRANCH/components/portal-site/project.xml (original)
+++ portals/jetspeed-2/trunk/components/portal-site/project.xml Tue Jul 12 23:40:27 2005
@@ -2,252 +2,274 @@
 <!DOCTYPE project [
   <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
 ]>
-
 <!--
-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.
--->
-
-<project>
-  <extend>${basedir}/../../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <id>jetspeed-portal-site</id>
-  <groupId>jetspeed2</groupId>
-  <name>Jetspeed-2 Portal Site</name>
-  
-  <package>org.apache.jetspeed</package>
-  <description>
-      Portal Site implementation.
-  </description>
-
-  <repository>                 
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-jetspeed-2/components/registry</connection>
-    <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/registry/</url>
-  </repository>
-
-  <shortDescription>Portal Site</shortDescription>
-  <dependencies>
-  
-    &spring-deps;
+    Copyright 2005 The Apache Software Foundation
     
-    &db-ojb-deps;
+    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
     
-    &commons-config-dep;
+    http://www.apache.org/licenses/LICENSE-2.0
     
-  	<dependency>
-      <id>jetspeed-cm</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>  	
-    <dependency>
-      <id>jetspeed2:jetspeed-commons</id>
-      <version>&jetspeed-version;</version>
-    </dependency>
-    <dependency>
-      <id>jetspeed2:jetspeed-api</id>
-      <version>&jetspeed-version;</version>
-    </dependency>
-    <dependency>
-      <id>jetspeed2:jetspeed-persistence</id>
-      <version>&jetspeed-version;</version>
-    </dependency>
-    <dependency>
-      <id>jetspeed2:jetspeed-registry</id>
-      <version>&jetspeed-version;</version>
-    </dependency>      
-    <dependency>
-      <id>jetspeed2:jetspeed-file-cache</id>
-      <version>&jetspeed-version;</version>
-    </dependency>
-    <dependency>
-      <id>jetspeed2:jetspeed-id-generator</id>
-      <version>&jetspeed-version;</version>
-    </dependency>       
-    <dependency>
-      <id>jetspeed2:jetspeed-security</id>
-      <version>&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>
-    <dependency>
-      <id>jetspeed2:jetspeed-page-manager</id>
-      <version>&jetspeed-version;</version>
-    </dependency>
-
-    <!-- Testing only -->
-    <dependency>
-      <id>jetspeed2:jetspeed-rdbms</id>
-      <version>&jetspeed-version;</version>
-    </dependency>       
-     <dependency>
-      <id>commons-lang</id>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <id>commons-logging</id>
-      <version>1.0.3</version>
-    </dependency>
-    <dependency>
-      <id>commons-beanutils</id>
-      <version>1.6.1</version>
-    </dependency>
-    <dependency>
-      <id>commons-configuration</id>
-      <version>1.0-dev</version>
-    </dependency>
-    <dependency>
-      <id>junit</id>
-      <version>3.8.1</version>
-    </dependency>
-    <dependency>
-      <id>log4j</id>
-      <version>1.2.6</version>
-    </dependency>   
-    <dependency>
-      <id>commons-collections</id>
-      <version>3.0</version>
-    </dependency>
-    <dependency>
-      <id>commons-io</id>
-      <version>0.1</version>
-    </dependency>
-    <dependency>
-      <id>xerces</id>
-      <version>2.3.0</version>
-    </dependency>
-    <dependency>
-      <id>xml-apis</id>
-      <version>2.0.2</version>
-    </dependency>
-    <dependency>
-      <id>tyrex</id>
-      <version>1.0.1</version>
-    </dependency>
-    <dependency>
-      <id>jta</id>
-      <jar>jta1.0.1.jar</jar>
-    </dependency>
+    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.
     
-    <dependency>
-      <id>commons-pool</id>
-      <version>1.2</version>
-    </dependency>
-    <dependency>
-      <id>commons-dbcp</id>
-      <version>1.2.1</version>
-    </dependency>
-    <dependency>
-      <id>castor</id>
-      <version>0.9.4.3</version>
-    </dependency>
-    <dependency>
-      <id>xerces</id>
-      <version>2.3.0</version>
-    </dependency>
-    <dependency>
-      <id>xml-apis</id>
-      <version>2.0.2</version>
-    </dependency>
-    <dependency>
-      <id>saxpath</id>
-      <version>1.0-FCS</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jaxen</id>
-      <version>1.0-FCS-full</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jdom</id>
-      <version>1.0</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <!-- This is only a test dependency -->
-    <dependency>
-      <id>hsqldb</id>
-      <version>1.7.1</version>
-    </dependency>
-      
-      &pluto-deps;
-      
-    <dependency>
-      <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
-      <id>portlet-api</id>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <id>servletapi</id>
-      <version>2.3</version>
-    </dependency>
-  </dependencies>
+    $Id:$
+-->
+<project>
+    <extend>${basedir}/../../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <artifactId>jetspeed-portal-site</artifactId>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 Portal Site</name>
 
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    
-    <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-    <unitTest>
-      <resources>
-        <resource>
-          <directory>${basedir}/src/test</directory>
-          <excludes>
-           <exclude>**/*.java</exclude>
-          </excludes>
-        </resource>
-        <resource>
-          <directory>${basedir}/src/java</directory>
-          <excludes>
-           <exclude>**/*.java</exclude>
-           <exclude>**/META-INF/**</exclude>
-          </excludes>
-        </resource>
-        
-        &db-ojb-resources;
-        
-        &log4j-resources;
-        
-      </resources>
-    </unitTest>
-    
-    <resources>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-  </build>
+    <package>org.apache.jetspeed</package>
+    <description>Portal Site component implementation.</description>
 
-  <reports>
-    
-    &j2-reports;
-    
-  </reports>  
+    <repository>
+        <connection>
+            scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/portal-site
+        </connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/portal-site
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/portal-site/</url>
+    </repository>
+
+    <shortDescription>Portal Site</shortDescription>
+    <dependencies>
+
+        &spring-deps;
+
+        &commons-config-dep;
+
+        <dependency>
+            <id>jetspeed2:jetspeed-commons</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-api</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+
+        <!-- Testing only -->
+
+        &db-ojb-deps;
+
+        <dependency>
+            <id>jetspeed-cm</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-page-manager</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-locator</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-persistence</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-registry</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-file-cache</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-id-generator</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-security</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-rdbms</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>commons-lang</id>
+            <version>2.0</version>
+        </dependency>
+        <dependency>
+            <id>commons-logging</id>
+            <version>1.0.3</version>
+        </dependency>
+        <dependency>
+            <id>commons-beanutils</id>
+            <version>1.6.1</version>
+        </dependency>
+        <dependency>
+            <id>commons-configuration</id>
+            <version>1.0-dev</version>
+        </dependency>
+        <dependency>
+            <id>junit</id>
+            <version>3.8.1</version>
+        </dependency>
+        <dependency>
+            <id>log4j</id>
+            <version>1.2.6</version>
+        </dependency>
+        <dependency>
+            <id>commons-collections</id>
+            <version>3.0</version>
+        </dependency>
+        <dependency>
+            <id>commons-io</id>
+            <version>0.1</version>
+        </dependency>
+        <dependency>
+            <id>xerces</id>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <id>xml-apis</id>
+            <version>2.0.2</version>
+        </dependency>
+        <dependency>
+            <id>tyrex</id>
+            <version>1.0.1</version>
+        </dependency>
+        <dependency>
+            <id>jta</id>
+            <jar>jta1.0.1.jar</jar>
+        </dependency>
+
+        <dependency>
+            <id>commons-pool</id>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <id>commons-dbcp</id>
+            <version>1.2.1</version>
+        </dependency>
+        <dependency>
+            <id>castor</id>
+            <version>0.9.4.3</version>
+        </dependency>
+        <dependency>
+            <id>xerces</id>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <id>xml-apis</id>
+            <version>2.0.2</version>
+        </dependency>
+        <dependency>
+            <id>saxpath</id>
+            <version>1.0-FCS</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>jaxen</id>
+            <version>1.0-FCS-full</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>jdom</id>
+            <version>1.0</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <!-- This is only a test dependency -->
+        <dependency>
+            <id>hsqldb</id>
+            <version>1.7.1</version>
+        </dependency>
+
+        &pluto-deps;
+
+        <dependency>
+            <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
+            <id>portlet-api</id>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <id>servletapi</id>
+            <version>2.3</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+
+
+        <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+        <unitTest>
+            <resources>
+                <resource>
+                    <directory>${basedir}/src/test</directory>
+                    <excludes>
+                        <exclude>**/*.java</exclude>
+                    </excludes>
+                </resource>
+                <resource>
+                    <directory>${basedir}/src/java</directory>
+                    <excludes>
+                        <exclude>**/*.java</exclude>
+                        <exclude>**/META-INF/**</exclude>
+                    </excludes>
+                </resource>
+
+                &db-ojb-resources;
+
+                &log4j-resources;
+
+            </resources>
+        </unitTest>
+
+        <resources>
+            <resource>
+                <directory>${basedir}/src/java</directory>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
+    </build>
+    <reports>
+
+        &j2-reports;
+
+    </reports>
 </project>

Propchange: portals/jetspeed-2/trunk/components/portal-site/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuDefinitionImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuDefinitionImpl.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuExcludeDefinitionImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuExcludeDefinitionImpl.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuIncludeDefinitionImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuIncludeDefinitionImpl.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuOptionsDefinitionImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuOptionsDefinitionImpl.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuSeparatorDefinitionImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuSeparatorDefinitionImpl.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/LinkProxy.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/LinkProxy.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/PageProxy.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/PageProxy.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/page/document/proxy/NodeProxy.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/page/document/proxy/NodeProxy.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/page/document/proxy/NodeSetImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/page/document/proxy/NodeSetImpl.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuElementImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuElementImpl.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuOptionImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuOptionImpl.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuSeparatorImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuSeparatorImpl.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteImpl.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/DefaultMenuDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/DefaultMenuDefinition.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/DefaultMenuOptionsDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/DefaultMenuOptionsDefinition.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBackMenuDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBackMenuDefinition.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBreadcrumbsMenuDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBreadcrumbsMenuDefinition.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardNavigationsMenuDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardNavigationsMenuDefinition.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardPagesMenuDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardPagesMenuDefinition.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_de.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_en.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_it.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ko.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_nl.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_pt.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_zh.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_de.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_en.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_it.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ko.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_nl.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_pt.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_zh.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewMenuDefinitionLocator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewMenuDefinitionLocator.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewProxy.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewProxy.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewSearchPath.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewSearchPath.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/test/META-INF/test-spring.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/test/org/apache/jetspeed/portalsite/TestPortalSite.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/portal-site/src/test/org/apache/jetspeed/portalsite/TestPortalSite.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/trunk/components/portal-site/xdocs/navigation.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/components/portal/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/project.xml?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/project.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/project.xml Tue Jul 12 23:40:27 2005
@@ -159,6 +159,12 @@
             </version>
         </dependency>
         <dependency>
+            <id>jetspeed2:jetspeed-portal-site</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
             <id>jetspeed2:jetspeed-portlet-factory</id>
             <version>
                 &jetspeed-version;

Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java Tue Jul 12 23:40:27 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/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfiler.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfiler.java?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfiler.java (original)
+++ portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfiler.java Tue Jul 12 23:40:27 2005
@@ -31,7 +31,6 @@
 import org.apache.jetspeed.components.persistence.store.PersistenceStore;
 import org.apache.jetspeed.components.persistence.store.Transaction;
 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;
@@ -56,8 +55,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 */
@@ -112,10 +109,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);
@@ -298,26 +291,6 @@
         catch (Exception e)
         {
             log.error("Failed to create locator for " + locatorClass);
-        }
-        return null;
-    }
-
-    /*
-     * (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;
     }

Modified: portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java (original)
+++ portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java Tue Jul 12 23:40:27 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/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/GenericMetadataImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/GenericMetadataImpl.java?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/GenericMetadataImpl.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/GenericMetadataImpl.java Tue Jul 12 23:40:27 2005
@@ -117,7 +117,8 @@
     public void setFields(Collection fields)
     {
         this.fields = fields;
-        
+        fieldMap.clear();
+
         if(fields != null)
         {    
             Iterator fieldIter = fields.iterator();

Propchange: portals/jetspeed-2/trunk/design-docs/src/portal-site/portal-site-component-figure-1.jpeg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: portals/jetspeed-2/trunk/design-docs/src/portal-site/portal-site-component.html
------------------------------------------------------------------------------
    svn:eol-style = native

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

Modified: portals/jetspeed-2/trunk/etc/project-dependencies/portal-webapp-deps.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/project-dependencies/portal-webapp-deps.xml?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/project-dependencies/portal-webapp-deps.xml (original)
+++ portals/jetspeed-2/trunk/etc/project-dependencies/portal-webapp-deps.xml Tue Jul 12 23:40:27 2005
@@ -172,6 +172,15 @@
         </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;
@@ -486,4 +495,4 @@
         <type>plugin</type>
         <properties />
     </dependency>
-</dependencies>
\ No newline at end of file
+</dependencies>

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/Folder.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/Folder.java?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/Folder.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/Folder.java Tue Jul 12 23:40:27 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,62 @@
      * @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);
+    
+    /**
+     * Determines if a folder is a reserved folder.
+     * Reserved folders are special folders that can
+     * hold subsites, the root of user folders, and the
+     * root of role folders.
+     * @return
+     */
+    boolean isReserved();
+    
+    /**
+     * Returns a valid reserved folder type:
+     *  RESERVED_FOLDER_SUBSITES
+     *  RESERVED_FOLDER_USERS
+     *  RESERVED_FOLDER_ROLES
+     *  RESERVED_FOLDER_GROUPS
+     *  RESERVED_FOLDER_MEDIATYPE
+     *  RESERVED_FOLDER_LANGUAGE
+     *  RESERVED_FOLDER_COUNTRY
+     *  
+     * @return one of the valid reserved folder types
+     */
+    int getReservedType();
+
+    int RESERVED_FOLDER_NONE = 0;    
+    int RESERVED_FOLDER_SUBSITES = 1;
+    int RESERVED_FOLDER_USERS = 2;
+    int RESERVED_FOLDER_ROLES = 3;
+    int RESERVED_FOLDER_GROUPS = 4;
+    int RESERVED_FOLDER_MEDIATYPE = 5;
+    int RESERVED_FOLDER_LANGUAGE = 6;
+    int RESERVED_FOLDER_COUNTRY = 7;
+    int RESERVED_FOLDER_OTHER = 9999;
+    
 }

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/FolderMetaData.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/FolderMetaData.java?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/FolderMetaData.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/FolderMetaData.java Tue Jul 12 23:40:27 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);    
 }

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

Propchange: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuDefinition.java
------------------------------------------------------------------------------
    svn:keywords = Id

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

Propchange: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuExcludeDefinition.java
------------------------------------------------------------------------------
    svn:keywords = Id

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

Propchange: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuIncludeDefinition.java
------------------------------------------------------------------------------
    svn:keywords = Id

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

Propchange: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuOptionsDefinition.java
------------------------------------------------------------------------------
    svn:keywords = Id

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

Propchange: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/MenuSeparatorDefinition.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/page/Page.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/page/Page.java?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/page/Page.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/page/Page.java Tue Jul 12 23:40:27 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/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/PageManager.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/PageManager.java?rev=216120&r1=216119&r2=216120&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/PageManager.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/PageManager.java Tue Jul 12 23:40:27 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,17 @@
      */
     public void removePage(Page page) throws JetspeedException, PageNotRemovedException;
 
-}
\ No newline at end of file
+    /**
+     * addListener - add page manager event listener
+     *
+     * @param listener page manager event listener
+     */
+    public void addListener(PageManagerEventListener listener);
+
+    /**
+     * removeListener - remove page manager event listener
+     *
+     * @param listener page manager event listener
+     */
+    public void removeListener(PageManagerEventListener listener);
+}

Propchange: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/PageManagerEventListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/PageManagerEventListener.java
------------------------------------------------------------------------------
    svn:keywords = Id

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

Propchange: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/portalsite/Menu.java
------------------------------------------------------------------------------
    svn:keywords = Id

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

Propchange: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuElement.java
------------------------------------------------------------------------------
    svn:keywords = Id

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

Propchange: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/portalsite/MenuOption.java
------------------------------------------------------------------------------
    svn:keywords = Id



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