taylor 2004/10/20 19:29:19
Modified: portal/src/webapp/WEB-INF/pages/_user/user Google.link
top-pages.ds
portal/src/webapp/WEB-INF/pages non-java.ds pages.ds
top-pages.ds
portal/src/webapp/WEB-INF/pages/Administrative user-admin.ds
Added: portal/src/webapp/WEB-INF/pages/_user/user
apache_portals.link
portal/src/webapp/WEB-INF/pages/_role/user/top-links
top-page.psml
Log:
Added a test page and link to test Randy's latest features in navigation location
Revision Changes Path
1.2 +1 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/Google.link
Index: Google.link
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/Google.link,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Google.link 17 Sep 2004 20:06:26 -0000 1.1
+++ Google.link 21 Oct 2004 02:29:19 -0000 1.2
@@ -1,4 +1,4 @@
<link target="top">
- <title>Google Web Search</title>
+ <title>[USER] Google Web Search</title>
<url>http://www.google.com</url>
</link>
1.2 +1 -2
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/top-pages.ds
Index: top-pages.ds
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/top-pages.ds,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- top-pages.ds 15 Oct 2004 07:00:18 -0000 1.1
+++ top-pages.ds 21 Oct 2004 02:29:19 -0000 1.2
@@ -2,7 +2,6 @@
<documentSet>
<title>[USER] Top Pages</title>
<metadata name="title" xml:lang="fr">[USER] Page haut</metadata>
- <name>top_pages</name>
<profileLocator>docset</profileLocator>
- <documentPath regexp="true">/top-links/*.link</documentPath>
+ <documentPath regexp="true">/top-links/*.*</documentPath>
</documentSet>
1.1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/apache_portals.link
Index: apache_portals.link
===================================================================
<link>
<title>[USER] Apache Portals Website</title>
<url>http://portals.apache.org</url>
<metadata name="title" xml:lang="ja">
[USER] Apache Portals ウェブサイト
</metadata>
</link>
1.1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml
Index: top-page.psml
===================================================================
<!--
Copyright 2004 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.
-->
<page>
<defaults layout-decorator="jetspeed" portlet-decorator="jetspeed"/>
<title>[USER] Top Page</title>
<fragment id="utp-1" type="layout" name="jetspeed::VelocityTwoColumns">
<fragment id="utp-2" type="portlet" name="security::LoginPortlet">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
</fragment>
<fragment id="utp-3" type="portlet" name="HW_App::UserInfoTest">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="1" />
</fragment>
</fragment>
</page>
1.2 +0 -1 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/non-java.ds
Index: non-java.ds
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/non-java.ds,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- non-java.ds 15 Oct 2004 07:00:18 -0000 1.1
+++ non-java.ds 21 Oct 2004 02:29:19 -0000 1.2
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<documentSet>
<title>Non Java Pages</title>
- <name>non-java</name>
</documentSet>
1.2 +0 -1 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/pages.ds
Index: pages.ds
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/pages.ds,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pages.ds 15 Oct 2004 07:00:18 -0000 1.1
+++ pages.ds 21 Oct 2004 02:29:19 -0000 1.2
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<documentSet>
<title>Profiled Pages</title>
- <name>pages</name>
<profileLocator>page</profileLocator>
<documentPath regexp="true">/p[0-9][0-9][0-9].psml</documentPath>
</documentSet>
1.2 +0 -1 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/top-pages.ds
Index: top-pages.ds
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/top-pages.ds,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- top-pages.ds 15 Oct 2004 07:00:18 -0000 1.1
+++ top-pages.ds 21 Oct 2004 02:29:19 -0000 1.2
@@ -2,7 +2,6 @@
<documentSet>
<title>Top Pages</title>
<metadata name="title" xml:lang="fr">Page haut</metadata>
- <name>top_pages</name>
<profileLocator>docset</profileLocator>
<documentPath>/Administrative</documentPath>
</documentSet>
1.4 +0 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/user-admin.ds
Index: user-admin.ds
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/user-admin.ds,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- user-admin.ds 15 Oct 2004 21:47:13 -0000 1.3
+++ user-admin.ds 21 Oct 2004 02:29:19 -0000 1.4
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<documentSet>
<title>Users Admin Pages</title>
- <name>user-admin</name>
<documentPath>/Administrative/user-mgt.psml</documentPath>
<documentPath>/Administrative/users-jsf.psml</documentPath>
</documentSet>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
