jericho     2002/07/17 06:52:21

  Modified:    .        RUNNING.txt build.xml
               src/conf/webapp Domain.xml
  Log:
  - Line wrapping for the Domain.xml file
    (*nothing* is changed)
  - Make that the build.xml deal with a slide.properties example file.
  - Fix some dummy string in RUNNING.txt and some documents.
  
  Revision  Changes    Path
  1.4       +44 -10    jakarta-slide/RUNNING.txt
  
  Index: RUNNING.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/RUNNING.txt,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RUNNING.txt       17 Jul 2002 08:25:02 -0000      1.3
  +++ RUNNING.txt       17 Jul 2002 13:52:20 -0000      1.4
  @@ -102,7 +102,36 @@
   
     4) Start and stop your web server to extract the war files
   
  -  5) Copy the 'Domain.xml' to WEB_SERVER/webapps/slide
  +     Or
  +     
  +     You can unjar the war files with jar like:
  +
  +     - On a Windows platform
  +
  +       cd %WEB_SERVER%\webapps
  +       mkdir slide (for example, slide.war)
  +       move slide.war slide
  +       cd slide
  +       jar xvf slide.war
  +
  +     - On a Unix platform
  +
  +       cd $WEB_SERVER/webapps
  +       mkdir slide (for example, slide.war)
  +       mv slide.war slide
  +       jar xvf slide.war
  +
  +  5) Edit the WEB_SERVER/webapps/slide/Domain.xml file
  +     (Refer to the below, 'Advanced configuration')
  +     (Also read SLIDE_HOME/doc/howto-jdbcstore.html)
  +
  +  6) (You can skip this step and use the Slide server just by default)
  +     If you need, edit SLIDE_HOME/slide/slide.properties file and copy it to
  +     WEB_SERVER/webapps/slide/WEB-INF/classes/slide.properties
  +     (Please, read SLIDE_HOME/doc/conf-lib.html)
  +
  +  7) Start up your web server
  +     (Please, read SLIDE_HOME/doc/howto-tomcat.html)
   
   * Test your basic installation of the Slide server like:
   
  @@ -114,21 +143,22 @@
   
   * Test your versioning installation of the Slide server like:
   
  -  - Access the HTTP URL probably like:
  +  1) Connect to the Slide server like http://localhost:8080/slide/files
   
  -    1) Connect to the Slide server like http://localhost:8080/slide/files
  +  2) Upload a file
   
  -    2) Upload a file
  -    
  -    3) Change the file and upload it again
  +  3) Change the file and upload it again
   
  -    4) Go to /history/1 in Slide
  -       (There should be a document for each revision you uploaded)
  +  4) Go to /history/1 in Slide
  +     (There should be a document for each revision you uploaded)
   
   
   --------------------------------------------------- Building from Slide sources
   
  -* Need ant, a build package
  +* The Slide installation
  +
  +  Please, read SLIDE_HOME/README, SLIDE_HOME/lib/README and
  +  SLIDE_HOME/doc/installation.html files
   
    
   -------------------------------------------------------- Advanced configuration
  @@ -150,6 +180,10 @@
               .
               .
               .
  +
  +* Setting your Slide server auto-versioning control by a PUT method
  +  - Edit the WEB_SERVER/webapps/slide/Domain.xml file and set the
  +    auto-version-control parameter to 'true'
   
   * Turning the Slide security on and off for Slide server
   
  
  
  
  1.168     +1 -0      jakarta-slide/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/build.xml,v
  retrieving revision 1.167
  retrieving revision 1.168
  diff -u -r1.167 -r1.168
  --- build.xml 11 Jul 2002 16:42:19 -0000      1.167
  +++ build.xml 17 Jul 2002 13:52:20 -0000      1.168
  @@ -1007,6 +1007,7 @@
       <copy todir="${slide.dist}/slide/conf" filtering="true" overwrite="yes" >
         <fileset dir="src/conf/webapp">
           <include name="web.xml"/>
  +        <include name="slide.properties"/>
           <include name="log4j.properties"/>
         </fileset>
       </copy>
  
  
  
  1.37      +164 -123  jakarta-slide/src/conf/webapp/Domain.xml
  
  Index: Domain.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/conf/webapp/Domain.xml,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- Domain.xml        21 Jun 2002 07:48:06 -0000      1.36
  +++ Domain.xml        17 Jul 2002 13:52:20 -0000      1.37
  @@ -1,32 +1,34 @@
   <?xml version="1.0"?>
  -<slide logger="org.apache.slide.util.logger.SimpleLogger" logger-level="6" 
