You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@apache.org on 2001/02/09 20:51:08 UTC

cvs commit: jakarta-slide/src/doc/samples noavalon-conf.sample

remm        01/02/09 11:51:08

  Modified:    src/doc  conf-lib.xml
               src/doc/samples noavalon-conf.sample
  Log:
  - Add the new attributes for the permission element.
  - Update the configuration sample.
  
  Revision  Changes    Path
  1.14      +8 -1      jakarta-slide/src/doc/conf-lib.xml
  
  Index: conf-lib.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/doc/conf-lib.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- conf-lib.xml	2000/12/28 11:47:29	1.13
  +++ conf-lib.xml	2001/02/09 19:51:08	1.14
  @@ -404,7 +404,8 @@
               
               <li><b>slide/namespace/data/objectnode/permission</b>
                 <p>
  -                Grants a permission on the associated node.
  +                Grants a permission on the associated node. By defualt, the
  +                permission is positive and inheritable.
                 </p>
                 <p>
                   Attributes list :
  @@ -415,6 +416,12 @@
                     <attribute name="subject" 
                      description="Subject who can perform the action" 
                      required="true"/>
  +                  <attribute name="inheritable" 
  +                   description="If true, the permission will also apply to the child nodes" 
  +                   required="false"/>
  +                  <attribute name="negative" 
  +                   description="If true, will explicitely deny the permission specified" 
  +                   required="false"/>
                   </attribute-list>
                 </p>
               </li>
  
  
  
  1.4       +27 -10    jakarta-slide/src/doc/samples/noavalon-conf.sample
  
  Index: noavalon-conf.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/doc/samples/noavalon-conf.sample,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- noavalon-conf.sample	2000/12/05 06:48:45	1.3
  +++ noavalon-conf.sample	2001/02/09 19:51:08	1.4
  @@ -1,14 +1,13 @@
   <?xml version="1.0"?>
   
  -<slide>
  +<slide logger="org.apache.slide.util.logger.SimpleLogger" logger-level="6">
     
     <namespace name="webdav">
       
       <definition>
         
         <store name="memory">
  -        <!--nodestore name="jdbc"
  -         classname="slidestore.reference.JDBCDescriptorsStore">
  +        <!--nodestore classname="slidestore.reference.JDBCDescriptorsStore">
            <parameter name="driver">org.hsql.jdbcDriver</parameter>
            <parameter name="url">HypersonicSQL:slide</parameter>
            <parameter name="user">sa</parameter>
  @@ -26,8 +25,13 @@
           <revisiondescriptorstore>
             <reference store="nodestore" />
           </revisiondescriptorstore-->
  -        <contentstore name="file" 
  -         classname="slidestore.reference.FileContentStore">
  +        <!--contentstore classname="slidestore.reference.JDBCContentStore">
  +         <parameter name="driver">org.hsql.jdbcDriver</parameter>
  +         <parameter name="url">HypersonicSQL:slidecontent</parameter>
  +         <parameter name="user">sa</parameter>
  +         <parameter name="password"></parameter>
  +        </contentstore-->
  +        <contentstore classname="slidestore.reference.FileContentStore">
             <parameter name="rootpath">files</parameter>
           </contentstore>
         </store>
  @@ -59,23 +63,34 @@
         <filespath></filespath>
         <parameter name="dav">true</parameter>
         <parameter name="standalone">true</parameter>
  +      <role name="admin">slideroles.basic.RootRole</role>
  +      <role name="user">slideroles.basic.UserRole</role>
       </configuration>
       
       <data>
         
         <objectnode classname="org.apache.slide.structure.SubjectNode" uri="/">
           
  -        <permission action="/actions" subject="/users/root"/>
  -        <permission action="/actions/read" subject="/users"/>
  +        <permission action="/actions" subject="admin"/>
  +        <permission action="/actions/read" subject="user"
  +         inheritable="false"/>
  +        <permission action="/actions/read" subject="nobody"
  +         inheritable="false"/>
           
           <!-- /users represents the unauthenticated user -->
           
           <objectnode classname="org.apache.slide.structure.SubjectNode" 
            uri="/users">
             
  +          <permission action="/actions" subject="~"/>
  +          <permission action="/actions" subject="nobody"
  +           inheritable="false" negative="true"/>
  +          <permission action="/actions/read" subject="user"
  +           inheritable="false"/>
  +          
             <!-- /users/root represents the administrator -->
             
  -          <objectnode classname="org.apache.slide.structure.SubjectNode" 
  +          <objectnode classname="slideroles.basic.RootRoleImpl" 
              uri="/users/root">
               <revision>
                 <property name="password">root</property>
  @@ -84,7 +99,7 @@
             
             <!-- /users/john represents an authenticated user -->
             
  -          <objectnode classname="org.apache.slide.structure.SubjectNode" 
  +          <objectnode classname="slideroles.basic.UserRoleImpl" 
              uri="/users/john">
               <revision>
                 <property name="password">john</property>
  @@ -93,7 +108,7 @@
             
             <!-- /users/guest represents an authenticated guest user -->
             
  -          <objectnode classname="org.apache.slide.structure.SubjectNode" 
  +          <objectnode classname="slideroles.basic.UserRoleImpl" 
              uri="/users/guest">
               <revision>
                 <property name="password"></property>
  @@ -120,6 +135,8 @@
            uri="/files">
             
             <permission action="/actions/write" subject="/users/john"/>
  +          <permission action="/actions/write" subject="user"/>
  +          <permission action="/actions/read" subject="nobody"/>
             
           </objectnode>