taylor 2004/09/06 20:57:06
Modified: portal/src/webapp/WEB-INF/pages/Administrative user-mgt.psml
pam.psml
portal/src/webapp/WEB-INF/pages/non-java php-portlet.psml
perl-portlet.psml
portal/src/webapp/WEB-INF/pages localeselector.psml
default-page.psml p002.psml p001.psml
struts-demo.psml testsuite.psml
portal/src/webapp/WEB-INF/pages/third-party Google.psml
RssPortlet.psml
Log:
gave unique ids to all page top level fragments to properly handle mode changes on
pages
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.2 +1 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/user-mgt.psml
Index: user-mgt.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/user-mgt.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- user-mgt.psml 18 Aug 2004 14:02:47 -0000 1.1
+++ user-mgt.psml 7 Sep 2004 03:57:05 -0000 1.2
@@ -1,2 +1,2 @@
<!--
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 id="pam">
<defaults
skin="orange"
layout-decorator="jetspeed"
portlet-decorator="jetspeed"
/>
<title>User Management</title>
<fragment id="2" type="layout" name="jetspeed::VelocityTwoColumns">
<fragment id="addUserPortlet1" type="portlet" name="security::AddUserPortlet"
decorator="minty-blue">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
</fragment>
</fragment>
</page>
\ No newline at end of file
+<page id="pam">
<defaults
skin="orange"
layout-decorator="jetspeed"
portlet-decorator="jetspeed"
/>
<title>User Management</title>
<fragment id="um-2" type="layout" name="jetspeed::VelocityTwoColumns">
<fragment id="addUserPortlet1" type="portlet" name="security::AddUserPortlet"
decorator="minty-blue">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
</fragment>
</fragment>
</page>
\ No newline at end of file
1.2 +1 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/pam.psml
Index: pam.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/pam.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam.psml 18 Aug 2004 14:02:47 -0000 1.1
+++ pam.psml 7 Sep 2004 03:57:05 -0000 1.2
@@ -1,2 +1,2 @@
<!--
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 id="pam">
<defaults
skin="orange"
layout-decorator="jetspeed"
portlet-decorator="jetspeed"
/>
<title>Portlet Application Manager</title>
<fragment id="2" type="layout" name="jetspeed::VelocityTwoColumns">
<fragment id="13" type="portlet" name="pam::PortletApplicationBrowser"
decorator="minty-blue">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
</fragment>
<fragment id="14" type="portlet" name="pam::PortletApplicationDetail"
decorator="minty-blue">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="1" />
</fragment>
</fragment>
</page>
\ No newline at end of file
+<page id="pam">
<defaults
skin="orange"
layout-decorator="jetspeed"
portlet-decorator="jetspeed"
/>
<title>Portlet Application Manager</title>
<fragment id="pam-2" type="layout" name="jetspeed::VelocityTwoColumns">
<fragment id="13" type="portlet" name="pam::PortletApplicationBrowser"
decorator="minty-blue">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
</fragment>
<fragment id="14" type="portlet" name="pam::PortletApplicationDetail"
decorator="minty-blue">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="1" />
</fragment>
</fragment>
</page>
\ No newline at end of file
1.2 +1 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/non-java/php-portlet.psml
Index: php-portlet.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/non-java/php-portlet.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-portlet.psml 18 Aug 2004 14:02:47 -0000 1.1
+++ php-portlet.psml 7 Sep 2004 03:57:05 -0000 1.2
@@ -17,7 +17,7 @@
portlet-decorator="jetspeed"
/>
<title>PHP demo</title>
- <fragment id="2" type="layout" name="jetspeed::VelocityTwoColumns">
+ <fragment id="php-2" type="layout" name="jetspeed::VelocityTwoColumns">
<fragment id="phpdemo-1" type="portlet" name="PHP::php-demo">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
1.2 +1 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/non-java/perl-portlet.psml
Index: perl-portlet.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/non-java/perl-portlet.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-portlet.psml 18 Aug 2004 14:02:47 -0000 1.1
+++ perl-portlet.psml 7 Sep 2004 03:57:05 -0000 1.2
@@ -17,7 +17,7 @@
portlet-decorator="jetspeed"
/>
<title>PERL demo</title>
- <fragment id="2" type="layout" name="jetspeed::VelocityTwoColumns">
+ <fragment id="perl-2" type="layout" name="jetspeed::VelocityTwoColumns">
<fragment id="perldemo-1" type="portlet" name="perl::perl-demo">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
1.2 +1 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/localeselector.psml
Index: localeselector.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/localeselector.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- localeselector.psml 5 Aug 2004 04:50:59 -0000 1.1
+++ localeselector.psml 7 Sep 2004 03:57:05 -0000 1.2
@@ -17,7 +17,7 @@
portlet-decorator="jetspeed"
/>
<title>Locale Selector</title>
- <fragment id="2" type="layout" name="jetspeed::VelocityTwoColumns">
+ <fragment id="ls-2" type="layout" name="jetspeed::VelocityTwoColumns">
<fragment id="ls-1" type="portlet" name="localeselector::LocaleSelector">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
1.24 +1 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/default-page.psml
Index: default-page.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/default-page.psml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- default-page.psml 18 Aug 2004 14:02:46 -0000 1.23
+++ default-page.psml 7 Sep 2004 03:57:05 -0000 1.24
@@ -20,7 +20,7 @@
portlet-decorator="jetspeed"
/>
<title>Welcome to Jetspeed 2</title>
- <fragment id="2" type="layout" name="jetspeed::VelocityTwoColumns">
+ <fragment id="dp-1" type="layout" name="jetspeed::VelocityTwoColumns">
<fragment id="3" type="portlet" name="HW_App::HelloPortlet">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
1.10 +2 -2 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p002.psml
Index: p002.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p002.psml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- p002.psml 18 Aug 2004 14:02:46 -0000 1.9
+++ p002.psml 7 Sep 2004 03:57:05 -0000 1.10
@@ -21,9 +21,9 @@
portlet-decorator="jetspeed"
/>
<title>My Second PSML page</title>
- <fragment id="2" type="layout" name="jetspeed::VelocityTwoColumns">
+ <fragment id="xx2" type="layout" name="jetspeed::VelocityTwoColumns">
- <fragment id="9" type="portlet" name="HW_App::CustomerList"/>
+ <fragment id="xx9" type="portlet" name="HW_App::CustomerList"/>
</fragment>
1.9 +5 -5 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p001.psml
Index: p001.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p001.psml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- p001.psml 18 Aug 2004 14:02:47 -0000 1.8
+++ p001.psml 7 Sep 2004 03:57:06 -0000 1.9
@@ -21,20 +21,20 @@
portlet-decorator="portletstd"
/>
<title>My First PSML Page</title>
- <fragment id="1" type="layout" name="jetspeed::TwoColumns">
- <fragment id="3" type="portlet" name="HW_App::HelloPortlet">
+ <fragment id="xx1" type="layout" name="jetspeed::TwoColumns">
+ <fragment id="xx3" type="portlet" name="HW_App::HelloPortlet">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
</fragment>
- <fragment id="4" type="portlet" name="PAM::PortletApplicationBrowser">
+ <fragment id="xx4" type="portlet" name="PAM::PortletApplicationBrowser">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="1" />
</fragment>
- <fragment id="5" type="portlet" name="HW_App::PreferencePortlet">
+ <fragment id="xx5" type="portlet" name="HW_App::PreferencePortlet">
<property layout="TwoColumns" name="row" value="1" />
<property layout="TwoColumns" name="column" value="0" />
</fragment>
- <fragment id="9" type="portlet" name="HW_App::CustomerList">
+ <fragment id="xx9" type="portlet" name="HW_App::CustomerList">
<property layout="TwoColumns" name="row" value="1" />
<property layout="TwoColumns" name="column" value="1" />
</fragment>
1.2 +1 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/struts-demo.psml
Index: struts-demo.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/struts-demo.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- struts-demo.psml 20 Apr 2004 02:08:26 -0000 1.1
+++ struts-demo.psml 7 Sep 2004 03:57:06 -0000 1.2
@@ -17,7 +17,7 @@
portlet-decorator="jetspeed"
/>
<title>Struts Portlet MailReader Demo</title>
- <fragment id="2" type="layout" name="jetspeed::VelocityTwoColumns">
+ <fragment id="sd-1" type="layout" name="jetspeed::VelocityTwoColumns">
<fragment id="15" type="portlet" name="struts-demo::StrutsPortletDemo">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
1.9 +1 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/testsuite.psml
Index: testsuite.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/testsuite.psml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- testsuite.psml 6 Aug 2004 21:09:43 -0000 1.8
+++ testsuite.psml 7 Sep 2004 03:57:06 -0000 1.9
@@ -21,7 +21,7 @@
/>
<title>Test Suite Page</title>
- <fragment id="2" type="layout" name="jetspeed::VelocityTwoColumns">
+ <fragment id="ts-0" type="layout" name="jetspeed::VelocityTwoColumns">
<fragment id="ts-1" type="portlet" name="testsuite::TestPortlet1">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
1.2 +1 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/third-party/Google.psml
Index: Google.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/third-party/Google.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Google.psml 18 Aug 2004 14:02:47 -0000 1.1
+++ Google.psml 7 Sep 2004 03:57:06 -0000 1.2
@@ -22,7 +22,7 @@
/>
<title>Google Portlets</title>
- <fragment id="2" type="layout" name="jetspeed::VelocityTwoColumns">
+ <fragment id="goo-2" type="layout" name="jetspeed::VelocityTwoColumns">
<fragment id="googlePortlet1" type="portlet"
name="GooglePortlet::GooglePortlet">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
1.2 +1 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/third-party/RssPortlet.psml
Index: RssPortlet.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/third-party/RssPortlet.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RssPortlet.psml 18 Aug 2004 14:02:47 -0000 1.1
+++ RssPortlet.psml 7 Sep 2004 03:57:06 -0000 1.2
@@ -22,7 +22,7 @@
/>
<title>Plumtree RSS Portlet</title>
- <fragment id="2" type="layout" name="jetspeed::VelocityTwoColumns">
+ <fragment id="rss-2" type="layout" name="jetspeed::VelocityTwoColumns">
<fragment id="rrsPortlet1" type="portlet" name="RssPortlet::RssPortlet">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