default="slide">
  +<slide logger="org.apache.slide.util.logger.SimpleLogger" logger-level="6"
  +    default="slide">
       <!--
  -logger
  -~~~~~~
  -org.apache.slide.util.logger.SimpleLogger
  -   default logger with 1 log level
  -log4j.Log4jLogger
  -   logger with fine granularity
  -   see http://jakarta.apache.org/log4j/
  -
  -logger-level
  -~~~~~~~~~~~~
  -0 EMERGENCY
  -1 CRITICAL
  -2 ERROR
  -4 WARNING
  -6 INFO
  -7 DEBUG
  --->
  +    logger
  +    ~~~~~~
  +    org.apache.slide.util.logger.SimpleLogger
  +       default logger with 1 log level
  +    log4j.Log4jLogger
  +       logger with fine granularity
  +       see http://jakarta.apache.org/log4j/
  +
  +    logger-level
  +    ~~~~~~~~~~~~
  +    0 EMERGENCY
  +    1 CRITICAL
  +    2 ERROR
  +    4 WARNING
  +    6 INFO
  +    7 DEBUG
  +    -->
       <namespace name="slide">
           <!-- ### Memory Configuration ###
  -     The following memory configuration uses the MemoryDescriptorsStore
  -     for node,security,locks and revisions. For content the FileContentStore
  -     is used. Content is reset before start.
  --->
  +        The following memory configuration uses the MemoryDescriptorsStore for
  +        node, security, locks and revisions. For content the FileContentStore
  +        is used. Content is reset before start.
  +        -->
           <definition>
               <store name="memory">
  -                <nodestore classname="slidestore.reference.MemoryDescriptorsStore"/>
  +                <nodestore
  +                    classname="slidestore.reference.MemoryDescriptorsStore"/>
                   <securitystore>
                       <reference store="nodestore"/>
                   </securitystore>
  @@ -48,59 +50,59 @@
               <scope match="/" store="memory"/>
           </definition>
           <!-- ### JDBC Configuration ###
  -     The following jdbc sample configuration uses the hsql Database Engine
  -     a relational database engine written in Java, for more info:
  -     http://hsqldb.sourceforge.net/
  --->
  +        The following jdbc sample configuration uses the hsql Database Engine
  +        a relational database engine written in Java, for more info:
  +        http://hsqldb.sourceforge.net/
  +        -->
           <!--
  -    <definition>
  -      <store name="jdbc">
  -        <nodestore classname="slidestore.reference.JDBCDescriptorsStore">
  -         <parameter name="driver">org.hsqldb.jdbcDriver</parameter>
  -         <parameter name="url">jdbc:hsqldb:slidestructure</parameter>
  -         <parameter name="user">sa</parameter>
  -         <parameter name="password"></parameter>
  -        </nodestore>
  -        <securitystore>
  -          <reference store="nodestore" />
  -        </securitystore>
  -        <lockstore>
  -          <reference store="nodestore" />
  -        </lockstore>
  -        <revisiondescriptorsstore>
  -          <reference store="nodestore" />
  -        </revisiondescriptorsstore>
  -        <revisiondescriptorstore>
  -          <reference store="nodestore" />
  -        </revisiondescriptorstore>
  -        <contentstore classname="slidestore.reference.JDBCContentStore">
  -         <parameter name="driver">org.hsqldb.jdbcDriver</parameter>
  -         <parameter name="url">jdbc:hsqldb:slidecontent</parameter>
  -         <parameter name="user">sa</parameter>
  -         <parameter name="password"></parameter>
  -        </contentstore>
  -      </store>
  -      <scope match="/" store="jdbc" />
  -    </definition>
  --->
  +        <definition>
  +            <store name="jdbc">
  +            <nodestore classname="slidestore.reference.JDBCDescriptorsStore">
  +                <parameter name="driver">org.hsqldb.jdbcDriver</parameter>
  +                <parameter name="url">jdbc:hsqldb:slidestructure</parameter>
  +                <parameter name="user">sa</parameter>
  +                <parameter name="password"></parameter>
  +            </nodestore>
  +            <securitystore>
  +                <reference store="nodestore" />
  +            </securitystore>
  +            <lockstore>
  +                <reference store="nodestore" />
  +            </lockstore>
  +            <revisiondescriptorsstore>
  +                <reference store="nodestore" />
  +            </revisiondescriptorsstore>
  +            <revisiondescriptorstore>
  +                <reference store="nodestore" />
  +            </revisiondescriptorstore>
  +            <contentstore classname="slidestore.reference.JDBCContentStore">
  +                <parameter name="driver">org.hsqldb.jdbcDriver</parameter>
  +                <parameter name="url">jdbc:hsqldb:slidecontent</parameter>
  +                <parameter name="user">sa</parameter>
  +                <parameter name="password"></parameter>
  +            </contentstore>
  +            </store>
  +            <scope match="/" store="jdbc" />
  +        </definition>
  +        -->
           <!-- ### Mixed JDBC - Filesystem ###
  -     stores: slidestore.reference.JDBCDescriptorsStore
  -             slidestore.reference.FileContentStore
  -     !!! set resetBeforeStarting parameter for FileContentStore to false !!!
  --->
  +        stores: slidestore.reference.JDBCDescriptorsStore
  +                slidestore.reference.FileContentStore
  +        !!! set resetBeforeStarting parameter for FileContentStore to false !!!
  +        -->
           <!-- ### Cloudscape configuration (embedded database) ###
  -     stores: slidestore.cloudscape.CloudscapeDescriptorsStore
  -             slidestore.cloudscape.CloudscapeContentStore
  -     driver: COM.cloudscape.core.JDBCDriver
  -     url:    jdbc:cloudscape:slidestructure;create=true
  -             jdbc:cloudscape:slidecontent;create=true
  --->
  +        stores: slidestore.cloudscape.CloudscapeDescriptorsStore
  +                slidestore.cloudscape.CloudscapeContentStore
  +        driver: COM.cloudscape.core.JDBCDriver
  +        url:    jdbc:cloudscape:slidestructure;create=true
  +                jdbc:cloudscape:slidecontent;create=true
  +        -->
           <!-- ### Oracle configuration (thin driver) ###
  -     stores: slidestore.reference.JDBCDescriptorsStore
  -             slidestore.oracle.OracleContentStore
  -     driver: oracle.jdbc.OracleDriver
  -     url:    jdbc:oracle:thin:@localhost:1521:slide
  --->
  +        stores: slidestore.reference.JDBCDescriptorsStore
  +                slidestore.oracle.OracleContentStore
  +        driver: oracle.jdbc.OracleDriver
  +        url:    jdbc:oracle:thin:@localhost:1521:slide
  +        -->
           <configuration>
               <!-- Actions mapping -->
               <default-action>/actions</default-action>
  @@ -134,73 +136,107 @@
               <!-- Users management -->
               <auto-create-users>true</auto-create-users>
               <!-- Default properties mapping -->
  -            <default-property name="foo" namespace="nsfoo/" value="bar" 
