portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links/more one-more-page.psml
Date Wed, 02 Mar 2005 02:50:27 GMT
ate         2005/03/01 18:50:27

  Modified:    portal/src/webapp/WEB-INF/pages/Administrative Tag:
                        deployment-refactoring role-group.psml
                        profiler.psml site.psml sso-admin.psml
                        role-mgt.psml pam.psml user-mgt.psml
               portal/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite
                        Tag: deployment-refactoring subsite-bookmarks.psml
                        subsite-default-page.psml
               portal/src/webapp/WEB-INF/pages/_user/user Tag:
                        deployment-refactoring p003.psml nested-layout.psml
               portal/src/webapp/WEB-INF/pages/third-party Tag:
                        deployment-refactoring Google.psml RssPortlet.psml
                        SunPortlets.psml
               portal/src/webapp/WEB-INF/pages/non-java Tag:
                        deployment-refactoring perl-portlet.psml
                        php-portlet.psml
               portal/src/webapp/WEB-INF/pages Tag: deployment-refactoring
                        struts-demo.psml jsf-demo.psml css-demo.psml
                        jpetstore.psml rss.psml default-page.psml p002.psml
                        my-account.psml testsuite.psml
               portal/src/webapp/WEB-INF/pages/_user/user/anotherdir Tag:
                        deployment-refactoring p004.psml
               portal/src/webapp/WEB-INF/pages/_role/user/top-links Tag:
                        deployment-refactoring top-page.psml
               portal/src/webapp/WEB-INF/pages/Public Tag:
                        deployment-refactoring db-browser.psml public.psml
               portal/src/webapp/WEB-INF/pages/_role/manager Tag:
                        deployment-refactoring default-page.psml
               portal/src/webapp/WEB-INF/pages/_user/user/_mediatype/html
                        Tag: deployment-refactoring p001.psml
               portal/src/webapp/WEB-INF/pages/Administrative/choosers Tag:
                        deployment-refactoring roles.psml users.psml
                        groups.psml
               portal/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite2
                        Tag: deployment-refactoring subsite2-bookmarks.psml
                        subsite2-default-page.psml
               portal/src/webapp/WEB-INF/pages/_role/user/top-links/more
                        Tag: deployment-refactoring one-more-page.psml
  Log:
  psml updates correcting the references to the new locally deployed jetspeed-layouts portlets.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/role-group.psml
  
  Index: role-group.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/role-group.psml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- role-group.psml	21 Jan 2005 22:08:57 -0000	1.1
  +++ role-group.psml	2 Mar 2005 02:50:24 -0000	1.1.2.1
  @@ -16,7 +16,7 @@
        portlet-decorator="tigris"
     />
     <title>Roles and Groups</title>
  -  <fragment id="group-2" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="group-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
       <fragment id="group-200" type="portlet" name="security::GroupBrowserPortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
  
  
  
  1.3.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/profiler.psml
  
  Index: profiler.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/profiler.psml,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- profiler.psml	9 Nov 2004 01:28:29 -0000	1.3
  +++ profiler.psml	2 Mar 2005 02:50:24 -0000	1.3.2.1
  @@ -17,7 +17,7 @@
        portlet-decorator="tigris"
     />
     <title>Profiler Admin</title>
  -  <fragment id="pa-site" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="pa-site" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
       <fragment id="prof-1" type="portlet" name="pam::ProfilerAdmin" >
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
  
  
  
  1.4.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/site.psml
  
  Index: site.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/site.psml,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- site.psml	9 Nov 2004 01:28:29 -0000	1.4
  +++ site.psml	2 Mar 2005 02:50:24 -0000	1.4.2.1
  @@ -17,7 +17,7 @@
        portlet-decorator="tigris"
     />
     <title>Portal Site Manager</title>
  -  <fragment id="js-site" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="js-site" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
       <fragment id="pdb-1" type="portlet" name="pam::PortalSiteBrowser" >
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
  
  
  
  1.1.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/sso-admin.psml
  
  Index: sso-admin.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/sso-admin.psml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- sso-admin.psml	3 Jan 2005 08:14:32 -0000	1.1
  +++ sso-admin.psml	2 Mar 2005 02:50:24 -0000	1.1.2.1
  @@ -16,7 +16,7 @@
        portlet-decorator="tigris"
     />
     <title>SSO Management</title>
  -  <fragment id="ssoa-2" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="ssoa-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
       <fragment id="ssoa-200" type="portlet" name="security::SSOBrowserPortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
  
  
  
  1.2.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/role-mgt.psml
  
  Index: role-mgt.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/role-mgt.psml,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- role-mgt.psml	25 Jan 2005 23:18:08 -0000	1.2
  +++ role-mgt.psml	2 Mar 2005 02:50:24 -0000	1.2.2.1
  @@ -1 +1 @@
  -<!--
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="chgpwd">
  <defaults
     skin="orange"
    
