portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/third-party folder.metadata
Date Tue, 25 Jan 2005 00:48:40 GMT
rwatler     2005/01/24 16:48:40

  Modified:    portal/src/webapp/WEB-INF/pages css-demo.psml
                        default-page.psml folder.metadata jpetstore.psml
                        jsf-demo.psml my-account.psml non-java.ds p002.psml
                        page.security pages.ds rss.psml struts-demo.psml
                        testsuite.psml top-pages.ds
               portal/src/webapp/WEB-INF/pages/Administrative
                        folder.metadata
               portal/src/webapp/WEB-INF/pages/Public folder.metadata
                        public.psml
               portal/src/webapp/WEB-INF/pages/_user/user folder.metadata
               portal/src/webapp/WEB-INF/pages/non-java folder.metadata
               portal/src/webapp/WEB-INF/pages/third-party folder.metadata
  Added:       portal/src/webapp/WEB-INF/pages/__subsite-root
                        folder.metadata google-subsite-root.link
               portal/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite
                        folder.metadata google-subsite.link
                        subsite-bookmarks.psml subsite-default-page.psml
               portal/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite2
                        folder.metadata google-subsite2.link
                        subsite2-bookmarks.psml subsite2-default-page.psml
  Log:
  add subsite and update security constraints
  
  Revision  Changes    Path
  1.4       +4 -0      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- css-demo.psml	15 Nov 2004 06:02:20 -0000	1.3
  +++ css-demo.psml	25 Jan 2005 00:48:39 -0000	1.4
  @@ -26,5 +26,9 @@
     <metadata name="title" xml:lang="ja">
           CSS デモ
     </metadata>
  +
  +  <security-constraints>
  +    <security-constraints-ref>users</security-constraints-ref>
  +  </security-constraints>
   </page>
   
  
  
  
  1.31      +1 -5      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.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- default-page.psml	19 Nov 2004 21:53:34 -0000	1.30
  +++ default-page.psml	25 Jan 2005 00:48:40 -0000	1.31
  @@ -58,11 +58,7 @@
       </fragment>
     </fragment>
   
  -  <!-- allow all users to view -->
     <security-constraints>
  -    <security-constraint>
  -      <users>*</users>
  -      <permissions>view</permissions>
  -    </security-constraint>
  +    <security-constraints-ref>public-view</security-constraints-ref>
     </security-constraints>
   </page>
  
  
  
  1.8       +1 -16     jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/folder.metadata
  
  Index: folder.metadata
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/folder.metadata,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- folder.metadata	29 Nov 2004 03:35:51 -0000	1.7
  +++ folder.metadata	25 Jan 2005 00:48:40 -0000	1.8
  @@ -9,22 +9,7 @@
     <document-order>apache_portals.link</document-order>
     <document-order>apache.link</document-order>
   
  -  <!-- allow user role to view and allow manager role by default -->
  -  <!--
     <security-constraints>
  -    <security-constraint>
  -      <roles>user</roles>
  -      <permissions>view</permissions>
  -    </security-constraint>
  -    <security-constraints-ref>manager</security-constraints-ref>
  +    <security-constraints-ref>public-view</security-constraints-ref>
     </security-constraints>
  -      -->
  -
  -  <security-constraints>
  -    <security-constraint>
  -      <users>*</users>
  -      <permissions>view</permissions>
  -    </security-constraint>
  -  </security-constraints>
  -  
   </folder>
  
  
  
  1.2       +4 -0      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jpetstore.psml	20 Jan 2005 01:51:20 -0000	1.1
  +++ jpetstore.psml	25 Jan 2005 00:48:40 -0000	1.2
  @@ -20,4 +20,8 @@
     <fragment id="jp-1" type="layout" name="jetspeed::VelocityOneColumn">
       <fragment id="jp-2" type="portlet" name="jpetstore::JPetstorePortlet"/>
     </fragment>
  +
  +  <security-constraints>
  +    <security-constraints-ref>users</security-constraints-ref>
  +  </security-constraints>
   </page>
  
  
  
  1.6       +4 -0      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jsf-demo.psml	19 Nov 2004 21:53:34 -0000	1.5
  +++ jsf-demo.psml	25 Jan 2005 00:48:40 -0000	1.6
  @@ -35,4 +35,8 @@
     <metadata name="title" xml:lang="ja">
           JSF 数当てポートレット
     </metadata>
  +
  +  <security-constraints>
  +    <security-constraints-ref>users</security-constraints-ref>
  +  </security-constraints>
   </page>
  
  
  
  1.4       +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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- my-account.psml	15 Jan 2005 06:10:57 -0000	1.3
  +++ my-account.psml	25 Jan 2005 00:48:40 -0000	1.4
  @@ -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>
  <!-- allow all users to view 
      