role="user"/>
  -            <default-property name="password" namespace="slide/" value="" 
role="user"/>
  +            <default-property name="foo" namespace="nsfoo/" value="bar"
  +                role="user"/>
  +            <default-property name="password" namespace="slide/" value=""
  +                role="user"/>
           </configuration>
           <data>
  -            <objectnode classname="org.apache.slide.structure.SubjectNode" uri="/">
  +            <objectnode classname="org.apache.slide.structure.SubjectNode"
  +                uri="/">
                   <!-- Subject can be:
                   self  "~"
                   all   "nobody"
                   user  "/users/john"
                   group "+/users/groupA"
                   role  "root"
  -        -->
  +                -->
                   <!-- Uncomment the following line to give all permissions to
  -             principals have the root role -->
  +                principals have the root role
  +                -->
                   <!-- <permission action="/actions" subject="root"/> -->
                   <permission action="/actions" subject="/users/root"/>
  -                <permission action="/actions/read" subject="/users" 
inheritable="false"/>
  -                <permission action="/actions/read" subject="nobody" 
inheritable="false"/>
  +                <permission action="/actions/read" subject="/users"
  +                    inheritable="false"/>
  +                <permission action="/actions/read" subject="nobody"
  +                    inheritable="false"/>
                   <!-- /users -->
  -                <objectnode classname="org.apache.slide.structure.SubjectNode" 
uri="/users">
  +                <objectnode classname="org.apache.slide.structure.SubjectNode"
  +                    uri="/users">
                       <permission action="/actions" subject="~"/>
  -                    <permission action="/actions" subject="/users/guest" 
inheritable="true" negative="true"/>
  -                    <permission action="/actions/read" subject="/users" 