layout-decorator="tigris"
     portlet-decorator="tigris"
  />
  <title>Role Management</title>
 <fragment id="rolemgt-1" type="layout" name="jetspeed::VelocityTwoColumns">
    <fragment
id="rolemgt-2" type="portlet" name="security::RoleMgtPortlet">
      <property layout="TwoColumns"
name="row" value="0" />
      <property layout="TwoColumns" name="column" value="0"
/>
    </fragment>
  </fragment>
</page>
  \ No newline at end of file
  +<!--
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="chgpwd">
  <defaults
     skin="orange"
    
layout-decorator="tigris"
     portlet-decorator="tigris"
  />
  <title>Role Management</title>
 <fragment id="rolemgt-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
   <fragment id="rolemgt-2" type="portlet" name="security::RoleMgtPortlet">
      <property
layout="TwoColumns" name="row" value="0" />
      <property layout="TwoColumns" name="column"
value="0" />
    </fragment>
  </fragment>
</page>
  \ No newline at end of file
  
  
  
  1.4.2.1   +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.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- pam.psml	9 Nov 2004 01:28:29 -0000	1.4
  +++ pam.psml	2 Mar 2005 02:50:24 -0000	1.4.2.1
  @@ -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="tigris"
    portlet-decorator="tigris"
  />
  <title>Portlet Application Manager</title>
 <fragment id="pam-2" type="layout" name="jetspeed::VelocityTwoColumns">
    <fragment
id="13" type="portlet" name="pam::PortletApplicationBrowser" >
      <property layout="TwoColumns"
name="row" value="0" />
      <property layout="TwoColumns" name="column" value="0"
/>
    </fragment>
    <fragment id="14" type="portlet" name="pam::PortletApplicationDetail"
>
      <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="tigris"
    portlet-decorator="tigris"
  />
  <title>Portlet Application Manager</title>
 <fragment id="pam-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
  
 <fragment id="13" type="portlet" name="pam::PortletApplicationBrowser" >
      <property
layout="TwoColumns" name="row" value="0" />
      <property layout="TwoColumns" name="column"
value="0" />
    </fragment>
    <fragment id="14" type="portlet" name="pam::PortletApplicationDetail"
>
      <property layout="TwoColumns" name="row" value="0" />
      <property
layout="TwoColumns" name="column" value="1" />
    </fragment>
  </fragment>
</page>
  \ No newline at end of file
  
  
  
  1.6.2.1   +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.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- user-mgt.psml	22 Dec 2004 17:53:34 -0000	1.6
  +++ user-mgt.psml	2 Mar 2005 02:50:24 -0000	1.6.2.1
  @@ -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="tigris"
    portlet-decorator="tigris"
  />
  <title>User Management</title>
  <fragment
id="um-2" type="layout" name="jetspeed::VelocityTwoColumns">
    <fragment id="um-3"
type="portlet" name="security::UserBrowserPortlet">
      <property layout="TwoColumns"
name="row" value="0" />
      <property layout="TwoColumns" name="column" value="0"
/>
    </fragment>
    <fragment id="um-4" type="portlet" name="security::UserDetailsPortlet">
     <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="tigris"
    portlet-decorator="tigris"
  />
  <title>User Management</title>
  <fragment
id="um-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
    <fragment id="um-3"
type="portlet" name="security::UserBrowserPortlet">
      <property layout="TwoColumns"