TODO: restrict to logged on users only (but how?)
  -->
  <security-constraints>
   <security-constraint>
      <users>guest</users>
    </security-constraint>
   <security-constraint>
      <users>*</users>
      <permissions>view</permissions>
   </security-constraint>
  </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::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.5       +4 -0      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- non-java.ds	19 Nov 2004 03:07:42 -0000	1.4
  +++ non-java.ds	25 Jan 2005 00:48:40 -0000	1.5
  @@ -1,4 +1,8 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <document-set>
     <title>Non Java Pages</title>
  +
  +  <security-constraints>
  +    <security-constraints-ref>users</security-constraints-ref>
  +  </security-constraints>
   </document-set>
  
  
  
  1.17      +4 -0      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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- p002.psml	3 Dec 2004 04:32:39 -0000	1.16
  +++ p002.psml	25 Jan 2005 00:48:40 -0000	1.17
  @@ -31,4 +31,8 @@
     <metadata name="title" xml:lang="ja">
           PSML ページ 2
     </metadata>  
  +
  +  <security-constraints>
  +    <security-constraints-ref>users</security-constraints-ref>
  +  </security-constraints>
   </page>
  
  
  
  1.2       +22 -0     jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/page.security
  
  Index: page.security
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/page.security,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- page.security	19 Nov 2004 03:07:42 -0000	1.1
  +++ page.security	25 Jan 2005 00:48:40 -0000	1.2
  @@ -18,4 +18,26 @@
       </security-constraint>
     </security-constraints-def>
   
  +  <!-- define user constraints -->
  +  <security-constraints-def name="users">
  +    <security-constraint>
  +      <roles>user, manager</roles>
  +      <permissions>view</permissions>
  +    </security-constraint>
  +  </security-constraints-def>
  +
  +  <!-- define public constraints -->
  +  <security-constraints-def name="public-view">
  +    <security-constraint>
  +      <users>*</users>
  +      <permissions>view</permissions>
  +    </security-constraint>
  +  </security-constraints-def>
  +  <security-constraints-def name="public-edit">
  +    <security-constraint>
  +      <users>*</users>
  +      <permissions>view, edit</permissions>
  +    </security-constraint>
  +  </security-constraints-def>
  +
   </page-security>
  
  
  
  1.5       +4 -0      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- pages.ds	19 Nov 2004 03:07:42 -0000	1.4
  +++ pages.ds	25 Jan 2005 00:48:40 -0000	1.5
  @@ -3,4 +3,8 @@
     <title>Profiled Pages</title>
     <profile-locator>page</profile-locator>
     <document-path regexp="true">/p[0-9][0-9][0-9].psml</document-path>
  +
  +  <security-constraints>
  +    <security-constraints-ref>users</security-constraints-ref>
  +  </security-constraints>
   </document-set>
  
  
  
  1.4       +3 -7      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- rss.psml	19 Nov 2004 23:39:30 -0000	1.3
  +++ rss.psml	25 Jan 2005 00:48:40 -0000	1.4
  @@ -27,12 +27,8 @@
         <property layout="TwoColumns" name="column" value="1" />
       </fragment>
     </fragment>
  -  <!-- allow all users to view -->
  +
     <security-constraints>
  -    <security-constraint>
  -      <users>*</users>
  -      <permissions>view</permissions>
  -    </security-constraint>
  +    <security-constraints-ref>public-view</security-constraints-ref>
     </security-constraints>
  -  
  -</page>
  \ No newline at end of file
  +</page>
  
  
  
  1.6       +4 -0      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- struts-demo.psml	20 Jan 2005 01:50:52 -0000	1.5
  +++ struts-demo.psml	25 Jan 2005 00:48:40 -0000	1.6
  @@ -26,4 +26,8 @@
     <metadata name="title" xml:lang="ja">
           Struts メールリーダーデモ
     </metadata>
  +
  +  <security-constraints>
  +    <security-constraints-ref>users</security-constraints-ref>
  +  </security-constraints>
   </page>
  
  
  
  1.13      +0 -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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- testsuite.psml	19 Nov 2004 03:07:42 -0000	1.12
  +++ testsuite.psml	25 Jan 2005 00:48:40 -0000	1.13
  @@ -35,7 +35,6 @@
           テストスイートページ
     </metadata>
   
  -  <!-- allow engineering to view, but disable all access for accounting and marketing