inheritable="false"/>
  +                    <permission action="/actions" subject="/users/guest"
  +                        inheritable="true" negative="true"/>
  +                    <permission action="/actions/read" subject="/users"
  +                        inheritable="false"/>
                       <!-- Permission group example -->
  -                    <objectnode classname="org.apache.slide.structure.GroupNode" 
uri="/users/groupA">
  -                        <objectnode classname="org.apache.slide.structure.LinkNode" 
uri="/users/groupA/john" linkedUri="/users/john"/>
  -                        <objectnode classname="org.apache.slide.structure.LinkNode" 
uri="/users/groupA/root" linkedUri="/users/root"/>
  -                        <objectnode 
classname="org.apache.slide.structure.SubjectNode" 
uri="/users/groupA/singleGroupMember"/>
  +                    <objectnode
  +                        classname="org.apache.slide.structure.GroupNode"
  +                        uri="/users/groupA">
  +                        <objectnode
  +                            classname="org.apache.slide.structure.LinkNode"
  +                            uri="/users/groupA/john" linkedUri="/users/john"/>
  +                        <objectnode
  +                            classname="org.apache.slide.structure.LinkNode"
  +                            uri="/users/groupA/root" linkedUri="/users/root"/>
  +                        <objectnode
  +                            classname="org.apache.slide.structure.SubjectNode"
  +                            uri="/users/groupA/singleGroupMember"/>
                       </objectnode>
                       <!-- /users/root represents the administrator -->
  -                    <objectnode classname="slideroles.basic.RootRoleImpl" 
uri="/users/root">
  +                    <objectnode classname="slideroles.basic.RootRoleImpl"
  +                        uri="/users/root">
                           <revision>
                               <property name="password">root</property>
                           </revision>
                       </objectnode>
                       <!-- /users/john represents an authenticated user -->
  -                    <objectnode classname="slideroles.basic.UserRoleImpl" 
uri="/users/john">
  +                    <objectnode classname="slideroles.basic.UserRoleImpl"
  +                        uri="/users/john">
                           <revision>
                               <property name="password">john</property>
                           </revision>
                       </objectnode>
  -                    <!-- /users/guest represents an authenticated or unauthenticated
  -               guest user -->
  -                    <objectnode classname="slideroles.basic.GuestRoleImpl" 
uri="/users/guest">
  +                    <!-- /users/guest represents an authenticated or
  +                    unauthenticated guest user -->
  +                    <objectnode classname="slideroles.basic.GuestRoleImpl"
  +                        uri="/users/guest">
                           <revision>
                               <property name="password"/>
                           </revision>
                       </objectnode>
                   </objectnode>
  -                <objectnode classname="org.apache.slide.structure.ActionNode" 
uri="/actions">
  -                    <objectnode classname="org.apache.slide.structure.ActionNode" 
uri="/actions/read"/>
  -                    <objectnode classname="org.apache.slide.structure.ActionNode" 
uri="/actions/write"/>
  -                    <objectnode classname="org.apache.slide.structure.ActionNode" 
uri="/actions/manage"/>
  +                <objectnode classname="org.apache.slide.structure.ActionNode"
  +                    uri="/actions">
  +                    <objectnode
  +                        classname="org.apache.slide.structure.ActionNode"
  +                        uri="/actions/read"/>
  +                    <objectnode
  +                        classname="org.apache.slide.structure.ActionNode"
  +                        uri="/actions/write"/>
  +                    <objectnode
  +                        classname="org.apache.slide.structure.ActionNode"
  +                        uri="/actions/manage"/>
                   </objectnode>
  -                <objectnode classname="org.apache.slide.structure.SubjectNode" 
uri="/files">
  +                <objectnode classname="org.apache.slide.structure.SubjectNode"
  +                    uri="/files">
                       <!-- ### Give read/write/manage permission to guest ###
  -               Uncomment the following line to give permission to do
  -               all actions on /files to guest (unauthenticated users) -->
  -                    <!-- <permission action="/actions" subject="/users/guest"/> -->
  +                    Uncomment the following line to give permission to do all
  +                    actions on /files to guest (unauthenticated users) -->
  +                    <!--
  +                    <permission action="/actions" subject="/users/guest"/>
  +                    -->
                       <permission action="/actions/manage" subject="/users/john"/>
  -                    <permission action="/actions/write" subject="+/users/groupA"/>
  +                    <permission action="/actions/write"
  +                        subject="+/users/groupA"/>
                       <permission action="/actions/read" subject="nobody"/>
                   </objectnode>
                   <!-- DeltaV: default history and workspace paths -->
  -                <objectnode classname="org.apache.slide.structure.SubjectNode" 