name="row" value="0" />
      <property layout="TwoColumns" name="column" value="0"
/>
    </fragment>
    <fragment id="um-4" type="portlet" name="security::UserDetailsPortlet">
     <property layout="TwoColumns" name="row" value="0" />
      <property layout="TwoColumns"
name="column" value="1" />
    </fragment>    
  </fragment>
</page>
  \ No newline at end of file
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite/subsite-bookmarks.psml
  
  Index: subsite-bookmarks.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite/subsite-bookmarks.psml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- subsite-bookmarks.psml	25 Jan 2005 00:48:40 -0000	1.1
  +++ subsite-bookmarks.psml	2 Mar 2005 02:50:25 -0000	1.1.2.1
  @@ -5,7 +5,7 @@
   
     <title>Subsite Bookmarks</title>
   
  -  <fragment id="sub-20" type="layout" name="jetspeed::VelocityOneColumn">
  +  <fragment id="sub-20" type="layout" name="jetspeed-layouts::VelocityOneColumn">
       <fragment id="sub-21" type="portlet" name="demo::BookmarkPortlet">
         <property layout="OneColumn" name="row" value="0" />
       </fragment>
  
  
  
  1.1.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite/subsite-default-page.psml
  
  Index: subsite-default-page.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite/subsite-default-page.psml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- subsite-default-page.psml	25 Jan 2005 00:48:40 -0000	1.1
  +++ subsite-default-page.psml	2 Mar 2005 02:50:25 -0000	1.1.2.1
  @@ -5,7 +5,7 @@
   
     <title>Subsite Home</title>
   
  -  <fragment id="sub-0" type="layout" name="jetspeed::VelocityOneColumn">
  +  <fragment id="sub-0" type="layout" name="jetspeed-layouts::VelocityOneColumn">
       <fragment id="sub-1" type="portlet" name="pam::LocaleSelector">
         <property layout="OneColumn" name="row" value="3" />
       </fragment>                                
  
  
  
  No                   revision
  No                   revision
  1.4.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/p003.psml
  
  Index: p003.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/p003.psml,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- p003.psml	15 Nov 2004 06:02:20 -0000	1.4
  +++ p003.psml	2 Mar 2005 02:50:25 -0000	1.4.2.1
  @@ -21,7 +21,7 @@
        portlet-decorator="tigris"
     />
     <title>[USER 003] PSML page</title>
  -  <fragment id="u3-xx2" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="u3-xx2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
     
   	  <fragment id="u3-xx9" type="portlet" name="demo::CustomerList">
           <property layout="TwoColumns" name="row" value="0" />
  
  
  
  1.5.2.1   +2 -2      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/nested-layout.psml
  
  Index: nested-layout.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/nested-layout.psml,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- nested-layout.psml	19 Nov 2004 21:53:35 -0000	1.5
  +++ nested-layout.psml	2 Mar 2005 02:50:25 -0000	1.5.2.1
  @@ -3,11 +3,11 @@
     <defaults layout-decorator="tigris" portlet-decorator="tigris"/>
     <title>Nested Layout Test</title>
     <short-title>Nested Layout</short-title>
  -  <fragment id="100393" type="layout" name="jetspeed::VelocityOneColumn">
  +  <fragment id="100393" type="layout" name="jetspeed-layouts::VelocityOneColumn">
       <fragment id="100939" type="portlet" name="pam::LocaleSelector">
         <property layout="OneColumn" name="row" value="0"/>
       </fragment>                                
  -    <fragment id="100345" type="layout" name="jetspeed::VelocityTwoColumns">
  +    <fragment id="100345" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
         <property layout="OneColumn" name="row" value="1"/>
         <fragment id="100121" type="portlet" name="security::LoginPortlet">
           <property layout="TwoColumns" name="row" value="0"/>
  
  
  
  No                   revision
  No                   revision
  1.4.2.1   +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.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- Google.psml	9 Nov 2004 01:28:30 -0000	1.4
  +++ Google.psml	2 Mar 2005 02:50:25 -0000	1.4.2.1
  @@ -22,7 +22,7 @@
     />
     
      <title>Google Portlets</title>
  -  <fragment id="goo-2" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="goo-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
        <fragment id="googlePortlet1" type="portlet" name="GooglePortlet::GooglePortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
  
  
  
  1.4.2.1   +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.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- RssPortlet.psml	9 Nov 2004 01:28:30 -0000	1.4
  +++ RssPortlet.psml	2 Mar 2005 02:50:25 -0000	1.4.2.1
  @@ -22,7 +22,7 @@
     />
     
      <title>Plumtree RSS Portlet</title>
  -  <fragment id="rss-2" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="rss-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
        <fragment id="rrsPortlet1" type="portlet" name="RssPortlet::RssPortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
  
  
  
  1.3.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/third-party/SunPortlets.psml
  
  Index: SunPortlets.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/third-party/SunPortlets.psml,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- SunPortlets.psml	9 Nov 2004 01:28:30 -0000	1.3
  +++ SunPortlets.psml	2 Mar 2005 02:50:25 -0000	1.3.2.1
  @@ -22,7 +22,7 @@
     />
     
      <title>Sun Portlets</title>
  -  <fragment id="sunportletspage" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="sunportletspage" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
        <fragment id="showTime1" type="portlet" name="portletsamples::JSPPortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
  
  
  
  No                   revision
  No                   revision
  1.4.2.1   +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.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- perl-portlet.psml	9 Nov 2004 01:28:30 -0000	1.4
  +++ perl-portlet.psml	2 Mar 2005 02:50:25 -0000	1.4.2.1
  @@ -17,7 +17,7 @@
        portlet-decorator="tigris"
     />
     <title>PERL demo</title>
  -  <fragment id="perl-2" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="perl-2" type="layout" name="jetspeed-layouts::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.4.2.1   +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.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- php-portlet.psml	9 Nov 2004 01:28:30 -0000	1.4
  +++ php-portlet.psml	2 Mar 2005 02:50:25 -0000	1.4.2.1
  @@ -17,7 +17,7 @@
        portlet-decorator="tigris"
     />
     <title>PHP demo</title>
  -  <fragment id="php-2" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="php-2" type="layout" name="jetspeed-layouts::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" />
  
  
  
  No                   revision
  No                   revision
  1.6.2.1   +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.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- struts-demo.psml	25 Jan 2005 00:48:40 -0000	1.6
  +++ struts-demo.psml	2 Mar 2005 02:50:25 -0000	1.6.2.1
  @@ -17,7 +17,7 @@
        portlet-decorator="tigris"
     />
     <title>Struts MailReader Demo</title>
  -  <fragment id="sd-1" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="sd-1" type="layout" name="jetspeed-layouts::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.6.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/jsf-demo.psml
  
  Index: jsf-demo.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/jsf-demo.psml,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- jsf-demo.psml	25 Jan 2005 00:48:40 -0000	1.6
  +++ jsf-demo.psml	2 Mar 2005 02:50:25 -0000	1.6.2.1
  @@ -22,7 +22,7 @@
     />
     
      <title>JSF Demo</title>
  -  <fragment id="jsfportletspage" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="jsfportletspage" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
        <fragment id="jsfGuessNumber1" type="portlet" name="jsf-demo::guessNumber">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
  
  
  
  1.4.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/css-demo.psml
  
  Index: css-demo.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/css-demo.psml,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- css-demo.psml	25 Jan 2005 00:48:39 -0000	1.4
  +++ css-demo.psml	2 Mar 2005 02:50:25 -0000	1.4.2.1
  @@ -17,7 +17,7 @@
        portlet-decorator="tigris"
     />
     <title>CSS Demo</title>
  -  <fragment id="css-2" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="css-2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
       <fragment id="css-1" type="portlet" name="demo::CSSDemoPortlet" decorator="tigris">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
  
  
  
  1.4.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/jpetstore.psml
  
  Index: jpetstore.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/jpetstore.psml,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- jpetstore.psml	25 Jan 2005 23:23:15 -0000	1.4
  +++ jpetstore.psml	2 Mar 2005 02:50:25 -0000	1.4.2.1
  @@ -17,7 +17,7 @@
        portlet-decorator="tigris"
     />
     <title>JPetstore</title>
  -  <fragment id="jp-1" type="layout" name="jetspeed::VelocityOneColumn">
  +  <fragment id="jp-1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
       <fragment id="jp-2" type="portlet" name="jpetstore::JPetstorePortlet"/>
     </fragment>
   
  
  
  
  1.4.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/rss.psml
  
  Index: rss.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/rss.psml,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- rss.psml	25 Jan 2005 00:48:40 -0000	1.4
  +++ rss.psml	2 Mar 2005 02:50:25 -0000	1.4.2.1
  @@ -17,7 +17,7 @@
        portlet-decorator="tigris"
     />
     <title>RSS Demo</title>
  -  <fragment id="rss-1" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="rss-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
       <fragment id="rss-101" type="portlet" name="rss::RSS">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
  
  
  
  1.31.2.1  +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.31
  retrieving revision 1.31.2.1
  diff -u -r1.31 -r1.31.2.1
  --- default-page.psml	25 Jan 2005 00:48:40 -0000	1.31
  +++ default-page.psml	2 Mar 2005 02:50:25 -0000	1.31.2.1
  @@ -27,7 +27,7 @@
   		Jetspeed 2 へようこそ
     </metadata>
   
  -  <fragment id="dp-1" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="dp-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
       <fragment id="dp-3" type="portlet" name="pam::LocaleSelector">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
  
  
  
  1.17.2.1  +1 -1      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.17
  retrieving revision 1.17.2.1
  diff -u -r1.17 -r1.17.2.1
  --- p002.psml	25 Jan 2005 00:48:40 -0000	1.17
  +++ p002.psml	2 Mar 2005 02:50:25 -0000	1.17.2.1
  @@ -21,7 +21,7 @@
        portlet-decorator="tigris"
     />
     <title>My Second PSML page</title>
  -  <fragment id="xx2.0" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="xx2.0" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
     
   	  <fragment id="xx2.1" type="portlet" name="demo::SSOIFramePortlet"/>
   	   <fragment id="wcp2.0" type="portlet" name="demo::SSOWebContentPortlet"/>
  
  
  
  1.5.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/my-account.psml
  
  Index: my-account.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/my-account.psml,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- my-account.psml	25 Jan 2005 23:18:08 -0000	1.5
  +++ my-account.psml	2 Mar 2005 02:50:25 -0000	1.5.2.1
  @@ -1 +1 @@
  -<!--
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="my-account" hidden="true">
  <defaults
     skin="orange"
    layout-decorator="tigris"
     portlet-decorator="tigris"
  />
  <title>My Account</title>
 <fragment id="cpwd-1" type="layout" name="jetspeed::VelocityTwoColumns">
    <fragment