groups -->
     <security-constraints>
       <security-constraint>
         <groups>accounting, marketing</groups>
  
  
  
  1.5       +4 -0      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- top-pages.ds	19 Nov 2004 03:07:42 -0000	1.4
  +++ top-pages.ds	25 Jan 2005 00:48:40 -0000	1.5
  @@ -4,4 +4,8 @@
     <metadata name="title" xml:lang="fr">Page haut</metadata>
     <profile-locator>docset</profile-locator>
     <document-path>/Administrative</document-path>
  +
  +  <security-constraints>
  +    <security-constraints-ref>users</security-constraints-ref>
  +  </security-constraints>
   </document-set>
  
  
  
  1.7       +1 -2      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/folder.metadata
  
  Index: folder.metadata
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Administrative/folder.metadata,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- folder.metadata	21 Jan 2005 22:08:57 -0000	1.6
  +++ folder.metadata	25 Jan 2005 00:48:40 -0000	1.7
  @@ -2,7 +2,7 @@
   <folder>
     <title >Jetspeed Administrative Portlets</title>  
     <metadata name="title" xml:lang="fr">Jetspeed Portlets Administratif</metadata>
  -  <metadata name="title" xml:lang="ja">Jetspeed 管??ートレット</metadata>
  +  <metadata name="title" xml:lang="ja">Jetspeed 管理ポートレット</metadata>
   
     <document-order>user-mgt.psml</document-order>
     <document-order>role-group.psml</document-order>
  @@ -12,7 +12,6 @@
     <document-order>profiler.psml</document-order>
     <document-order>role-mgt.psml</document-order>
   
  -  <!-- allow only manager role -->
     <security-constraints>
       <security-constraints-ref>manager</security-constraints-ref>
     </security-constraints>
  
  
  
  1.2       +3 -6      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Public/folder.metadata
  
  Index: folder.metadata
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Public/folder.metadata,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- folder.metadata	19 Nov 2004 23:39:30 -0000	1.1
  +++ folder.metadata	25 Jan 2005 00:48:40 -0000	1.2
  @@ -1,11 +1,8 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <folder>
     <title>Public Folders</title>  
  +
     <security-constraints>
  -    <security-constraint>
  -      <users>*</users>
  -      <permissions>view, edit</permissions>
  -    </security-constraint>
  -  </security-constraints>  
  +    <security-constraints-ref>public-edit</security-constraints-ref>
  +  </security-constraints>
   </folder>
  -
  
  
  
  1.2       +3 -11     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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- public.psml	19 Nov 2004 23:39:30 -0000	1.1
  +++ public.psml	25 Jan 2005 00:48:40 -0000	1.2
  @@ -29,15 +29,7 @@
       <fragment id="ps-1003" type="portlet" name="jsf-demo::CalendarPortlet">
         <property layout="TwoColumns" name="row" value="1" />
         <property layout="TwoColumns" name="column" value="1" />
  -    </fragment>
  -	
  +    </fragment>	
     </fragment>
  -  <!-- allow all users to view -->
  -  <security-constraints>
  -    <security-constraint>
  -      <users>*</users>
  -      <permissions>view, edit</permissions>
  -    </security-constraint>
  -  </security-constraints>
  -  
  -</page>
  \ No newline at end of file
  +
  +</page>
  
  
  
  1.1                  jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/__subsite-root/folder.metadata
  
  Index: folder.metadata
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <folder>
  
    <title>Subsite Root Folder</title>  
  
    <document-order>subsite2-default-page.psml</document-order>
    <document-order>subsite2-bookmarks.psml</document-order>
    <document-order>subsite-bookmarks.psml</document-order>
    <document-order>subsite-default-page.psml</document-order>
  
    <security-constraints>
      <security-constraint>
        <roles>subsite, subsite2</roles>
        <permissions>view</permissions>
      </security-constraint>
    </security-constraints>
    
  </folder>
  
  
  
  1.1                  jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/__subsite-root/google-subsite-root.link
  
  Index: google-subsite-root.link
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <link target="top">
  
   <title>Subsite Root Google Web Search</title>
  
   <url>http://www.google.com</url>
  
  </link>
  
  
  
  1.1                  jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite/folder.metadata
  
  Index: folder.metadata
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <folder>
  
    <title>Subsite Root Folder</title>  
  
    <default-page>subsite-default-page.psml</default-page>
  
    <security-constraints>
      <owner>subsite</owner>
      <security-constraint>
        <roles>subsite, subsite2</roles>
        <permissions>view</permissions>
      </security-constraint>
    </security-constraints>
  
  </folder>
  
  
  
  1.1                  jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite/google-subsite.link
  
  Index: google-subsite.link
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <link target="top">
  
   <title>Subsite Google Web Search</title>
  
   <url>http://www.google.com/search?hl=en&amp;q=subsite</url>
  
  </link>
  
  
  
  1.1                  jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite/subsite-bookmarks.psml
  
  Index: subsite-bookmarks.psml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <page>
  
    <defaults layout-decorator="tigris" portlet-decorator="tigris"/>
  
    <title>Subsite Bookmarks</title>
  
    <fragment id="sub-20" type="layout" name="jetspeed::VelocityOneColumn">
      <fragment id="sub-21" type="portlet" name="demo::BookmarkPortlet">
        <property layout="OneColumn" name="row" value="0" />
      </fragment>
    </fragment>
  
  </page>
  
  
  
  1.1                  jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite/subsite-default-page.psml
  
  Index: subsite-default-page.psml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <page>
  
    <defaults layout-decorator="tigris" portlet-decorator="tigris"/>
  
    <title>Subsite Home</title>
  
    <fragment id="sub-0" type="layout" name="jetspeed::VelocityOneColumn">
      <fragment id="sub-1" type="portlet" name="pam::LocaleSelector">
        <property layout="OneColumn" name="row" value="3" />
      </fragment>                                
      <fragment id="sub-2" type="portlet" name="security::LoginPortlet">
        <property layout="OneColumn" name="row" value="1" />
      </fragment>                                
    </fragment>
  
  </page>
  
  
  
  1.1                  jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite2/folder.metadata
  
  Index: folder.metadata
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <folder>
  
    <title>Subsite2 Root Folder</title>  
  
    <default-page>subsite2-default-page.psml</default-page>
  
    <security-constraints>
      <owner>subsite2</owner>
      <security-constraint>
        <roles>subsite, subsite2</roles>
        <permissions>view</permissions>
      </security-constraint>
    </security-constraints>
  
  </folder>
  
  
  
  1.1                  jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite2/google-subsite2.link
  
  Index: google-subsite2.link
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <link target="top">
  
   <title>Subsite2 Google Web Search</title>
  
   <url>http://www.google.com/search?hl=en&amp;q=subsite2</url>
  
  </link>
  
  
  
  1.1                  jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite2/subsite2-bookmarks.psml
  
  Index: subsite2-bookmarks.psml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <page>
  
    <defaults layout-decorator="jetspeed" portlet-decorator="jetspeed"/>
  
    <title>Subsite2 Bookmarks</title>
  
    <fragment id="sub2-20" type="layout" name="jetspeed::VelocityOneColumn">
      <fragment id="sub2-21" type="portlet" name="demo::BookmarkPortlet">
        <property layout="OneColumn" name="row" value="0" />
      </fragment>
    </fragment>
  
  </page>
  
  
  
  1.1                  jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite2/subsite2-default-page.psml
  
  Index: subsite2-default-page.psml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <page>
  
    <defaults layout-decorator="jetspeed" portlet-decorator="jetspeed"/>
  
    <title>Subsite2 Home</title>
  
    <fragment id="sub2-0" type="layout" name="jetspeed::VelocityOneColumn">
      <fragment id="sub2-1" type="portlet" name="pam::LocaleSelector">
        <property layout="OneColumn" name="row" value="3" />
      </fragment>                                
      <fragment id="sub2-2" type="portlet" name="security::LoginPortlet">
        <property layout="OneColumn" name="row" value="1" />
      </fragment>                                
    </fragment>
  
  </page>
  
  
  
  1.4       +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/folder.metadata
  
  Index: folder.metadata
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/_user/user/folder.metadata,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- folder.metadata	19 Nov 2004 03:07:42 -0000	1.3
  +++ folder.metadata	25 Jan 2005 00:48:40 -0000	1.4
  @@ -25,8 +25,8 @@
     <document-order>pages.ds</document-order>
     <document-order>non-java.ds</document-order>
   
  -  <!-- define user as owner -->
     <security-constraints>
       <owner>user</owner>
  +    <security-constraints-ref>manager</security-constraints-ref>
     </security-constraints>
   </folder>
  
  
  
  1.7       +5 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/non-java/folder.metadata
  
  Index: folder.metadata
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/non-java/folder.metadata,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- folder.metadata	21 Sep 2004 22:56:53 -0000	1.6
  +++ folder.metadata	25 Jan 2005 00:48:40 -0000	1.7
  @@ -3,4 +3,8 @@
     <title >Non-Java Portlets</title>  
     <metadata name="title" xml:lang="fr">Portlet non-Java</metadata>
     <metadata name="title" xml:lang="ja">non-Javaポートレット</metadata>
  -</folder>
  \ No newline at end of file
  +
  +  <security-constraints>
  +    <security-constraints-ref>users</security-constraints-ref>
  +  </security-constraints>
  +</folder>
  
  
  
  1.6       +5 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/third-party/folder.metadata
  
  Index: folder.metadata
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/third-party/folder.metadata,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- folder.metadata	21 Sep 2004 22:56:53 -0000	1.5
  +++ folder.metadata	25 Jan 2005 00:48:40 -0000	1.6
  @@ -3,4 +3,8 @@
     <title >Third Party Portlets</title>  
     <metadata name="title" xml:lang="fr">Portlets de contributeurs externes</metadata>
     <metadata name="title" xml:lang="ja">サードパーティポートレット</metadata>
  -</folder>
  \ No newline at end of file
  +
  +  <security-constraints>
  +    <security-constraints-ref>users</security-constraints-ref>
  +  </security-constraints>
  +</folder>
  
  
  

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