uri="/history"/>
  -                <objectnode classname="org.apache.slide.structure.SubjectNode" 
uri="/workspace"/>
  -                <objectnode classname="org.apache.slide.structure.SubjectNode" 
uri="/workingresource"/>
  +                <objectnode classname="org.apache.slide.structure.SubjectNode"
  +                    uri="/history"/>
  +                <objectnode classname="org.apache.slide.structure.SubjectNode"
  +                    uri="/workspace"/>
  +                <objectnode classname="org.apache.slide.structure.SubjectNode"
  +                    uri="/workingresource"/>
               </objectnode>
           </data>
       </namespace>
  @@ -208,49 +244,54 @@
       DeltaV global parameters
       ========================
       * historypath (mandatory=no, default="/history"):
  -    Specifies a Slide path which determines the location where this DeltaV server 
stores
  -    history data.
  +    Specifies a Slide path which determines the location where this DeltaV
  +    server stores history data.
   
       * workspacepath (mandatory=no, default="/workspace"):
  -    Specifies a Slide path which determines the location where this DeltaV server 
allows
  -    workspaces to reside.
  +    Specifies a Slide path which determines the location where this DeltaV
  +    server allows workspaces to reside.
   
       * workingresourcepath (mandatory=no, default="/workingresource"):
  -    Specifies a Slide path which determines the location where this DeltaV server 
stores
  -    working resources.
  +    Specifies a Slide path which determines the location where this DeltaV
  +    server stores working resources.
   
       * auto-version (mandatory=no, default="checkout-checkin"):
       Controls the DeltaV auto-version behaviour.
   
       * auto-version-control (mandatory=no, default="false"):
  -    Indicates if a resource just created by a PUT should be set under 
version-control.
  +    Indicates if a resource just created by a PUT should be set under
  +    version-control.
   
       * checkout-fork (mandatory=no, default="forbidden"):
  -    Controls the DeltaV check-out behaviour when a version is already checked-out or
  -    has a successor.
  +    Controls the DeltaV check-out behaviour when a version is already
  +    checked-out or has a successor.
   
       * checkin-fork (mandatory=no, default="forbidden"):
  -    Controls the DeltaV check-out behaviour when a version has already a successor.
  +    Controls the DeltaV check-out behaviour when a version has already a
  +    successor.
   
  -    * standardLivePropertiesClass (mandatory=no, 
default="org.apache.slide.webdav.util.resourcekind.AbstractResourceKind"):
  +    * standardLivePropertiesClass (mandatory=no,
  +    default="org.apache.slide.webdav.util.resourcekind.AbstractResourceKind"):
       Determines the "agent" knowing about what the standard live properties are.
       It should be a loadable class containing the following static methods:
  -    - boolean isLiveProperty( String propName )
  -    - boolean isProtectedProperty( String propName )
  -    - boolean isComputedProperty( String propName )
  +    - boolean isLiveProperty(String propName)
  +    - boolean isProtectedProperty(String propName)
  +    - boolean isComputedProperty(String propName)
       - Set getAllLiveProperties()
       - Set getAllProtectedProperties()
       - Set getAllComputedProperties()
   
  -    * uriRedirectorClass (mandatory=no, 
default="org.apache.slide.webdav.util.DeltavUriRedirector"):
  -    Determines the URI redirector class. The DeltaV URI redirector is in charge of 
the
  -    following redirections:
  +    * uriRedirectorClass (mandatory=no,
  +    default="org.apache.slide.webdav.util.DeltavUriRedirector"):
  +    Determines the URI redirector class. The DeltaV URI redirector is in
  +    charge of the following redirections:
       - version URI to history URI, e.g. /history/2/1.4 to /history/2
       - latest revision number for history resource to 0.0
  -    - latest revision number for version resource to last URI token, e.g. 
/history/2/1.4 to 1.4
  +    - latest revision number for version resource to last URI token,
  +    e.g. /history/2/1.4 to 1.4
       It should be a loadable class containing the following static methods:
  -    - String redirectUri( String uri )
  -    - NodeRevisionNumber redirectLatestRevisionNumber( String uri )
  +    - String redirectUri(String uri)
  +    - NodeRevisionNumber redirectLatestRevisionNumber(String uri)
       -->
       <parameter name="historypath">/history</parameter>
       <parameter name="workspacepath">/workspace</parameter>
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to