Author: woonsan
Date: Fri Mar 19 16:22:05 2010
New Revision: 925307
URL: http://svn.apache.org/viewvc?rev=925307&view=rev
Log:
JS2-1131: Configure space folders to be hidden to not display in the root space
menus.
Also, applying the same space menu/links configuration for all spaces.
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/new-user/folder.metadata
Removed:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_user/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/_user/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/folder.metadata
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_template/dev/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_template/new-user/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_template/space/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_user/devmgr/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/Administrative/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/Security/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/_template/new-user/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/_template/space/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/_user/admin/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Public/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/dev/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/space/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/user/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/Administrative/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_template/dev/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_template/new-user/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_template/space/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/admin/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/bill/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/debbie/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/manny/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/martha/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/development/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/finance/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/marketing/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/security/folder.metadata
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/spaces/SpacesServiceImpl.java
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<folder
+<folder hidden="true"
xmlns="http://portals.apache.org/jetspeed";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_template/dev/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_template/dev/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_template/dev/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_template/dev/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -25,4 +25,8 @@ limitations under the License.
<security-constraints>
<security-constraints-ref>delegated</security-constraints-ref>
</security-constraints>
+
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
+
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_template/new-user/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_template/new-user/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_template/new-user/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_template/new-user/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -21,5 +21,8 @@ limitations under the License.
<document-order>default-page.psml</document-order>
<document-order>account.psml</document-order>
-
+
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
+
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_template/space/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_template/space/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_template/space/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_template/space/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -18,7 +18,7 @@ limitations under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
- <menu name="space-navigations" regexp="true" options="/@1/*/,/@1/*.psml"
depth="-1"/>
- <menu name="space-links" regexp="true" options="/@1/*.link"/>
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_user/devmgr/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_user/devmgr/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_user/devmgr/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/_user/devmgr/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -25,5 +25,8 @@ limitations under the License.
<security-constraints>
<owner>devmgr</owner>
</security-constraints>
-
+
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
+
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/Administrative/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/Administrative/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/Administrative/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/Administrative/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<folder
+<folder hidden="true"
xmlns="http://portals.apache.org/jetspeed";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
@@ -35,4 +35,8 @@ limitations under the License.
<security-constraints>
<security-constraints-ref>admin</security-constraints-ref>
</security-constraints>
+
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
+
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/Security/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/Security/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/Security/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/Security/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<folder
+<folder hidden="true"
xmlns="http://portals.apache.org/jetspeed";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
@@ -29,4 +29,8 @@ limitations under the License.
<security-constraints>
<security-constraints-ref>admin</security-constraints-ref>
</security-constraints>
+
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
+
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/_template/new-user/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/_template/new-user/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/_template/new-user/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/_template/new-user/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -21,5 +21,8 @@ limitations under the License.
<document-order>default-page.psml</document-order>
<document-order>account.psml</document-order>
-
+
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
+
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/_template/space/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/_template/space/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/_template/space/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/_template/space/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -18,7 +18,7 @@ limitations under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
- <menu name="space-navigations" regexp="true" options="/@1/*/,/@1/*.psml"
depth="-1"/>
- <menu name="space-links" regexp="true" options="/@1/*.link"/>
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/_user/admin/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/_user/admin/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/_user/admin/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/_user/admin/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -27,5 +27,8 @@ limitations under the License.
<owner>admin</owner>
<security-constraints-ref>admin</security-constraints-ref>
</security-constraints>
-
+
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
+
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -27,4 +27,8 @@ limitations under the License.
<security-constraints>
<security-constraints-ref>public-view</security-constraints-ref>
</security-constraints>
+
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
+
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<folder
+<folder hidden="true"
xmlns="http://portals.apache.org/jetspeed";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Public/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Public/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Public/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Public/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<folder
+<folder hidden="true"
xmlns="http://portals.apache.org/jetspeed";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/dev/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/dev/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/dev/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/dev/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -22,4 +22,8 @@ limitations under the License.
<security-constraints>
<security-constraints-ref>delegated</security-constraints-ref>
</security-constraints>
+
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
+
</folder>
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/new-user/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/new-user/folder.metadata?rev=925307&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/new-user/folder.metadata
(added)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/new-user/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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.
+-->
+<folder
+ xmlns="http://portals.apache.org/jetspeed";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
+ <title>My Pages</title>
+
+ <document-order>default-page.psml</document-order>
+ <document-order>min.psml</document-order>
+
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
+
+</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/space/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/space/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/space/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_template/space/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -18,7 +18,7 @@ limitations under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
- <menu name="space-navigations" regexp="true" options="/@1/*/,/@1/*.psml"
depth="-1"/>
- <menu name="space-links" regexp="true" options="/@1/*.link"/>
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/user/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/user/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/user/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/user/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -88,7 +88,10 @@ limitations under the License.
</separator>
<options>/non-java</options>
</menu>
-
+
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
+
<security-constraints>
<owner>user</owner>
<security-constraints-ref>manager</security-constraints-ref>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/Administrative/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/Administrative/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/Administrative/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/Administrative/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<folder
+<folder hidden="true"
xmlns="http://portals.apache.org/jetspeed";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
@@ -37,7 +37,7 @@ limitations under the License.
<security-constraints-ref>admin</security-constraints-ref>
</security-constraints>
- <menu name="space-navigations" regexp="true" options="/@1/*/,/@1/*.psml"
depth="-1"/>
- <menu name="space-links" regexp="true" options="/@1/*.link"/>
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_template/dev/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_template/dev/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_template/dev/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_template/dev/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -21,5 +21,8 @@ limitations under the License.
<document-order>default-page.psml</document-order>
<document-order>account.psml</document-order>
-
+
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
+
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_template/new-user/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_template/new-user/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_template/new-user/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_template/new-user/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -21,5 +21,8 @@ limitations under the License.
<document-order>default-page.psml</document-order>
<document-order>account.psml</document-order>
-
+
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
+
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_template/space/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_template/space/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_template/space/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_template/space/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -18,7 +18,7 @@ limitations under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
- <menu name="space-navigations" regexp="true" options="/@1/*/,/@1/*.psml"
depth="-1"/>
- <menu name="space-links" regexp="true" options="/@1/*.link"/>
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/admin/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/admin/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/admin/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/admin/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -27,5 +27,8 @@ limitations under the License.
<owner>admin</owner>
<security-constraints-ref>admin</security-constraints-ref>
</security-constraints>
-
+
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
+
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/bill/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/bill/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/bill/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/bill/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -27,5 +27,8 @@ limitations under the License.
<owner>bill</owner>
<security-constraints-ref>admin</security-constraints-ref>
</security-constraints>
-
+
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
+
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/debbie/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/debbie/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/debbie/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/debbie/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -27,5 +27,8 @@ limitations under the License.
<owner>debbie</owner>
<security-constraints-ref>admin</security-constraints-ref>
</security-constraints>
-
+
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
+
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/manny/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/manny/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/manny/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/manny/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -27,5 +27,8 @@ limitations under the License.
<owner>manny</owner>
<security-constraints-ref>admin</security-constraints-ref>
</security-constraints>
-
+
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
+
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/martha/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/martha/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/martha/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/_user/martha/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -27,5 +27,8 @@ limitations under the License.
<owner>martha</owner>
<security-constraints-ref>admin</security-constraints-ref>
</security-constraints>
-
+
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
+
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/development/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/development/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/development/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/development/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<folder
+<folder hidden="true"
xmlns="http://portals.apache.org/jetspeed";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
@@ -23,6 +23,6 @@ limitations under the License.
<security-constraints>
<security-constraints-ref>dev</security-constraints-ref>
</security-constraints>
- <menu name="space-navigations" regexp="true" options="/@1/*/,/@1/*.psml"
depth="-1"/>
- <menu name="space-links" regexp="true" options="/@1/*.link"/>
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/finance/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/finance/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/finance/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/finance/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<folder
+<folder hidden="true"
xmlns="http://portals.apache.org/jetspeed";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
@@ -23,6 +23,6 @@ limitations under the License.
<security-constraints>
<security-constraints-ref>finance</security-constraints-ref>
</security-constraints>
- <menu name="space-navigations" regexp="true" options="/@1/*/,/@1/*.psml"
depth="-1"/>
- <menu name="space-links" regexp="true" options="/@1/*.link"/>
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -34,7 +34,7 @@ limitations under the License.
<security-constraints-ref>public-view</security-constraints-ref>
</security-constraints>
- <menu name="space-navigations" regexp="true" options="/*/,/*.psml"
depth="-1"/>
- <menu name="space-links" regexp="true" options="/*.link"/>
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/marketing/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/marketing/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/marketing/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/marketing/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<folder
+<folder hidden="true"
xmlns="http://portals.apache.org/jetspeed";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
@@ -23,6 +23,6 @@ limitations under the License.
<security-constraints>
<security-constraints-ref>marketing</security-constraints-ref>
</security-constraints>
- <menu name="space-navigations" regexp="true" options="/@1/*/,/@1/*.psml"
depth="-1"/>
- <menu name="space-links" regexp="true" options="/@1/*.link"/>
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/security/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/security/folder.metadata?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/security/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/security/folder.metadata
Fri Mar 19 16:22:05 2010
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<folder
+<folder hidden="true"
xmlns="http://portals.apache.org/jetspeed";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
@@ -30,6 +30,6 @@ limitations under the License.
<security-constraints>
<security-constraints-ref>admin</security-constraints-ref>
</security-constraints>
- <menu name="space-navigations" regexp="true" options="/@1/*/,/@1/*.psml"
depth="-1"/>
- <menu name="space-links" regexp="true" options="/@1/*.link"/>
+ <menu name="space-navigations" regexp="true" options="+/*/,+/*.psml"
depth="-1"/>
+ <menu name="space-links" regexp="true" options="+/*.link"/>
</folder>
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/spaces/SpacesServiceImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/spaces/SpacesServiceImpl.java?rev=925307&r1=925306&r2=925307&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/spaces/SpacesServiceImpl.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/spaces/SpacesServiceImpl.java
Fri Mar 19 16:22:05 2010
@@ -152,8 +152,9 @@ public class SpacesServiceImpl implement
for (int ix = 0; spaces.hasNext(); ix++)
{
Folder folder = spaces.next();
- if (folder.isHidden() || folder.isReserved())
+ if (folder.isReserved())
continue;
+
Space space = loadSpace(folder);
// Exclude ordinary folders
if (space.getOwner() != null)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