id="cpwd-2" type="portlet" name="security::ChangePasswordPortlet">
      <property layout="TwoColumns"
name="row" value="0" />
      <property layout="TwoColumns" name="column" value="0"
/>
    </fragment>
  </fragment>

  <security-constraints>
    <security-constraint>
     <users>guest</users>
    </security-constraint>
    <security-constraints-ref>public-view</security-constraints-ref>
 </security-constraints>
</page>
  \ No newline at end of file
  +<!--
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="my-account" hidden="true">
  <defaults
     skin="orange"
    layout-decorator="tigris"
     portlet-decorator="tigris"
  />
  <title>My Account</title>
 <fragment id="cpwd-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
 
  <fragment id="cpwd-2" type="portlet" name="security::ChangePasswordPortlet">
    
 <property layout="TwoColumns" name="row" value="0" />
      <property layout="TwoColumns"
name="column" value="0" />
    </fragment>
  </fragment>

  <security-constraints>
   <security-constraint>
      <users>guest</users>
    </security-constraint>
   <security-constraints-ref>public-view</security-constraints-ref>
  </security-constraints>
</page>
  \ No newline at end of file
  
  
  
  1.13.2.1  +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.13
  retrieving revision 1.13.2.1
  diff -u -r1.13 -r1.13.2.1
  --- testsuite.psml	25 Jan 2005 00:48:40 -0000	1.13
  +++ testsuite.psml	2 Mar 2005 02:50:25 -0000	1.13.2.1
  @@ -21,7 +21,7 @@
     />
   
     <title>Test Suite Page</title>
  -  <fragment id="ts-0" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="ts-0" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
       <fragment id="ts-1" type="portlet" name="testsuite::TestPortlet1">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
  
  
  
  No                   revision
  No                   revision
  1.3.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/anotherdir/p004.psml
  
  Index: p004.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/anotherdir/p004.psml,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- p004.psml	19 Nov 2004 21:53:34 -0000	1.3
  +++ p004.psml	2 Mar 2005 02:50:25 -0000	1.3.2.1
  @@ -21,7 +21,7 @@
        portlet-decorator="jetspeed"
     />
     <title>[USER 004] PSML Page</title>
  -  <fragment id="u4-xx1" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="u4-xx1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
       <fragment id="u4-xx3" type="portlet" name="demo::BookmarkPortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
  
  
  
  No                   revision
  No                   revision
  1.4.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml
  
  Index: top-page.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- top-page.psml	19 Nov 2004 21:53:35 -0000	1.4
  +++ top-page.psml	2 Mar 2005 02:50:26 -0000	1.4.2.1
  @@ -16,7 +16,7 @@
   <page>
     <defaults layout-decorator="tigris" portlet-decorator="tigris"/>
     <title>[USER] Top Page</title>
  -  <fragment id="utp-1" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="utp-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
       <fragment id="utp-2" type="portlet" name="security::LoginPortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Public/db-browser.psml
  
  Index: db-browser.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Public/db-browser.psml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- db-browser.psml	3 Jan 2005 08:14:33 -0000	1.1
  +++ db-browser.psml	2 Mar 2005 02:50:26 -0000	1.1.2.1
  @@ -21,7 +21,7 @@
     />
     
      <title>DB Browser Demo</title>
  -  <fragment id="dbb-1" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="dbb-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
        <fragment id="dbb-101" type="portlet" name="demo::DbBrowserExample">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
  
  
  
  1.3.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Public/public.psml
  
  Index: public.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Public/public.psml,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- public.psml	25 Jan 2005 23:18:08 -0000	1.3
  +++ public.psml	2 Mar 2005 02:50:26 -0000	1.3.2.1
  @@ -17,7 +17,7 @@
        portlet-decorator="tigris"
     />
     <title>Public Share</title>
  -  <fragment id="ps-1000" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="ps-1000" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
       <fragment id="ps-1001" type="portlet" name="rss::RSS">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
  
  
  
  No                   revision
  No                   revision
  1.7.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/manager/default-page.psml
  
  Index: default-page.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/manager/default-page.psml,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- default-page.psml	12 Dec 2004 08:07:07 -0000	1.7
  +++ default-page.psml	2 Mar 2005 02:50:26 -0000	1.7.2.1
  @@ -21,7 +21,7 @@
        portlet-decorator="tigris"
     />
     <title>Manager Role Page</title>
  -  <fragment id="mrp-xx1" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="mrp-xx1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
       <fragment id="mrp-xx3" type="portlet" name="demo::BookmarkPortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
  
  
  
  No                   revision
  No                   revision
  1.4.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/_mediatype/html/p001.psml
  
  Index: p001.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/_mediatype/html/p001.psml,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- p001.psml	3 Dec 2004 23:04:36 -0000	1.4
  +++ p001.psml	2 Mar 2005 02:50:26 -0000	1.4.2.1
  @@ -21,7 +21,7 @@
        portlet-decorator="jetspeed"
     />
     <title>[USER 001] PSML Page</title>
  -  <fragment id="u1-xx1" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="u1-xx1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
       <fragment id="u1-xx3" type="portlet" name="demo::BookmarkPortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
  
  
  
  No                   revision
  No                   revision
  1.2.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/choosers/roles.psml
  
  Index: roles.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/choosers/roles.psml,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- roles.psml	14 Jan 2005 18:31:28 -0000	1.2
  +++ roles.psml	2 Mar 2005 02:50:26 -0000	1.2.2.1
  @@ -16,7 +16,7 @@
        portlet-decorator="clear"
     />
     <title>Role Chooser</title>
  -  <fragment id="chooser-roles" type="layout" name="jetspeed::VelocityOneColumnNoActions">
  +  <fragment id="chooser-roles" type="layout" name="jetspeed-layouts::VelocityOneColumnNoActions">
       <fragment id="chooser-roles-1" type="portlet" name="security::RoleChooser" >
       </fragment>
     </fragment>
  
  
  
  1.2.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/choosers/users.psml
  
  Index: users.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/choosers/users.psml,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- users.psml	14 Jan 2005 18:31:28 -0000	1.2
  +++ users.psml	2 Mar 2005 02:50:26 -0000	1.2.2.1
  @@ -16,7 +16,7 @@
        portlet-decorator="clear"
     />
     <title>User Chooser</title>
  -  <fragment id="chooser-users" type="layout" name="jetspeed::VelocityOneColumnNoActions">
  +  <fragment id="chooser-users" type="layout" name="jetspeed-layouts::VelocityOneColumnNoActions">
       <fragment id="chooser-users-1" type="portlet" name="security::UserChooser" >
       </fragment>
     </fragment>
  
  
  
  1.2.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/choosers/groups.psml
  
  Index: groups.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/choosers/groups.psml,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- groups.psml	14 Jan 2005 18:31:28 -0000	1.2
  +++ groups.psml	2 Mar 2005 02:50:26 -0000	1.2.2.1
  @@ -16,7 +16,7 @@
        portlet-decorator="clear"
     />
     <title>Group Chooser</title>
  -  <fragment id="chooser-groups" type="layout" name="jetspeed::VelocityOneColumnNoActions">
  +  <fragment id="chooser-groups" type="layout" name="jetspeed-layouts::VelocityOneColumnNoActions">
       <fragment id="chooser-groups-1" type="portlet" name="security::GroupChooser" >
       </fragment>
     </fragment>
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite2/subsite2-bookmarks.psml
  
  Index: subsite2-bookmarks.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite2/subsite2-bookmarks.psml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- subsite2-bookmarks.psml	25 Jan 2005 00:48:40 -0000	1.1
  +++ subsite2-bookmarks.psml	2 Mar 2005 02:50:26 -0000	1.1.2.1
  @@ -5,7 +5,7 @@
   
     <title>Subsite2 Bookmarks</title>
   
  -  <fragment id="sub2-20" type="layout" name="jetspeed::VelocityOneColumn">
  +  <fragment id="sub2-20" type="layout" name="jetspeed-layouts::VelocityOneColumn">
       <fragment id="sub2-21" type="portlet" name="demo::BookmarkPortlet">
         <property layout="OneColumn" name="row" value="0" />
       </fragment>
  
  
  
  1.1.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite2/subsite2-default-page.psml
  
  Index: subsite2-default-page.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite2/subsite2-default-page.psml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- subsite2-default-page.psml	25 Jan 2005 00:48:40 -0000	1.1
  +++ subsite2-default-page.psml	2 Mar 2005 02:50:26 -0000	1.1.2.1
  @@ -5,7 +5,7 @@
   
     <title>Subsite2 Home</title>
   
  -  <fragment id="sub2-0" type="layout" name="jetspeed::VelocityOneColumn">
  +  <fragment id="sub2-0" type="layout" name="jetspeed-layouts::VelocityOneColumn">
       <fragment id="sub2-1" type="portlet" name="pam::LocaleSelector">
         <property layout="OneColumn" name="row" value="3" />
       </fragment>                                
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links/more/one-more-page.psml
  
  Index: one-more-page.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_role/user/top-links/more/one-more-page.psml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- one-more-page.psml	26 Nov 2004 22:53:22 -0000	1.1
  +++ one-more-page.psml	2 Mar 2005 02:50:26 -0000	1.1.2.1
  @@ -16,7 +16,7 @@
   <page>
     <defaults layout-decorator="tigris" portlet-decorator="tigris"/>
     <title>[USER] One More Page</title>
  -  <fragment id="utp-1" type="layout" name="jetspeed::VelocityTwoColumns">
  +  <fragment id="utp-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
       <fragment id="utp-4" type="portlet" name="demo::BookmarkPortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="1" />
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message